From 23a4a963ba06b69780487071fbc725a565ab19ca Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Sat, 8 Aug 2020 04:47:09 +1000 Subject: [PATCH] Fix FabricBlockSettings not copying the toolRequired boolean (#984) --- .../api/object/builder/v1/block/FabricBlockSettings.java | 1 + .../object/builder/AbstractBlockSettingsAccessor.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/FabricBlockSettings.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/FabricBlockSettings.java index 0207a22c0..c187a5ae1 100644 --- a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/FabricBlockSettings.java +++ b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/FabricBlockSettings.java @@ -66,6 +66,7 @@ public class FabricBlockSettings extends AbstractBlock.Settings { thisAccessor.setDynamicBounds(otherAccessor.getDynamicBounds()); thisAccessor.setOpaque(otherAccessor.getOpaque()); thisAccessor.setIsAir(otherAccessor.getIsAir()); + thisAccessor.setToolRequired(otherAccessor.isToolRequired()); // Now attempt to copy fabric specific data BlockSettingsInternals otherInternals = (BlockSettingsInternals) settings; diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/AbstractBlockSettingsAccessor.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/AbstractBlockSettingsAccessor.java index c1a927f67..975cc2fe1 100644 --- a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/AbstractBlockSettingsAccessor.java +++ b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/mixin/object/builder/AbstractBlockSettingsAccessor.java @@ -73,6 +73,9 @@ public interface AbstractBlockSettingsAccessor { @Accessor boolean getIsAir(); + @Accessor + boolean isToolRequired(); + /* SETTERS */ @Accessor void setMaterial(Material material); @@ -103,8 +106,11 @@ public interface AbstractBlockSettingsAccessor { @Accessor void setLootTableId(Identifier lootTableId); - /* INVOKERS */ + @Accessor + void setToolRequired(boolean toolRequired); + + /* INVOKERS */ @Invoker Block.Settings invokeSounds(BlockSoundGroup group);