diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100755 index f7478a9..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,39 +0,0 @@ -# Automatically build the project and run any configured tests for every push -# and submitted pull request. This can help catch issues that only occur on -# certain platforms or Java versions, and provides a first line of defence -# against bad commits. - -name: build -on: [pull_request, push] - -jobs: - build: - strategy: - matrix: - # Use these Java versions - java: [ - 17 # Minimum supported by Minecraft - ] - # and run on both Linux and Windows - os: [ubuntu-20.04, windows-latest] - runs-on: ${{ matrix.os }} - steps: - - name: checkout repository - uses: actions/checkout@v2 - - name: validate gradle wrapper - uses: gradle/wrapper-validation-action@v1 - - name: setup jdk ${{ matrix.java }} - uses: actions/setup-java@v1 - with: - java-version: ${{ matrix.java }} - - name: make gradle wrapper executable - if: ${{ runner.os != 'Windows' }} - run: chmod +x ./gradlew - - name: build - run: ./gradlew build - - name: capture build artifacts - if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS - uses: actions/upload-artifact@v2 - with: - name: Artifacts - path: build/libs/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 93173b7..4779503 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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~ \ No newline at end of file +## 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) \ No newline at end of file diff --git a/README.md b/README.md index a54fb92..7bfa604 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

- +

@@ -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 @@ -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 @@ -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. \ No newline at end of file +- **You** (for playing with this mod!) \ No newline at end of file diff --git a/build.gradle b/build.gradle index 5be6070..39508e5 100755 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.11-SNAPSHOT' + id 'fabric-loom' version '0.12-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 55cd5a1..9e34063 100755 --- a/gradle.properties +++ b/gradle.properties @@ -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 \ No newline at end of file + fabric_version=0.57.0+1.19 + cloth_config_version=7.0.73 + mod_menu_version=4.0.4 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar old mode 100755 new mode 100644 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties old mode 100755 new mode 100644 index 84d1f85..41dfb87 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/src/main/java/jayceecreates/earlygame/block/RockBlock.java b/src/main/java/jayceecreates/earlygame/block/RockBlock.java index 600d8a5..f21373c 100755 --- a/src/main/java/jayceecreates/earlygame/block/RockBlock.java +++ b/src/main/java/jayceecreates/earlygame/block/RockBlock.java @@ -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)); } @@ -77,11 +77,6 @@ public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { protected void appendProperties(StateManager.Builder 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); @@ -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); } diff --git a/src/main/java/jayceecreates/earlygame/block/StickTwigBlock.java b/src/main/java/jayceecreates/earlygame/block/StickTwigBlock.java index 0514fa0..4944ca6 100755 --- a/src/main/java/jayceecreates/earlygame/block/StickTwigBlock.java +++ b/src/main/java/jayceecreates/earlygame/block/StickTwigBlock.java @@ -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) { @@ -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, diff --git a/src/main/java/jayceecreates/earlygame/mixin/BlockMiningMixin.java b/src/main/java/jayceecreates/earlygame/mixin/BlockMiningMixin.java index e0deee7..59fa2ba 100755 --- a/src/main/java/jayceecreates/earlygame/mixin/BlockMiningMixin.java +++ b/src/main/java/jayceecreates/earlygame/mixin/BlockMiningMixin.java @@ -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) @@ -59,7 +59,7 @@ private void blockBreak(BlockState state, CallbackInfoReturnable 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) @@ -74,7 +74,7 @@ private void blockBreak(BlockState state, CallbackInfoReturnable 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) diff --git a/src/main/java/jayceecreates/earlygame/utils/MiningDamageSource.java b/src/main/java/jayceecreates/earlygame/utils/MiningDamageSource.java index d4c2fc9..cc07c76 100755 --- a/src/main/java/jayceecreates/earlygame/utils/MiningDamageSource.java +++ b/src/main/java/jayceecreates/earlygame/utils/MiningDamageSource.java @@ -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 { @@ -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()); } } @@ -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()); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 99a05c1..72b3608 100755 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -34,9 +34,9 @@ ], "depends": { - "fabricloader": ">=0.11.3", + "fabricloader": ">=0.14.8", "fabric": "*", - "minecraft": "1.18.2", + "minecraft": "1.19", "java": ">=16" }, "suggests": {