diff --git a/build.gradle b/build.gradle index e16ccb7..bb82174 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.9-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 781bd00..e624e53 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.4 -yarn_mappings=1.21.4+build.1 -loader_version=0.16.9 +minecraft_version=1.21.5 +yarn_mappings=1.21.5+build.1 +loader_version=0.16.10 # Mod Properties -mod_version=1.21.4.5 +mod_version=1.21.5.0 maven_group=de.jottyfan.quickiemod archives_base_name=quickiemod # Dependencies -fabric_version=0.110.5+1.21.4 \ No newline at end of file +fabric_version=0.119.6+1.21.5 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c8..37f853b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/de/jottyfan/quickiemod/block/BlockDirtSalpeter.java b/src/main/java/de/jottyfan/quickiemod/block/BlockDirtSalpeter.java index 131fe61..9995341 100644 --- a/src/main/java/de/jottyfan/quickiemod/block/BlockDirtSalpeter.java +++ b/src/main/java/de/jottyfan/quickiemod/block/BlockDirtSalpeter.java @@ -17,6 +17,8 @@ import net.minecraft.loot.context.LootWorldContext.Builder; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; /** * @@ -45,4 +47,9 @@ public class BlockDirtSalpeter extends FallingBlock { protected MapCodec getCodec() { return null; } + + @Override + public int getColor(BlockState state, BlockView world, BlockPos pos) { + return 0; + } } diff --git a/src/main/java/de/jottyfan/quickiemod/block/BlockDrill.java b/src/main/java/de/jottyfan/quickiemod/block/BlockDrill.java index 668a4b7..bc8a4c6 100644 --- a/src/main/java/de/jottyfan/quickiemod/block/BlockDrill.java +++ b/src/main/java/de/jottyfan/quickiemod/block/BlockDrill.java @@ -31,6 +31,7 @@ import net.minecraft.util.Identifier; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; import net.minecraft.world.World; /** @@ -122,4 +123,9 @@ public class BlockDrill extends FallingBlock implements BlockEntityProvider { } return ActionResult.PASS; } + + @Override + public int getColor(BlockState state, BlockView world, BlockPos pos) { + return 0; + } } diff --git a/src/main/java/de/jottyfan/quickiemod/block/BlockPowder.java b/src/main/java/de/jottyfan/quickiemod/block/BlockPowder.java index f981d8f..c1f4de0 100644 --- a/src/main/java/de/jottyfan/quickiemod/block/BlockPowder.java +++ b/src/main/java/de/jottyfan/quickiemod/block/BlockPowder.java @@ -13,6 +13,8 @@ import net.minecraft.loot.context.LootWorldContext.Builder; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; import net.minecraft.world.explosion.Explosion; /** @@ -44,4 +46,10 @@ public class BlockPowder extends FallingBlock { // TODO Auto-generated method stub return null; } + + @Override + public int getColor(BlockState state, BlockView world, BlockPos pos) { + // TODO Auto-generated method stub + return 0; + } } diff --git a/src/main/java/de/jottyfan/quickiemod/block/BlockSandSalpeter.java b/src/main/java/de/jottyfan/quickiemod/block/BlockSandSalpeter.java index ab9637b..df5b430 100644 --- a/src/main/java/de/jottyfan/quickiemod/block/BlockSandSalpeter.java +++ b/src/main/java/de/jottyfan/quickiemod/block/BlockSandSalpeter.java @@ -15,7 +15,9 @@ import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.Identifier; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.random.Random; +import net.minecraft.world.BlockView; /** * @@ -40,4 +42,10 @@ public class BlockSandSalpeter extends FallingBlock { // TODO Auto-generated method stub return null; } + + @Override + public int getColor(BlockState state, BlockView world, BlockPos pos) { + // TODO Auto-generated method stub + return 0; + } } diff --git a/src/main/java/de/jottyfan/quickiemod/block/BlockStacker.java b/src/main/java/de/jottyfan/quickiemod/block/BlockStacker.java index a17dfc6..ec1ff0d 100644 --- a/src/main/java/de/jottyfan/quickiemod/block/BlockStacker.java +++ b/src/main/java/de/jottyfan/quickiemod/block/BlockStacker.java @@ -16,6 +16,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.screen.ScreenHandler; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.ActionResult; import net.minecraft.util.Identifier; import net.minecraft.util.ItemScatterer; @@ -93,15 +94,15 @@ public class BlockStacker extends BlockWithEntity implements BlockEntityProvider } @Override - public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) { - if (state.getBlock() != newState.getBlock()) { + protected void onStateReplaced(BlockState state, ServerWorld world, BlockPos pos, boolean moved) { + if (state.getBlock() != world.getBlockState(pos).getBlock()) { BlockEntity blockEntity = world.getBlockEntity(pos); if (blockEntity instanceof BlockStackerEntity) { ItemScatterer.spawn(world, pos, (BlockStackerEntity) blockEntity); // update comparators world.updateComparators(pos, this); } - super.onStateReplaced(state, world, pos, newState, moved); + super.onStateReplaced(state, world, pos, moved); } } diff --git a/src/main/java/de/jottyfan/quickiemod/item/ToolQuickiepowderPickaxe.java b/src/main/java/de/jottyfan/quickiemod/item/ToolQuickiepowderPickaxe.java index 2054ece..21ee921 100644 --- a/src/main/java/de/jottyfan/quickiemod/item/ToolQuickiepowderPickaxe.java +++ b/src/main/java/de/jottyfan/quickiemod/item/ToolQuickiepowderPickaxe.java @@ -8,7 +8,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.PickaxeItem; import net.minecraft.item.ToolMaterial; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; @@ -21,13 +20,13 @@ import net.minecraft.util.Identifier; * @author jotty * */ -public class ToolQuickiepowderPickaxe extends PickaxeItem implements ToolRangeable { +public class ToolQuickiepowderPickaxe extends Item implements ToolRangeable { public static final int[] DEFAULT_HARVEST_RANGE = new int[] { 6, 6, 6 }; private final static ToolMaterial MATERIAL = new ToolMaterial(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 2400, 7f, 1f, 15, ItemTags.DIAMOND_TOOL_MATERIALS); public ToolQuickiepowderPickaxe(Identifier identifier) { - super(MATERIAL, 7F, -3.1F, new Item.Settings().useItemPrefixedTranslationKey().registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier))); + super(new Item.Settings().pickaxe(MATERIAL, 7F, -3.1F).useItemPrefixedTranslationKey().registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier))); } @Override diff --git a/src/main/java/de/jottyfan/quickiemod/item/ToolSpeedpowderPickaxe.java b/src/main/java/de/jottyfan/quickiemod/item/ToolSpeedpowderPickaxe.java index 04691cb..331495e 100644 --- a/src/main/java/de/jottyfan/quickiemod/item/ToolSpeedpowderPickaxe.java +++ b/src/main/java/de/jottyfan/quickiemod/item/ToolSpeedpowderPickaxe.java @@ -8,7 +8,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.PickaxeItem; import net.minecraft.item.ToolMaterial; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; @@ -21,13 +20,13 @@ import net.minecraft.util.Identifier; * @author jotty * */ -public class ToolSpeedpowderPickaxe extends PickaxeItem implements ToolRangeable { +public class ToolSpeedpowderPickaxe extends Item implements ToolRangeable { public static final int[] DEFAULT_HARVEST_RANGE = new int[] { 3, 3, 3 }; private final static ToolMaterial MATERIAL = new ToolMaterial(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 800, 7.0F, 1.0F, 15, ItemTags.DIAMOND_TOOL_MATERIALS); public ToolSpeedpowderPickaxe(Identifier identifier) { - super(MATERIAL, 7F, -3.1F, new Item.Settings().useItemPrefixedTranslationKey().registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier))); + super(new Item.Settings().pickaxe(MATERIAL, 7F, -3.1F).useItemPrefixedTranslationKey().registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier))); } @Override diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ca46935..007d15c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -28,8 +28,8 @@ "mixins": [ ], "depends": { - "fabricloader": ">=0.16.9", - "minecraft": "~1.21.4", + "fabricloader": ">=0.16.10", + "minecraft": "~1.21.5", "java": ">=21", "fabric-api": "*" },