diff --git a/AntimatterAPI b/AntimatterAPI index 9268762ab..44670740b 160000 --- a/AntimatterAPI +++ b/AntimatterAPI @@ -1 +1 @@ -Subproject commit 9268762ab7173e350dbfcc8597775f034d28cd1c +Subproject commit 44670740b647778a1107d1c04458ae771b95dc3c diff --git a/common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialEvents.java b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialEvents.java index 0cedc5b86..cfd03b6cd 100644 --- 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); } } \ No newline at end of file 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 index 0bd0a1cde..acf7149b6 100644 --- 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 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",