From 683e0970aea98b5d59fb0de928d130cd8e44360e Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Wed, 25 Sep 2024 06:48:46 -0400 Subject: So, so, so many collisions (#3278) --- .../loaders/postload/recipes/AssemblerRecipes.java | 10 --- .../loaders/postload/recipes/MixerRecipes.java | 89 ---------------------- .../loaders/postload/recipes/PackagerRecipes.java | 7 -- .../postload/recipes/VacuumFreezerRecipes.java | 28 ------- 4 files changed, 134 deletions(-) (limited to 'src/main/java/gregtech/loaders/postload/recipes') diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index f4563a60ce..940f32e604 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -633,16 +633,6 @@ public class AssemblerRecipes implements Runnable { .eut(48) .addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 1)) - .itemOutputs(ItemList.Block_Plascrete.get(1)) - .fluidInputs(Materials.Concrete.getMolten(144)) - .duration(10 * SECONDS) - .eut(48) - .addTo(assemblerRecipes); - GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 16), diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java index c311ecd532..09400b8ba7 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java @@ -1144,17 +1144,6 @@ public class MixerRecipes implements Runnable { .eut(16) .addTo(mixerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - new ItemStack(Items.wheat, 4, 32767), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)) - .duration(10 * SECONDS) - .eut(16) - .addTo(mixerRecipes); - GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), @@ -1166,17 +1155,6 @@ public class MixerRecipes implements Runnable { .eut(16) .addTo(mixerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - getModItem(BiomesOPlenty.ID, "plants", 4, 6), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)) - .duration(10 * SECONDS) - .eut(16) - .addTo(mixerRecipes); - GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), @@ -1188,17 +1166,6 @@ public class MixerRecipes implements Runnable { .eut(16) .addTo(mixerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - getModItem(PamsHarvestCraft.ID, "oatsItem", 4), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)) - .duration(10 * SECONDS) - .eut(16) - .addTo(mixerRecipes); - GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), @@ -1210,17 +1177,6 @@ public class MixerRecipes implements Runnable { .eut(16) .addTo(mixerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - getModItem(PamsHarvestCraft.ID, "ryeItem", 4), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)) - .duration(10 * SECONDS) - .eut(16) - .addTo(mixerRecipes); - GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), @@ -1232,17 +1188,6 @@ public class MixerRecipes implements Runnable { .eut(16) .addTo(mixerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - getModItem(PamsHarvestCraft.ID, "barleyItem", 4, 6), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)) - .duration(10 * SECONDS) - .eut(16) - .addTo(mixerRecipes); - GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), @@ -1254,17 +1199,6 @@ public class MixerRecipes implements Runnable { .eut(16) .addTo(mixerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - getModItem(Natura.ID, "barleyFood", 4), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)) - .duration(10 * SECONDS) - .eut(16) - .addTo(mixerRecipes); - GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), @@ -1276,17 +1210,6 @@ public class MixerRecipes implements Runnable { .eut(16) .addTo(mixerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4), - GTUtility.getIntegratedCircuit(3)) - .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)) - .duration(10 * SECONDS) - .eut(16) - .addTo(mixerRecipes); - // radiation manufacturing GTValues.RA.stdBuilder() @@ -1537,18 +1460,6 @@ public class MixerRecipes implements Runnable { .eut(TierEU.RECIPE_HV) .addTo(mixerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - EnumCube.COKE_BLOCK.getItem(4), - ItemList.SFMixture.get(8), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_SSFUEL.get(4)) - .fluidInputs(Materials.NitroFuel.getFluid(1200)) - .duration(10 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(mixerRecipes); - GTValues.RA.stdBuilder() .itemInputs(EnumCube.COKE_BLOCK.getItem(), ItemList.SFMixture.get(2), GTUtility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_SSFUEL.get(1)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java index a86266029b..74f70aac41 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java @@ -23,13 +23,6 @@ public class PackagerRecipes implements Runnable { .eut(16) .addTo(packagerRecipes); - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Tool_MatchBox_Full.get(1L)) - .itemOutputs(ItemList.Tool_Matches.get(16L)) - .duration(1 * SECONDS + 12 * TICKS) - .eut(16) - .addTo(packagerRecipes); - GTValues.RA.stdBuilder() .itemInputs(ItemList.IC2_Scrap.get(9), ItemList.Schematic_3by3.get(0)) .itemOutputs(ItemList.IC2_Scrapbox.get(1)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java index 70881690aa..89f1fc6156 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java @@ -228,34 +228,6 @@ public class VacuumFreezerRecipes implements Runnable { .duration(1 * SECONDS + 8 * TICKS) .eut(TierEU.RECIPE_HV) .addTo(vacuumFreezerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Reactor_Coolant_Sp_1.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_Sp_1.get(1L)) - .duration(1 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(vacuumFreezerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Reactor_Coolant_Sp_2.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_Sp_2.get(1L)) - .duration(3 * MINUTES) - .eut(TierEU.RECIPE_MV) - .addTo(vacuumFreezerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Reactor_Coolant_Sp_3.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_Sp_3.get(1L)) - .duration(4 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(vacuumFreezerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Reactor_Coolant_Sp_6.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_Sp_6.get(1L)) - .duration(9 * MINUTES) - .eut(TierEU.RECIPE_MV) - .addTo(vacuumFreezerRecipes); } // Freeze superconductors. -- cgit