fixed wood and ironwood item barrels not using axe isntead of wrench tag

GregTech-Intergalactical · Nov 1, 2023 · 1efc1a5 · 1efc1a5
1 parent cfede84
commit 1efc1a5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/...rc/main/java/io/github/gregtechintergalactical/gtcore/datagen/GTCoreBlockTagProvider.java b/...rc/main/java/io/github/gregtechintergalactical/gtcore/datagen/GTCoreBlockTagProvider.java
@@ -12,6 +12,8 @@
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Block;
 
+import static muramasa.antimatter.material.MaterialTags.WOOD;
+
 
 public class GTCoreBlockTagProvider extends AntimatterBlockTagProvider {
 
@@ -23,10 +25,18 @@ public GTCoreBlockTagProvider(String providerDomain, String providerName, boolea
     public void processTags(String domain) {
         super.processTags(domain);
         AntimatterAPI.all(BlockMachineMaterial.class, cas -> {
-            this.tag(AntimatterDefaultTools.WRENCH.getToolType()).add(cas);
+            if (cas.getMaterial().has(WOOD)){
+                this.tag(AntimatterDefaultTools.AXE.getToolType()).add(cas);
+            } else {
+                this.tag(AntimatterDefaultTools.WRENCH.getToolType()).add(cas);
+            }
         });
         AntimatterAPI.all(BlockMultiMachineMaterial.class, cas -> {
-            this.tag(AntimatterDefaultTools.WRENCH.getToolType()).add(cas);
+            if (cas.getMaterial().has(WOOD)){
+                this.tag(AntimatterDefaultTools.AXE.getToolType()).add(cas);
+            } else {
+                this.tag(AntimatterDefaultTools.WRENCH.getToolType()).add(cas);
+            }
         });
         /*AntimatterAPI.all(BlockMaterialChest.class, Ref.ID, cas -> {
             this.tag(AntimatterDefaultTools.WRENCH.getToolType()).add(cas);

diff --git a/.../src/main/java/io/github/gregtechintergalactical/gtcore/machine/BlockMachineMaterial.java b/.../src/main/java/io/github/gregtechintergalactical/gtcore/machine/BlockMachineMaterial.java
@@ -38,6 +38,10 @@ public BlockMachineMaterial(Machine<?> type, Tier tier, Properties properties) {
         }
     }
 
+    public Material getMaterial() {
+        return material;
+    }
+
     @Override
     public int getBlockColor(BlockState state, @Nullable BlockGetter world, @Nullable BlockPos pos, int i) {
         return i == 0 ? material.getRGB() : -1;

diff --git a/...main/java/io/github/gregtechintergalactical/gtcore/machine/BlockMultiMachineMaterial.java b/...main/java/io/github/gregtechintergalactical/gtcore/machine/BlockMultiMachineMaterial.java
@@ -25,6 +25,10 @@ public BlockMultiMachineMaterial(Machine<?> type, Tier tier) {
         }
     }
 
+    public Material getMaterial() {
+        return material;
+    }
+
     @Override
     public int getBlockColor(BlockState state, @Nullable BlockGetter world, @Nullable BlockPos pos, int i) {
         return i == 0 ? material.getRGB() : -1;