Skip to content

Commit

Permalink
Update to 1.19-1.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
JayCeeCreates committed Jul 14, 2022
1 parent 004f3bb commit 57ee7b2
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 83 deletions.
39 changes: 0 additions & 39 deletions .github/workflows/build.yml

This file was deleted.

9 changes: 3 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
(+) = Added | (*) = Improved | (-) = Removed

***
## 1.18.2-1.1.2
EarlyGame has successfully been ported to 1.18.2! Bear in mind there will be no backporting of this mod to previous point releases to focus on the latest one. This applies to every Minecraft major release. With all that said, sorry for the VERY long wait and I hope you enjoy!
- (+) All features from [1.17.x](https://github.com/JayCeeCreates/earlygame/blob/1.17/CHANGELOG.md) versions
- (+) Parity with MAmbience's sound effects when equipping tools and weapons
- (*) Changed the algorithm of sticks and rocks generation in line with the new worldgen update (#35 #36 #37 very huge thanks, Jurklein!)
- (*) A new logo! Much better than the previous one tbh~
## 1.19-1.1.2
EarlyGame 1.1.2 has successfully ported to 1.19. Nothing much changed from 1.18.2-1.1.2, just a simple port for now~
- (+) All features from [1.18.2-1.1.2](https://github.com/JayCeeCreates/earlygame/blob/1.18/CHANGELOG.md)
12 changes: 4 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center">
<a href="https://github.com/JayCeeCreates/earlygame/blob/master/LICENSE"><img src="https://img.shields.io/github/license/jayceecreates/earlygame?style=for-the-badge"></a>
<img src="https://img.shields.io/badge/mc%20version-1.16--1.18-299137?style=for-the-badge">
<img src="https://img.shields.io/badge/mc%20version-1.16--1.19-299137?style=for-the-badge">
<a href="https://fabricmc.net"><img src="https://img.shields.io/badge/modloader-fabric-red?style=for-the-badge"></a>
<a href="https://jayceecreates.github.io/earlygame/donate" target="_blank"><img src="https://img.shields.io/badge/donate-paypal-blue?style=for-the-badge"></a>
</p>
Expand All @@ -17,7 +17,7 @@ This idea revolves around the fact that as of this writing, no such mods for ear

## Features

- Disabled the ability to get wood from punching trees
- Disables the ability to get wood from punching trees
- Proper tools are required to collect stone and wood
- Chopping logs to make planks, and planks to sticks
- Rocks and sticks are naturally generated around the world
Expand All @@ -41,7 +41,7 @@ More details are in the [wiki](https://jayceecreates.github.io/earlygame/wiki).

### Required

- **[Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api)**: 0.51.1+1.18.2 and above
- **[Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api)**: 0.57.0+1.19 and above
- **[Cloth Config](https://www.curseforge.com/minecraft/mc-mods/cloth-config)**

### Optional
Expand All @@ -57,8 +57,4 @@ Incompatibilities and bugs can be reported in the [issues](https://github.com/Ja

- **Fabric Discord community** (a great help for the code)
- **Contributors** (for the help with issue fixes and other modifications)
- **You** (for playing with this mod!)

### Any plans for a Forge version?

A Forge version of this particular mod is not necessary. I recommend the two aforementioned mods if you want to play an early game mod on Forge.
- **You** (for playing with this mod!)
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.11-SNAPSHOT'
id 'fabric-loom' version '0.12-SNAPSHOT'
id 'maven-publish'
}

Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.18.2
yarn_mappings=1.18.2+build.3
loader_version=0.14.4
minecraft_version=1.19
yarn_mappings=1.19+build.4
loader_version=0.14.8

# Mod Properties
mod_version = 1.18.2-1.1.2
mod_version = 1.19-1.1.2
maven_group = jayceecreates.earlygame
archives_base_name = earlygame

# Dependencies
fabric_version=0.51.1+1.18.2
cloth_config_version=6.2.57
mod_menu_version=3.1.0
fabric_version=0.57.0+1.19
cloth_config_version=7.0.73
mod_menu_version=4.0.4
Empty file modified gradle/wrapper/gradle-wrapper.jar
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
8 changes: 1 addition & 7 deletions src/main/java/jayceecreates/earlygame/block/RockBlock.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class RockBlock extends Block implements Waterloggable {
public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED;

public RockBlock() {
super(FabricBlockSettings.of(Material.STONE, MapColor.LIGHT_GRAY).strength(0.15F, 0.15F).sounds(BlockSoundGroup.STONE).noCollision().collidable(false));
super(FabricBlockSettings.of(Material.STONE, MapColor.LIGHT_GRAY).strength(0.15F, 0.15F).sounds(BlockSoundGroup.STONE).noCollision().collidable(false).offsetType(AbstractBlock.OffsetType.XZ));
this.setDefaultState((BlockState)this.getDefaultState().with(WATERLOGGED, Boolean.FALSE));
}

Expand Down Expand Up @@ -77,11 +77,6 @@ public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
builder.add(WATERLOGGED);
}

@Override
public AbstractBlock.OffsetType getOffsetType() {
return AbstractBlock.OffsetType.XZ;
}

public FluidState getFluidState(BlockState state) {
return (Boolean)state.get(WATERLOGGED) ? Fluids.WATER.getStill(false) : super.getFluidState(state);
Expand Down Expand Up @@ -116,7 +111,6 @@ public BlockState getStateForNeighborUpdate(BlockState state, Direction directio
if ((Boolean)state.get(WATERLOGGED)) {
world.createAndScheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world));
}

return super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class StickTwigBlock extends Block {
protected static final VoxelShape SHAPE = Block.createCuboidShape(4D, 0.01D, 4D, 12D, 0.02D, 12D);

public StickTwigBlock() {
super(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).strength(0.15F, 0.15F).noCollision().collidable(false));
super(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).strength(0.15F, 0.15F).noCollision().collidable(false).offsetType(AbstractBlock.OffsetType.XZ));
}

protected boolean canPlaceOnTop(BlockState floor, BlockView world, BlockPos pos) {
Expand Down Expand Up @@ -62,11 +62,6 @@ public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
BlockPos blockPos = pos.down();
return this.canPlaceOnTop(world.getBlockState(blockPos), world, blockPos);
}

@Override
public AbstractBlock.OffsetType getOffsetType() {
return AbstractBlock.OffsetType.XZ;
}

@Override
public void neighborUpdate(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import net.minecraft.entity.EntityType;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.text.TranslatableText;
import net.minecraft.text.Text;
import net.minecraft.world.World;

@Mixin(PlayerEntity.class)
Expand Down Expand Up @@ -59,7 +59,7 @@ private void blockBreak(BlockState state, CallbackInfoReturnable<Float> cir) {
!player.getInventory().getMainHandStack().isIn(ConventionalItemTags.AXES))
{
if (EarlyGame.CONFIG.warningMessage)
player.sendMessage(new TranslatableText(!isBlacklisted ? "earlygame.pick_required" : "earlygame.axe_required"), true);
player.sendMessage(Text.translatable(!isBlacklisted ? "earlygame.pick_required" : "earlygame.axe_required"), true);
cir.setReturnValue(0.0F);
if (player.getInventory().getMainHandStack().isEmpty() && rand <= EarlyGame.CONFIG.damageProbability * .01)
if (!isBlacklisted)
Expand All @@ -74,7 +74,7 @@ private void blockBreak(BlockState state, CallbackInfoReturnable<Float> cir) {
!player.getInventory().getMainHandStack().isIn(ConventionalItemTags.PICKAXES))
{
if (EarlyGame.CONFIG.warningMessage)
player.sendMessage(new TranslatableText(!isBlacklisted ? "earlygame.axe_required" : "earlygame.pick_required"), true);
player.sendMessage(Text.translatable(!isBlacklisted ? "earlygame.axe_required" : "earlygame.pick_required"), true);
cir.setReturnValue(0.0F);
if (player.getInventory().getMainHandStack().isEmpty() && rand <= EarlyGame.CONFIG.damageProbability * .01)
if (!isBlacklisted)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.damage.DamageSource;
import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;

public class MiningDamageSource {

Expand All @@ -21,7 +20,7 @@ public Entity getSource() {

@Override
public Text getDeathMessage(LivingEntity entity) {
return new TranslatableText("earlygame.splintered", entity.getDisplayName());
return Text.translatable("earlygame.splintered", entity.getDisplayName());
}

}
Expand All @@ -39,7 +38,7 @@ public Entity getSource() {

@Override
public Text getDeathMessage(LivingEntity entity) {
return new TranslatableText("earlygame.broken_bones", entity.getDisplayName());
return Text.translatable("earlygame.broken_bones", entity.getDisplayName());
}

}
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
],

"depends": {
"fabricloader": ">=0.11.3",
"fabricloader": ">=0.14.8",
"fabric": "*",
"minecraft": "1.18.2",
"minecraft": "1.19",
"java": ">=16"
},
"suggests": {
Expand Down

0 comments on commit 57ee7b2

Please sign in to comment.