removed wood gears, stone gears and stone rods, and endstone rods

GT-Reimagined · Dec 6, 2024 · daf414f · daf414f
1 parent 171af1a
commit daf414f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/AntimatterAPI b/AntimatterAPI
diff --git a/common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialEvents.java b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialEvents.java
@@ -1,5 +1,6 @@
 package org.gtreimagined.gt5r.data;
 
+import muramasa.antimatter.data.AntimatterMaterialTypes;
 import org.gtreimagined.gt5r.material.GregTechMaterialEvent;
 import muramasa.antimatter.Data;
 import muramasa.antimatter.data.AntimatterDefaultTools;
@@ -193,7 +194,6 @@ public static void onMaterialEvent(GregTechMaterialEvent event){
         event.setMaterial(Materials.RawRubber).asDust(RUBBERTOOLS);
         event.setMaterial(Materials.RawStyreneButadieneRubber).asDust(RUBBERTOOLS);
         event.setMaterial(Materials.SodaAsh).asDust();
-        event.setMaterial(Wood).asDust(GEAR);
         /**
          *  Inorganic
          **/
@@ -1499,7 +1499,6 @@ private static void antimatterMaterials(GregTechMaterialEvent event){
         event.setMaterial(Water).mats(of(Materials.Hydrogen, 2, Materials.Oxygen, 1)).elecTicks(2000);
         event.setMaterial(Sugar).mats(of(Water, 11, Materials.Carbon, 12)).elecTicks(184);
         event.setMaterial(Glowstone).asFluid(0, 1000).flags(MOLTEN);
-        event.setMaterial(Endstone).flags(ROD_LONG);
         event.setMaterial(Flint).mats(of(Materials.SiliconDioxide, 1)).elecTicks(80);
     }
 }
diff --git a/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/VanillaExtensions.java b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/VanillaExtensions.java
@@ -31,18 +31,6 @@ public static void loadRecipes(Consumer<FinishedRecipe> consumer, AntimatterReci
         provider.addConditionalRecipe(consumer, provider.getStackRecipe("", false,
                 new ItemStack(Blocks.TORCH, 2), of('D', TagUtils.getForgelikeItemTag("dusts/sulfur"), 'R', ForgeCTags.RODS_WOODEN), "D", "R"), GT5RRef.class, "sulfurTorch", GT5RRef.ID, "sulfur_torch");
 
-       provider.addItemRecipe(consumer, GT5RRef.ID, "", "gears",
-                AntimatterMaterialTypes.GEAR.get(AntimatterMaterials.Wood), of('P', ItemTags.PLANKS, 'W', WRENCH.getTag(), 'R', ForgeCTags.RODS_WOODEN), "RPR", "PWP", "RPR");
-
-        provider.addItemRecipe(consumer, GT5RRef.ID, "gear_wood_alt", "gears",
-                AntimatterMaterialTypes.GEAR.get(AntimatterMaterials.Wood), of('P', ItemTags.PLANKS, 'W', WRENCH.getTag(), 'R', ForgeCTags.RODS_WOODEN), "RPR", "PWP", "RPR");
-
-        provider.addItemRecipe(consumer, GT5RRef.ID, "" , "gears",
-                AntimatterMaterialTypes.GEAR.get(AntimatterMaterials.Stone), of('S', ForgeCTags.STONE, 'W', WRENCH.getTag(), 'C', ForgeCTags.COBBLESTONE), "SCS", "CWC", "SCS");
-
-        provider.addItemRecipe(consumer, GT5RRef.ID,  "gear_stone_alt", "gears",
-                AntimatterMaterialTypes.GEAR.get(AntimatterMaterials.Stone), of('S', ForgeCTags.STONE, 'W', WRENCH.getTag(), 'C', ForgeCTags.COBBLESTONE), "CSC", "SWS", "CSC");
-
         provider.addItemRecipe(consumer, GT5RRef.ID, "chainmail_helmet", "chainmail_armor",
                 Items.CHAINMAIL_HELMET, of('R', AntimatterMaterialTypes.RING.getMaterialTag(Steel), 'H', HAMMER.getTag()), "RRR", "RHR");
         provider.addItemRecipe(consumer, GT5RRef.ID, "chainmail_chestplate", "chainmail_armor",
+1 −3		common/src/main/java/muramasa/antimatter/MaterialDataInit.java
+4 −2		common/src/main/java/muramasa/antimatter/blockentity/BlockEntityTickable.java