diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
11 files changed, 35 insertions, 65 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java index 1f303ad0da..debf059884 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java @@ -75,6 +75,10 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR break; } + // Blacklist materials which are handled by Werkstoff loader + if (aMaterial == Materials.Salt || aMaterial == Materials.RockSalt || aMaterial == Materials.Spodumene) + return; + switch (aMaterial.mName) { case "Tanzanite", "Sapphire", "Olivine", "GreenSapphire", "Opal", "Amethyst", "Emerald", "Ruby", "Amber", "Diamond", "FoolsRuby", "BlueTopaz", "GarnetRed", "Topaz", "Jasper", "GarnetYellow" -> GTValues.RA .stdBuilder() diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index e117d956bd..32430d02bd 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -49,6 +49,9 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra boolean aSpecialRecipeReq = aMaterial.contains(SubTag.MORTAR_GRINDABLE); boolean aFuelPower = aMaterial.mFuelPower > 0; + // Blacklist materials which are handled by Werkstoff loader + if (aMaterial == Materials.Salt || aMaterial == Materials.RockSalt || aMaterial == Materials.Spodumene) return; + switch (aPrefix) { case gem -> { // fuel recipes diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java index 9576262818..029a227ad5 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java @@ -28,6 +28,9 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + // Blacklist materials which are handled by Werkstoff loader + if (aMaterial == Materials.Salt || aMaterial == Materials.RockSalt || aMaterial == Materials.Spodumene) return; + switch (aMaterial.mName) { case "Diamond", "Glass" -> { GTValues.RA.stdBuilder() diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java index e6a74aac19..562b40d82e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java @@ -23,9 +23,16 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist OrePrefixes.plank.add(this); } + // Gross nasty hack to prevent spam registry of oredicted colored woods + private boolean registeredEXU = false; + @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + if (aModName != null && aModName.equals("ExtraUtilities")) { + if (registeredEXU) return; + else registeredEXU = true; + } if (aOreDictName.startsWith("plankWood")) { GTValues.RA.stdBuilder() .itemInputs(GTUtility.copyAmount(1, aStack)) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java index d04ffd1190..3949b2f3af 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java @@ -29,6 +29,9 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + // Blacklist materials which are handled by Werkstoff loader + if (aMaterial == Materials.Salt || aMaterial == Materials.RockSalt || aMaterial == Materials.Spodumene) return; + if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GTModHandler.addCraftingRecipe( GTOreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java index da21829d0c..e611d504b0 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java @@ -228,6 +228,7 @@ public class ProcessingStone implements IOreRecipeRegistrator { .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(cutterRecipes); + break; case "Basalt": GTValues.RA.stdBuilder() .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(3)) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java index 8d72819d26..de436ae004 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java @@ -37,7 +37,7 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { { if (GTOreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L) != null) { GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemInputs(GTOreDictUnificator.get(aPrefix, Materials.Wood, 1L)) .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L)) .fluidInputs( Materials.SeedOil @@ -53,7 +53,7 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { { if (GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) { GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemInputs(GTOreDictUnificator.get(aPrefix, Materials.Iron, 1L)) .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L)) .fluidInputs( Materials.FierySteel @@ -68,7 +68,7 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { { if (GTOreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L) != null) { GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemInputs(GTOreDictUnificator.get(aPrefix, Materials.Iron, 1L)) .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L)) .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS) .eut((int) TierEU.LV / 2) @@ -81,7 +81,7 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { { if (GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) { GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemInputs(GTOreDictUnificator.get(aPrefix, Materials.WroughtIron, 1L)) .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L)) .fluidInputs( Materials.FierySteel @@ -96,7 +96,7 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { { if (GTOreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L) != null) { GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemInputs(GTOreDictUnificator.get(aPrefix, Materials.WroughtIron, 1L)) .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.IronMagnetic, 1L)) .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS) .eut((int) TierEU.LV / 2) @@ -109,7 +109,7 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { { if (GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L) != null) { GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemInputs(GTOreDictUnificator.get(aPrefix, Materials.Steel, 1L)) .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.FierySteel, 1L)) .fluidInputs( Materials.FierySteel @@ -124,7 +124,7 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { { if (GTOreDictUnificator.get(aPrefix, Materials.SteelMagnetic, 1L) != null) { GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemInputs(GTOreDictUnificator.get(aPrefix, Materials.Steel, 1L)) .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.SteelMagnetic, 1L)) .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS) .eut((int) TierEU.LV / 2) @@ -137,7 +137,7 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { { if (GTOreDictUnificator.get(aPrefix, Materials.NeodymiumMagnetic, 1L) != null) { GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemInputs(GTOreDictUnificator.get(aPrefix, Materials.Neodymium, 1L)) .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.NeodymiumMagnetic, 1L)) .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS) .eut((int) TierEU.HV / 2) @@ -149,7 +149,7 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { { if (GTOreDictUnificator.get(aPrefix, Materials.SamariumMagnetic, 1L) != null) { GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemInputs(GTOreDictUnificator.get(aPrefix, Materials.Samarium, 1L)) .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.SamariumMagnetic, 1L)) .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS) .eut((int) TierEU.IV / 2) @@ -162,7 +162,7 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { { if (GTOreDictUnificator.get(aPrefix, Materials.TengamAttuned, 1L) != null) { GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack)) + .itemInputs(GTOreDictUnificator.get(aPrefix, Materials.TengamPurified, 1L)) .itemOutputs(GTOreDictUnificator.get(aPrefix, Materials.TengamAttuned, 1L)) .duration(((int) Math.max(16L, aPrefix.mMaterialAmount * 128L / GTValues.M)) * TICKS) .eut((int) TierEU.RECIPE_UHV) diff --git a/src/main/java/gregtech/loaders/postload/ProcessingArrayRecipeLoader.java b/src/main/java/gregtech/loaders/postload/ProcessingArrayRecipeLoader.java index 9525041fcc..184e1571e1 100644 --- a/src/main/java/gregtech/loaders/postload/ProcessingArrayRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/ProcessingArrayRecipeLoader.java @@ -3,6 +3,7 @@ package gregtech.loaders.postload; import gregtech.api.enums.SoundResource; import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.ProcessingArrayManager; +import gtPlusPlus.api.recipe.GTPPRecipeMaps; public class ProcessingArrayRecipeLoader { @@ -35,7 +36,7 @@ public class ProcessingArrayRecipeLoader { ProcessingArrayManager.addRecipeMapToPA("basicmachine.canner", RecipeMaps.cannerRecipes); ProcessingArrayManager.addSoundResourceToPA("basicmachine.canner", SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Centrifuge - ProcessingArrayManager.addRecipeMapToPA("basicmachine.centrifuge", RecipeMaps.centrifugeNonCellRecipes); + ProcessingArrayManager.addRecipeMapToPA("basicmachine.centrifuge", GTPPRecipeMaps.centrifugeNonCellRecipes); ProcessingArrayManager.addSoundResourceToPA("basicmachine.centrifuge", SoundResource.NONE); // Chemical Bath ProcessingArrayManager.addRecipeMapToPA("basicmachine.chemicalbath", RecipeMaps.chemicalBathRecipes); @@ -60,7 +61,7 @@ public class ProcessingArrayRecipeLoader { ProcessingArrayManager .addSoundResourceToPA("basicmachine.distillery", SoundResource.GT_MACHINES_DISTILLERY_LOOP); // Electrolyzer - ProcessingArrayManager.addRecipeMapToPA("basicmachine.electrolyzer", RecipeMaps.electrolyzerNonCellRecipes); + ProcessingArrayManager.addRecipeMapToPA("basicmachine.electrolyzer", GTPPRecipeMaps.electrolyzerNonCellRecipes); ProcessingArrayManager .addSoundResourceToPA("basicmachine.electrolyzer", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); // Extractor @@ -115,7 +116,7 @@ public class ProcessingArrayRecipeLoader { ProcessingArrayManager .addSoundResourceToPA("basicmachine.microwave", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP); // Mixer - ProcessingArrayManager.addRecipeMapToPA("basicmachine.mixer", RecipeMaps.mixerNonCellRecipes); + ProcessingArrayManager.addRecipeMapToPA("basicmachine.mixer", GTPPRecipeMaps.mixerNonCellRecipes); ProcessingArrayManager.addSoundResourceToPA("basicmachine.mixer", SoundResource.NONE); // Ore Washer ProcessingArrayManager.addRecipeMapToPA("basicmachine.orewasher", RecipeMaps.oreWasherRecipes); diff --git a/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java index 74b1e0e78e..b3605375bd 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java @@ -67,13 +67,6 @@ public class FermenterRecipes implements Runnable { .addTo(fermentingRecipes); GTValues.RA.stdBuilder() - .fluidInputs(getFluidStack("potion.reedwater", 50)) - .fluidOutputs(getFluidStack("potion.rum", 25)) - .duration(51 * SECONDS + 4 * TICKS) - .eut(2) - .addTo(fermentingRecipes); - - GTValues.RA.stdBuilder() .fluidInputs(getFluidStack("potion.rum", 50)) .fluidOutputs(getFluidStack("potion.piratebrew", 10)) .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java index d3197b6f30..69a82711e9 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java @@ -1,7 +1,6 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.IndustrialCraft2; -import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; @@ -153,14 +152,6 @@ public class FluidSolidifierRecipes implements Runnable { .addTo(fluidSolidifierRecipes); GTValues.RA.stdBuilder() - .itemInputs(ItemList.Shape_Mold_Plate.get(0L)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Glass, 1L)) - .fluidInputs(Materials.Glass.getMolten(144L)) - .duration(12 * TICKS) - .eut(4) - .addTo(fluidSolidifierRecipes); - - GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Bottle.get(0L)) .itemOutputs(ItemList.Bottle_Empty.get(1L)) .fluidInputs(Materials.Glass.getMolten(144L)) @@ -233,14 +224,6 @@ public class FluidSolidifierRecipes implements Runnable { .addTo(fluidSolidifierRecipes); GTValues.RA.stdBuilder() - .itemInputs(ItemList.Shape_Mold_Plate.get(0L)) - .itemOutputs(getModItem(NewHorizonsCoreMod.ID, "item.ReinforcedGlassPlate", 1L, 0)) - .fluidInputs(Materials.ReinforceGlass.getMolten(72)) - .duration(8 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(fluidSolidifierRecipes); - - GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Block.get(0L)) .itemOutputs(getModItem(IndustrialCraft2.ID, "blockAlloyGlass", 1L)) .fluidInputs(Materials.ReinforceGlass.getMolten(144)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java index 89f1fc6156..58f578c488 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java @@ -337,34 +337,6 @@ public class VacuumFreezerRecipes implements Runnable { .addTo(vacuumFreezerRecipes); GTValues.RA.stdBuilder() - .itemInputs(GTOreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Helium, 1L)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L)) - .duration(5 * TICKS) - .eut(TierEU.RECIPE_MV) - .addTo(vacuumFreezerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(GTOreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Nitrogen, 1L)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L)) - .duration(1 * SECONDS + 8 * TICKS) - .eut(TierEU.RECIPE_MV) - .addTo(vacuumFreezerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(GTOreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Oxygen, 1L)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L)) - .duration(1 * SECONDS + 12 * TICKS) - .eut(TierEU.RECIPE_MV) - .addTo(vacuumFreezerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(GTOreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Radon, 1L)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L)) - .duration(5 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_HV) - .addTo(vacuumFreezerRecipes); - - GTValues.RA.stdBuilder() .fluidInputs(Materials.Boron.getPlasma(144L)) .fluidOutputs(Materials.Boron.getMolten(144L)) .duration(1 * SECONDS) |