From 4e3659d08eef832da2bcd512c13ddeb779e0515c Mon Sep 17 00:00:00 2001 From: AnonymoDGH Date: Mon, 17 Aug 2026 19:53:31 -0500 Subject: [PATCH] Fix water/lava diggable by detecting fluid blocks from code Water and lava blocks were incorrectly marked diggable=true because their hardness is 100 (not -1). Detect fluid blocks from the source instead of hardcoding names: use instanceof FluidBlock (yarn 1.14+), instanceof LiquidBlock (mojmap 1.21.5+), Material.isFluid() (legacy 1.7-1.12.2), and FlowingFluidBlock via net.minecraft.class_3710 (1.13.2). This mirrors the existing instanceof AirBlock check and only flips actual fluid blocks. --- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 2 +- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 2 +- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 2 +- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 2 +- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 2 +- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 2 +- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 2 +- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- .../minecraftdatagenerator/generators/BlocksDataGenerator.java | 3 ++- 28 files changed, 49 insertions(+), 28 deletions(-) diff --git a/mc/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 1ec40aea..ca2b8e9c 100644 --- a/mc/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -98,7 +98,7 @@ public static JsonObject generateBlock(Block block) { blockDesc.addProperty("hardness", hardness); blockDesc.addProperty("resistance", ((BlockAccessor) block).getBlastResistance()); - blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock) && !defaultState.getMaterial().isFluid()); JsonObject effTools = new JsonObject(); effectiveTools.forEach(item -> effTools.addProperty( String.valueOf(Registries.ITEMS.getRawId(item)), // key diff --git a/mc/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index cb2c36ff..d0bb8158 100644 --- a/mc/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -97,7 +97,7 @@ public static JsonObject generateBlock(Block block) { blockDesc.addProperty("hardness", hardness); blockDesc.addProperty("resistance", ((BlockAccessor) block).getBlastResistance()); blockDesc.addProperty("stackSize", Item.fromBlock(block).getMaxCount()); - blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock) && !defaultState.getMaterial().isFluid()); JsonObject effTools = new JsonObject(); effectiveTools.forEach(item -> effTools.addProperty( String.valueOf(Registries.ITEMS.getRawId(item)), // key diff --git a/mc/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index ef5406f2..6b66e762 100644 --- a/mc/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -96,7 +96,7 @@ public static JsonObject generateBlock(Block block) { blockDesc.addProperty("hardness", hardness); blockDesc.addProperty("resistance", ((BlockAccessor) block).getBlastResistance()); blockDesc.addProperty("stackSize", Item.fromBlock(block).getMaxCount()); - blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock) && !defaultState.getMaterial().isFluid()); JsonObject effTools = new JsonObject(); effectiveTools.forEach(item -> effTools.addProperty( String.valueOf(Registries.ITEMS.getRawId(item)), // key diff --git a/mc/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 97ed20c7..504ff569 100644 --- a/mc/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -94,7 +94,7 @@ public static JsonObject generateBlock(Block block) { blockDesc.addProperty("hardness", hardness); blockDesc.addProperty("resistance", block.getBlastResistance()); blockDesc.addProperty("stackSize", block.getItem().getMaxCount()); - blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock) && !(block instanceof net.minecraft.class_3710)); JsonObject effTools = new JsonObject(); effectiveTools.forEach(item -> effTools.addProperty( String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index e30871ec..0a466e97 100644 --- a/mc/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -8,6 +8,7 @@ import net.minecraft.block.AirBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.FluidBlock; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -103,7 +104,7 @@ public static JsonObject generateBlock(Block block) { blockDesc.addProperty("hardness", hardness); blockDesc.addProperty("resistance", block.getBlastResistance()); blockDesc.addProperty("stackSize", block.asItem().getMaxAmount()); - blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock) && !(block instanceof FluidBlock)); JsonObject effTools = new JsonObject(); effectiveTools.forEach(item -> effTools.addProperty( String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 6d056d75..cb588aac 100644 --- a/mc/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -8,6 +8,7 @@ import net.minecraft.block.AirBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.FluidBlock; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.MiningToolItem; @@ -98,7 +99,7 @@ public static JsonObject generateBlock(Block block) { blockDesc.addProperty("hardness", hardness); blockDesc.addProperty("resistance", block.getBlastResistance()); blockDesc.addProperty("stackSize", block.asItem().getMaxCount()); - blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock) && !(block instanceof FluidBlock)); JsonObject effTools = new JsonObject(); effectiveTools.forEach(item -> effTools.addProperty( String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 2eba27c3..e47e2a27 100644 --- a/mc/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -8,6 +8,7 @@ import net.minecraft.block.AirBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.FluidBlock; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -105,7 +106,7 @@ public static JsonObject generateBlock(Block block) { blockDesc.addProperty("hardness", hardness); blockDesc.addProperty("resistance", block.getBlastResistance()); blockDesc.addProperty("stackSize", block.asItem().getMaxCount()); - blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock) && !(block instanceof FluidBlock)); JsonObject effTools = new JsonObject(); effectiveTools.forEach(item -> effTools.addProperty( String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index cb407427..7ea4af15 100644 --- a/mc/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -7,6 +7,7 @@ import net.minecraft.block.AirBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.FluidBlock; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -134,7 +135,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.getHardness()); blockDesc.addProperty("resistance", block.getBlastResistance()); blockDesc.addProperty("stackSize", block.asItem().getMaxCount()); - blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock) && !(block instanceof FluidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 077937eb..ab30e7db 100644 --- a/mc/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -7,6 +7,7 @@ import net.minecraft.block.AirBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.FluidBlock; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -147,7 +148,7 @@ public static JsonObject generateBlock(List // } JsonArray dropsArray = new JsonArray(); blockDesc.add("drops", dropsArray); - blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock) && !(block instanceof FluidBlock)); blockDesc.addProperty("transparent", !defaultState.isOpaque()); blockDesc.addProperty("filterLight", defaultState.getOpacity(EmptyBlockView.INSTANCE, BlockPos.ORIGIN)); blockDesc.addProperty("emitLight", defaultState.getLuminance()); diff --git a/mc/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index cb407427..7ea4af15 100644 --- a/mc/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -7,6 +7,7 @@ import net.minecraft.block.AirBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.FluidBlock; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -134,7 +135,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.getHardness()); blockDesc.addProperty("resistance", block.getBlastResistance()); blockDesc.addProperty("stackSize", block.asItem().getMaxCount()); - blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock) && !(block instanceof FluidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index cb407427..7ea4af15 100644 --- a/mc/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -7,6 +7,7 @@ import net.minecraft.block.AirBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.FluidBlock; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -134,7 +135,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.getHardness()); blockDesc.addProperty("resistance", block.getBlastResistance()); blockDesc.addProperty("stackSize", block.asItem().getMaxCount()); - blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock) && !(block instanceof FluidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 324b4d90..17245a7d 100644 --- a/mc/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -7,6 +7,7 @@ import net.minecraft.block.AirBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.FluidBlock; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -134,7 +135,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.getHardness()); blockDesc.addProperty("resistance", block.getBlastResistance()); blockDesc.addProperty("stackSize", block.asItem().getMaxCount()); - blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock) && !(block instanceof FluidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 1de1bd52..c1fcde5e 100644 --- a/mc/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -7,6 +7,7 @@ import net.minecraft.block.AirBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.FluidBlock; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -138,7 +139,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.getHardness()); blockDesc.addProperty("resistance", block.getBlastResistance()); blockDesc.addProperty("stackSize", block.asItem().getMaxCount()); - blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock) && !(block instanceof FluidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 324b4d90..17245a7d 100644 --- a/mc/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -7,6 +7,7 @@ import net.minecraft.block.AirBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.FluidBlock; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -134,7 +135,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.getHardness()); blockDesc.addProperty("resistance", block.getBlastResistance()); blockDesc.addProperty("stackSize", block.asItem().getMaxCount()); - blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock) && !(block instanceof FluidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 7023cb49..33fda7fc 100644 --- a/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -16,6 +16,7 @@ import net.minecraft.world.level.EmptyBlockGetter; import net.minecraft.world.level.block.AirBlock; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -139,7 +140,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.defaultDestroyTime()); blockDesc.addProperty("resistance", block.getExplosionResistance()); blockDesc.addProperty("stackSize", block.asItem().getDefaultMaxStackSize()); - blockDesc.addProperty("diggable", block.defaultDestroyTime() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.defaultDestroyTime() != -1.0f && !(block instanceof AirBlock) && !(block instanceof LiquidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 80236a55..cff7018d 100644 --- a/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -16,6 +16,7 @@ import net.minecraft.world.level.EmptyBlockGetter; import net.minecraft.world.level.block.AirBlock; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -139,7 +140,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.defaultDestroyTime()); blockDesc.addProperty("resistance", block.getExplosionResistance()); blockDesc.addProperty("stackSize", block.asItem().getDefaultMaxStackSize()); - blockDesc.addProperty("diggable", block.defaultDestroyTime() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.defaultDestroyTime() != -1.0f && !(block instanceof AirBlock) && !(block instanceof LiquidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index dfb6a56e..b06b7602 100644 --- a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -7,6 +7,7 @@ import net.minecraft.block.AirBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.FluidBlock; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -138,7 +139,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.getHardness()); blockDesc.addProperty("resistance", block.getBlastResistance()); blockDesc.addProperty("stackSize", block.asItem().getMaxCount()); - blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock) && !(block instanceof FluidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 7023cb49..33fda7fc 100644 --- a/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -16,6 +16,7 @@ import net.minecraft.world.level.EmptyBlockGetter; import net.minecraft.world.level.block.AirBlock; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -139,7 +140,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.defaultDestroyTime()); blockDesc.addProperty("resistance", block.getExplosionResistance()); blockDesc.addProperty("stackSize", block.asItem().getDefaultMaxStackSize()); - blockDesc.addProperty("diggable", block.defaultDestroyTime() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.defaultDestroyTime() != -1.0f && !(block instanceof AirBlock) && !(block instanceof LiquidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 7023cb49..33fda7fc 100644 --- a/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -16,6 +16,7 @@ import net.minecraft.world.level.EmptyBlockGetter; import net.minecraft.world.level.block.AirBlock; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -139,7 +140,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.defaultDestroyTime()); blockDesc.addProperty("resistance", block.getExplosionResistance()); blockDesc.addProperty("stackSize", block.asItem().getDefaultMaxStackSize()); - blockDesc.addProperty("diggable", block.defaultDestroyTime() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.defaultDestroyTime() != -1.0f && !(block instanceof AirBlock) && !(block instanceof LiquidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 7023cb49..33fda7fc 100644 --- a/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -16,6 +16,7 @@ import net.minecraft.world.level.EmptyBlockGetter; import net.minecraft.world.level.block.AirBlock; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -139,7 +140,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.defaultDestroyTime()); blockDesc.addProperty("resistance", block.getExplosionResistance()); blockDesc.addProperty("stackSize", block.asItem().getDefaultMaxStackSize()); - blockDesc.addProperty("diggable", block.defaultDestroyTime() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.defaultDestroyTime() != -1.0f && !(block instanceof AirBlock) && !(block instanceof LiquidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 7023cb49..33fda7fc 100644 --- a/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -16,6 +16,7 @@ import net.minecraft.world.level.EmptyBlockGetter; import net.minecraft.world.level.block.AirBlock; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -139,7 +140,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.defaultDestroyTime()); blockDesc.addProperty("resistance", block.getExplosionResistance()); blockDesc.addProperty("stackSize", block.asItem().getDefaultMaxStackSize()); - blockDesc.addProperty("diggable", block.defaultDestroyTime() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.defaultDestroyTime() != -1.0f && !(block instanceof AirBlock) && !(block instanceof LiquidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 7023cb49..33fda7fc 100644 --- a/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -16,6 +16,7 @@ import net.minecraft.world.level.EmptyBlockGetter; import net.minecraft.world.level.block.AirBlock; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -139,7 +140,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.defaultDestroyTime()); blockDesc.addProperty("resistance", block.getExplosionResistance()); blockDesc.addProperty("stackSize", block.asItem().getDefaultMaxStackSize()); - blockDesc.addProperty("diggable", block.defaultDestroyTime() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.defaultDestroyTime() != -1.0f && !(block instanceof AirBlock) && !(block instanceof LiquidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 1de1bd52..c1fcde5e 100644 --- a/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -7,6 +7,7 @@ import net.minecraft.block.AirBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.FluidBlock; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -138,7 +139,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.getHardness()); blockDesc.addProperty("resistance", block.getBlastResistance()); blockDesc.addProperty("stackSize", block.asItem().getMaxCount()); - blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock) && !(block instanceof FluidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index c42ab27c..af38c23a 100644 --- a/mc/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -48,7 +48,7 @@ public static JsonObject generateBlock(Block block) { blockDesc.addProperty("hardness", hardness); blockDesc.addProperty("resistance", ((BlockAccessor) block).getBlastResistance()); - blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock) && !block.getMaterial().isFluid()); JsonObject effTools = new JsonObject(); effectiveTools.forEach(item -> effTools.addProperty( String.valueOf(Registries.ITEMS.getRawId(item)), // key diff --git a/mc/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index a9c117f9..4f84ec23 100644 --- a/mc/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -97,7 +97,7 @@ public static JsonObject generateBlock(Block block) { blockDesc.addProperty("hardness", hardness); blockDesc.addProperty("resistance", ((BlockAccessor) block).getBlastResistance()); - blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock) && !block.getMaterial().isFluid()); JsonObject effTools = new JsonObject(); effectiveTools.forEach(item -> effTools.addProperty( String.valueOf(Registries.ITEMS.getRawId(item)), // key diff --git a/mc/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index f61dc62d..1199daf1 100644 --- a/mc/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -98,7 +98,7 @@ public static JsonObject generateBlock(Block block) { blockDesc.addProperty("hardness", hardness); blockDesc.addProperty("resistance", ((BlockAccessor) block).getBlastResistance()); - blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", hardness != -1.0f && !(block instanceof AirBlock) && !defaultState.getMaterial().isFluid()); JsonObject effTools = new JsonObject(); effectiveTools.forEach(item -> effTools.addProperty( String.valueOf(Registries.ITEMS.getRawId(item)), // key diff --git a/mc/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 121e6c5f..35992031 100644 --- a/mc/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -7,6 +7,7 @@ import net.minecraft.block.AirBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.FluidBlock; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -134,7 +135,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.getHardness()); blockDesc.addProperty("resistance", block.getBlastResistance()); blockDesc.addProperty("stackSize", block.asItem().getMaxCount()); - blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock) && !(block instanceof FluidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key diff --git a/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 4bcef972..f2defa94 100644 --- a/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -16,6 +16,7 @@ import net.minecraft.world.level.EmptyBlockGetter; import net.minecraft.world.level.block.AirBlock; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; @@ -135,7 +136,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("hardness", block.defaultDestroyTime()); blockDesc.addProperty("resistance", block.getExplosionResistance()); blockDesc.addProperty("stackSize", block.asItem().getDefaultMaxStackSize()); - blockDesc.addProperty("diggable", block.defaultDestroyTime() != -1.0f && !(block instanceof AirBlock)); + blockDesc.addProperty("diggable", block.defaultDestroyTime() != -1.0f && !(block instanceof AirBlock) && !(block instanceof LiquidBlock)); // JsonObject effTools = new JsonObject(); // effectiveTools.forEach(item -> effTools.addProperty( // String.valueOf(Registry.ITEM.getRawId(item)), // key