diff --git a/src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java index 74e97dda5..512610d0e 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/CompressorRecipes.java @@ -12,7 +12,6 @@ import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.Minecraft; -import static gregtech.api.enums.Mods.Natura; import static gregtech.api.enums.Mods.OpenComputers; import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.enums.Mods.ProjectRedCore; @@ -23,11 +22,9 @@ import static gregtech.api.enums.Mods.ThaumicTinkerer; import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.enums.Mods.TinkersDefence; -import static gregtech.api.enums.Mods.TwilightForest; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.SECONDS; -import static gregtech.api.util.GTRecipeBuilder.WILDCARD; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -58,7 +55,6 @@ public void run() { makeExtraUtilitiesRecipes(); makeGTPlusPlusRecipes(); makeHardcoreEnderExpansionRecipes(); - makeNaturaRecipes(); makePamsHarvestCraftRecipes(); makeRailcraftRecipes(); makeTinkerConstructRecipes(); @@ -163,18 +159,6 @@ public void run() { GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "reeds", 8, 0, missing)) .itemOutputs(getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1, 0, missing)).duration(15 * SECONDS) .eut(2).addTo(compressorRecipes); - GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "sapling", 8, WILDCARD, missing)) - .itemOutputs(getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1, 0, missing)).duration(15 * SECONDS) - .eut(2).addTo(compressorRecipes); - GTValues.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.ID, "blockRubSapling", 8, 0, missing)) - .itemOutputs(getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1, 0, missing)).duration(15 * SECONDS) - .eut(2).addTo(compressorRecipes); - - if (TwilightForest.isModLoaded()) { - GTValues.RA.stdBuilder().itemInputs(getModItem(TwilightForest.ID, "tile.TFSapling", 8, WILDCARD, missing)) - .itemOutputs(getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1, 0, missing)) - .duration(15 * SECONDS).eut(2).addTo(compressorRecipes); - } if (StevesCarts2.isModLoaded()) { GTValues.RA.stdBuilder() @@ -219,11 +203,6 @@ public void run() { .itemOutputs(getModItem(ThaumicTinkerer.ID, "darkQuartz", 1, 0, missing)).duration(15 * SECONDS) .eut(2).addTo(compressorRecipes); } - if (Forestry.isModLoaded()) { - GTValues.RA.stdBuilder().itemInputs(getModItem(Forestry.ID, "sapling", 8, WILDCARD, missing)) - .itemOutputs(getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1, 0, missing)) - .duration(15 * SECONDS).eut(2).addTo(compressorRecipes); - } } private void makeAdvancedSolarPanelRecipes() { @@ -269,13 +248,6 @@ private void makeBiomesOPlentyRecipes() { GTValues.RA.stdBuilder().itemInputs(getModItem(BiomesOPlenty.ID, "bones", 2, 1, missing)) .itemOutputs(getModItem(BiomesOPlenty.ID, "bones", 1, 2, missing)).duration(15 * SECONDS).eut(2) .addTo(compressorRecipes); - - GTValues.RA.stdBuilder().itemInputs(getModItem(BiomesOPlenty.ID, "saplings", 8, WILDCARD, missing)) - .itemOutputs(getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1, 0, missing)).duration(15 * SECONDS) - .eut(2).addTo(compressorRecipes); - GTValues.RA.stdBuilder().itemInputs(getModItem(BiomesOPlenty.ID, "colorizedSaplings", 8, WILDCARD, missing)) - .itemOutputs(getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1, 0, missing)).duration(15 * SECONDS) - .eut(2).addTo(compressorRecipes); } private void makeBloodMagicRecipes() { @@ -345,20 +317,6 @@ private void makeHardcoreEnderExpansionRecipes() { .eut(2).addTo(compressorRecipes); } - private void makeNaturaRecipes() { - if (!Natura.isModLoaded()) { - return; - } - GTValues.RA.stdBuilder().itemInputs(getModItem(Natura.ID, "barleyFood", 8, 0)) - .itemOutputs(ItemList.IC2_Plantball.get(1)).duration(15 * SECONDS).eut(2).addTo(compressorRecipes); - GTValues.RA.stdBuilder().itemInputs(getModItem(Natura.ID, "florasapling", 8, WILDCARD, missing)) - .itemOutputs(getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1, 0, missing)).duration(15 * SECONDS) - .eut(2).addTo(compressorRecipes); - GTValues.RA.stdBuilder().itemInputs(getModItem(Natura.ID, "Rare Sapling", 8, WILDCARD, missing)) - .itemOutputs(getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1, 0, missing)).duration(15 * SECONDS) - .eut(2).addTo(compressorRecipes); - } - private void makePamsHarvestCraftRecipes() { if (!PamsHarvestCraft.isModLoaded()) { return; @@ -417,13 +375,6 @@ private void makeThaumcraftRecipes() { GTValues.RA.stdBuilder().itemInputs(getModItem(Thaumcraft.ID, "ItemResource", 9, 3, missing)) .itemOutputs(getModItem(ThaumicBases.ID, "quicksilverBlock", 1, 0, missing)).duration(15 * SECONDS) .eut(2).addTo(compressorRecipes); - - GTValues.RA.stdBuilder().itemInputs(getModItem(Thaumcraft.ID, "blockCustomPlant", 8, 0, missing)) - .itemOutputs(getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1, 0, missing)).duration(15 * SECONDS) - .eut(2).addTo(compressorRecipes); - GTValues.RA.stdBuilder().itemInputs(getModItem(Thaumcraft.ID, "blockCustomPlant", 8, 1, missing)) - .itemOutputs(getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1, 0, missing)).duration(15 * SECONDS) - .eut(2).addTo(compressorRecipes); } private void makeTinkerConstructRecipes() { diff --git a/src/main/java/com/dreammaster/gthandler/recipes/ImplosionCompressorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/ImplosionCompressorRecipes.java index aaa562d23..828354f06 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/ImplosionCompressorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/ImplosionCompressorRecipes.java @@ -155,30 +155,6 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 2L)) .duration(20 * TICKS).eut(TierEU.RECIPE_LV).metadata(ADDITIVE_AMOUNT, 2).addTo(implosionRecipes); - GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.plateTriple, Materials.Ledox, 1L)) - .itemOutputs( - CustomItemList.LedoxCompressedPlate.get(1L), - GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L)) - .duration(20 * TICKS).eut(TierEU.RECIPE_LV).metadata(ADDITIVE_AMOUNT, 1).addTo(implosionRecipes); - - GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.plateTriple, Materials.Mytryl, 1L)) - .itemOutputs( - CustomItemList.MytrylCompressedPlate.get(1L), - GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L)) - .duration(20 * TICKS).eut(TierEU.RECIPE_LV).metadata(ADDITIVE_AMOUNT, 1).addTo(implosionRecipes); - - GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.plateTriple, Materials.Quantium, 1L)) - .itemOutputs( - CustomItemList.QuantinumCompressedPlate.get(1L), - GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L)) - .duration(20 * TICKS).eut(TierEU.RECIPE_LV).metadata(ADDITIVE_AMOUNT, 1).addTo(implosionRecipes); - - GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.plateTriple, Materials.CallistoIce, 1L)) - .itemOutputs( - CustomItemList.CallistoIceCompressedPlate.get(1L), - GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L)) - .duration(20 * TICKS).eut(TierEU.RECIPE_LV).metadata(ADDITIVE_AMOUNT, 1).addTo(implosionRecipes); - GTValues.RA.stdBuilder().itemInputs(CustomItemList.MytrylCompressedPlate.get(2L)) .itemOutputs( CustomItemList.MytrylDualCompressedPlates.get(1L),