diff options
Diffstat (limited to 'src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java')
| -rw-r--r-- | src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java | 497 |
1 files changed, 248 insertions, 249 deletions
diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java index 56e2a10df2..97b885668b 100644 --- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java @@ -1,40 +1,40 @@ package goodgenerator.loader; import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.neutronActivatorRecipes; -import static goodgenerator.items.MyMaterial.P507; -import static goodgenerator.items.MyMaterial.adamantine; -import static goodgenerator.items.MyMaterial.concentratedEnrichedNaquadahSludge; -import static goodgenerator.items.MyMaterial.enrichedNaquadahEarth; -import static goodgenerator.items.MyMaterial.enrichedNaquadahGoo; -import static goodgenerator.items.MyMaterial.enrichedNaquadahRichSolution; -import static goodgenerator.items.MyMaterial.enrichedNaquadahSulphate; -import static goodgenerator.items.MyMaterial.fluorineRichWasteLiquid; -import static goodgenerator.items.MyMaterial.fluoroantimonicAcid; -import static goodgenerator.items.MyMaterial.galliumHydroxide; -import static goodgenerator.items.MyMaterial.indiumPhosphate; -import static goodgenerator.items.MyMaterial.inertEnrichedNaquadah; -import static goodgenerator.items.MyMaterial.inertNaquadah; -import static goodgenerator.items.MyMaterial.inertNaquadria; -import static goodgenerator.items.MyMaterial.lowQualityNaquadahEmulsion; -import static goodgenerator.items.MyMaterial.lowQualityNaquadahSolution; -import static goodgenerator.items.MyMaterial.lowQualityNaquadriaPhosphate; -import static goodgenerator.items.MyMaterial.lowQualityNaquadriaSolution; -import static goodgenerator.items.MyMaterial.lowQualityNaquadriaSulphate; -import static goodgenerator.items.MyMaterial.magnesiumSulphate; -import static goodgenerator.items.MyMaterial.naquadahAdamantiumSolution; -import static goodgenerator.items.MyMaterial.naquadahEarth; -import static goodgenerator.items.MyMaterial.naquadahGoo; -import static goodgenerator.items.MyMaterial.naquadahRichSolution; -import static goodgenerator.items.MyMaterial.naquadahine; -import static goodgenerator.items.MyMaterial.naquadriaEarth; -import static goodgenerator.items.MyMaterial.naquadriaGoo; -import static goodgenerator.items.MyMaterial.naquadriaRichSolution; -import static goodgenerator.items.MyMaterial.naquadriaSulphate; -import static goodgenerator.items.MyMaterial.titaniumTrifluoride; -import static goodgenerator.items.MyMaterial.towEthyl1Hexanol; -import static goodgenerator.items.MyMaterial.triniumSulphate; -import static goodgenerator.items.MyMaterial.wasteLiquid; -import static goodgenerator.main.GG_Config_Loader.EnableNaquadahRework; +import static goodgenerator.items.GGMaterial.P507; +import static goodgenerator.items.GGMaterial.adamantine; +import static goodgenerator.items.GGMaterial.concentratedEnrichedNaquadahSludge; +import static goodgenerator.items.GGMaterial.enrichedNaquadahEarth; +import static goodgenerator.items.GGMaterial.enrichedNaquadahGoo; +import static goodgenerator.items.GGMaterial.enrichedNaquadahRichSolution; +import static goodgenerator.items.GGMaterial.enrichedNaquadahSulphate; +import static goodgenerator.items.GGMaterial.fluorineRichWasteLiquid; +import static goodgenerator.items.GGMaterial.fluoroantimonicAcid; +import static goodgenerator.items.GGMaterial.galliumHydroxide; +import static goodgenerator.items.GGMaterial.indiumPhosphate; +import static goodgenerator.items.GGMaterial.inertEnrichedNaquadah; +import static goodgenerator.items.GGMaterial.inertNaquadah; +import static goodgenerator.items.GGMaterial.inertNaquadria; +import static goodgenerator.items.GGMaterial.lowQualityNaquadahEmulsion; +import static goodgenerator.items.GGMaterial.lowQualityNaquadahSolution; +import static goodgenerator.items.GGMaterial.lowQualityNaquadriaPhosphate; +import static goodgenerator.items.GGMaterial.lowQualityNaquadriaSolution; +import static goodgenerator.items.GGMaterial.lowQualityNaquadriaSulphate; +import static goodgenerator.items.GGMaterial.magnesiumSulphate; +import static goodgenerator.items.GGMaterial.naquadahAdamantiumSolution; +import static goodgenerator.items.GGMaterial.naquadahEarth; +import static goodgenerator.items.GGMaterial.naquadahGoo; +import static goodgenerator.items.GGMaterial.naquadahRichSolution; +import static goodgenerator.items.GGMaterial.naquadahine; +import static goodgenerator.items.GGMaterial.naquadriaEarth; +import static goodgenerator.items.GGMaterial.naquadriaGoo; +import static goodgenerator.items.GGMaterial.naquadriaRichSolution; +import static goodgenerator.items.GGMaterial.naquadriaSulphate; +import static goodgenerator.items.GGMaterial.titaniumTrifluoride; +import static goodgenerator.items.GGMaterial.towEthyl1Hexanol; +import static goodgenerator.items.GGMaterial.triniumSulphate; +import static goodgenerator.items.GGMaterial.wasteLiquid; +import static goodgenerator.main.GGConfigLoader.EnableNaquadahRework; import static goodgenerator.util.MyRecipeAdder.computeRangeNKE; import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; @@ -45,14 +45,14 @@ import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; -import static gregtech.api.util.GT_RecipeConstants.NKE_RANGE; -import static gregtech.api.util.GT_RecipeConstants.QFT_FOCUS_TIER; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; -import static gregtech.common.items.GT_MetaGenerated_Item_01.registerCauldronCleaningFor; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeConstants.NKE_RANGE; +import static gregtech.api.util.GTRecipeConstants.QFT_FOCUS_TIER; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; +import static gregtech.common.items.MetaGeneratedItem01.registerCauldronCleaningFor; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.quantumForceTransformerRecipes; import java.util.HashSet; @@ -64,13 +64,12 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.PlatinumSludgeOverHaul; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; - +import bartworks.system.material.WerkstoffLoader; +import bartworks.system.material.gtenhancement.PlatinumSludgeOverHaul; import goodgenerator.main.GoodGenerator; import goodgenerator.util.CrackRecipeAdder; import goodgenerator.util.ItemRefer; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.Mods; @@ -78,12 +77,12 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.interfaces.IRecipeMutableAccess; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gregtech.common.items.CombType; -import gregtech.loaders.misc.GT_Bees; +import gregtech.loaders.misc.GTBees; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.item.chemistry.GenericChem; @@ -94,12 +93,12 @@ public class NaquadahReworkRecipeLoader { if (!EnableNaquadahRework) return; // Naquadah (UEV) - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( naquadahEarth.get(OrePrefixes.dust, 32), Materials.Sodium.getDust(64), Materials.Carbon.getDust(1), - GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)) + GTUtility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)) .itemOutputs( inertNaquadah.get(OrePrefixes.dust, 1), Materials.Titanium.getDust(64), @@ -110,29 +109,29 @@ public class NaquadahReworkRecipeLoader { Materials.Fluorine.getGas(64000L), Materials.Oxygen.getGas(100L)) .duration(10 * SECONDS) - .eut(GT_Values.VP[10]) + .eut(GTValues.VP[10]) .metadata(QFT_FOCUS_TIER, 2) .addTo(quantumForceTransformerRecipes); // Enriched Naquadah (UIV) - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( enrichedNaquadahEarth.get(OrePrefixes.dust, 32), Materials.Zinc.getDust(64), Materials.Carbon.getDust(1), - GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)) + GTUtility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)) .itemOutputs(inertEnrichedNaquadah.get(OrePrefixes.dust, 1), Materials.Trinium.getDust(64)) .fluidInputs(Materials.SulfuricAcid.getFluid(16000), Materials.Oxygen.getGas(100L)) .fluidOutputs(wasteLiquid.getFluidOrGas(32000)) .duration(10 * SECONDS) - .eut(GT_Values.VP[11]) + .eut(GTValues.VP[11]) .metadata(QFT_FOCUS_TIER, 2) .addTo(quantumForceTransformerRecipes); // Naquadria (UMV) - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( naquadriaEarth.get(OrePrefixes.dust, 32), Materials.Magnesium.getDust(64), - GT_Utility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst)) + GTUtility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst)) .itemOutputs( inertNaquadria.get(OrePrefixes.dust, 1), Materials.Barium.getDust(64), @@ -143,13 +142,13 @@ public class NaquadahReworkRecipeLoader { Materials.SulfuricAcid.getFluid(16000), Materials.Oxygen.getGas(100L)) .duration(5 * SECONDS) - .eut(GT_Values.VP[12]) + .eut(GTValues.VP[12]) .metadata(QFT_FOCUS_TIER, 3) .addTo(quantumForceTransformerRecipes); // Activate Them - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(inertNaquadah.get(OrePrefixes.dust, 64), inertNaquadah.get(OrePrefixes.dust, 32)) .itemOutputs(Materials.Nickel.getDust(16)) .fluidInputs(Materials.Nickel.getPlasma(144 * 16)) @@ -159,7 +158,7 @@ public class NaquadahReworkRecipeLoader { .metadata(NKE_RANGE, computeRangeNKE(600, 500)) .noOptimize() .addTo(neutronActivatorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( inertEnrichedNaquadah.get(OrePrefixes.dust, 64), inertEnrichedNaquadah.get(OrePrefixes.dust, 32)) @@ -171,7 +170,7 @@ public class NaquadahReworkRecipeLoader { .metadata(NKE_RANGE, computeRangeNKE(900, 850)) .noOptimize() .addTo(neutronActivatorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(inertNaquadria.get(OrePrefixes.dust, 64), inertNaquadria.get(OrePrefixes.dust, 32)) .itemOutputs(Materials.Americium.getDust(16)) .fluidInputs(Materials.Americium.getPlasma(144 * 16)) @@ -183,7 +182,7 @@ public class NaquadahReworkRecipeLoader { .addTo(neutronActivatorRecipes); // Fix shit - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(lowQualityNaquadriaSolution.get(OrePrefixes.cell, 1)) .itemOutputs(Materials.Tin.getDust(2)) .duration(16 * SECONDS + 14 * TICKS) @@ -191,8 +190,8 @@ public class NaquadahReworkRecipeLoader { .addTo(maceratorRecipes); // Naquadah Rework Line - GT_Values.RA.stdBuilder() - .itemInputs(naquadahEarth.get(OrePrefixes.dust, 2), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(naquadahEarth.get(OrePrefixes.dust, 2), GTUtility.getIntegratedCircuit(1)) .fluidInputs(fluoroantimonicAcid.getFluidOrGas(3000)) .fluidOutputs(lowQualityNaquadahEmulsion.getFluidOrGas(2000)) .itemOutputs(titaniumTrifluoride.get(OrePrefixes.dust, 4)) @@ -202,19 +201,19 @@ public class NaquadahReworkRecipeLoader { .addTo(blastFurnaceRecipes); // TiF3 + 3H = Ti + 3HF - GT_Values.RA.stdBuilder() - .itemInputs(titaniumTrifluoride.get(OrePrefixes.dust, 4), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(titaniumTrifluoride.get(OrePrefixes.dust, 4), GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Hydrogen.getGas(3000)) .fluidOutputs(Materials.HydrofluoricAcid.getFluid(3000)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Titanium, 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.Titanium, 1)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_EV) .metadata(COIL_HEAT, 2000) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 1)), + GTUtility.copyAmount(0, GTOreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 1)), Materials.Hydrogen.getCells(8)) .fluidInputs(FluidRegistry.getFluidStack("seedoil", 3000)) .itemOutputs(ItemList.Cell_Empty.get(8)) @@ -224,8 +223,8 @@ public class NaquadahReworkRecipeLoader { .addTo(UniversalChemical); // 2C8H18O + H3PO4 =Na,C2H6O= C16H35O3P + 2H2O - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 2)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 2)) .fluidInputs( towEthyl1Hexanol.getFluidOrGas(2000), Materials.PhosphoricAcid.getFluid(1000), @@ -235,7 +234,7 @@ public class NaquadahReworkRecipeLoader { .eut(TierEU.RECIPE_EV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(lowQualityNaquadahSolution.get(OrePrefixes.cell, 36), P507.get(OrePrefixes.cell, 4)) .itemOutputs(naquadahAdamantiumSolution.get(OrePrefixes.cell, 30), ItemList.Cell_Empty.get(10)) .fluidOutputs(fluorineRichWasteLiquid.getFluidOrGas(10000)) @@ -243,15 +242,15 @@ public class NaquadahReworkRecipeLoader { .eut(TierEU.RECIPE_EV) .addTo(chemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(P507.getFluidOrGas(4000), lowQualityNaquadahSolution.getFluidOrGas(36000)) .fluidOutputs(fluorineRichWasteLiquid.getFluidOrGas(10000), naquadahAdamantiumSolution.getFluidOrGas(30000)) .duration(3 * MINUTES + 20 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 40)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 40)) .fluidInputs(fluorineRichWasteLiquid.getFluidOrGas(1500)) .fluidOutputs(wasteLiquid.getFluidOrGas(1000)) .itemOutputs(WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 60)) @@ -263,11 +262,11 @@ public class NaquadahReworkRecipeLoader { wasteLiquid.getFluidOrGas(10000), new FluidStack[] { Materials.SaltWater.getFluid(3000), FluidRegistry.getFluidStack("phenol", 2000), Materials.HydrochloricAcid.getFluid(5000) }, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3), 15 * SECONDS, TierEU.RECIPE_HV); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemOutputs( adamantine.get(OrePrefixes.dust, 4), naquadahEarth.get(OrePrefixes.dust, 2), @@ -280,8 +279,8 @@ public class NaquadahReworkRecipeLoader { .noOptimize() .addTo(neutronActivatorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27)) .fluidInputs(naquadahRichSolution.getFluidOrGas(5000)) .itemOutputs(naquadahine.get(OrePrefixes.dust, 30)) .fluidOutputs(P507.getFluidOrGas(1000)) @@ -290,33 +289,33 @@ public class NaquadahReworkRecipeLoader { .addTo(autoclaveRecipes); // NqO2 + C = CO2 + Nq - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( naquadahine.get(OrePrefixes.dust, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1)) .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Naquadah, 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.Naquadah, 1)) .duration(2 * SECONDS) .eut(TierEU.RECIPE_IV) .metadata(COIL_HEAT, 5000) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27), + GTUtility.getIntegratedCircuit(1)) .fluidInputs(lowQualityNaquadahEmulsion.getFluidOrGas(10000)) .itemOutputs( galliumHydroxide.get(OrePrefixes.dust, 64), galliumHydroxide.get(OrePrefixes.dust, 48), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Antimony, 15)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Antimony, 15)) .outputChances(6250, 6250, 10000) .fluidOutputs(lowQualityNaquadahSolution.getFluidOrGas(9000)) .duration(50 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(enrichedNaquadahEarth.get(OrePrefixes.dust, 4)) .fluidInputs(P507.getFluidOrGas(1000), Materials.SulfuricAcid.getFluid(18000)) .fluidOutputs(enrichedNaquadahRichSolution.getFluidOrGas(4000), wasteLiquid.getFluidOrGas(1000)) @@ -326,7 +325,7 @@ public class NaquadahReworkRecipeLoader { .addTo(multiblockChemicalReactorRecipes); // ZnSO4 + 2H = H2SO4 + Zn - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(WerkstoffLoader.ZincSulfate.get(OrePrefixes.dust, 6)) .fluidInputs(Materials.Hydrogen.getGas(2000)) .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) @@ -335,8 +334,8 @@ public class NaquadahReworkRecipeLoader { .eut(TierEU.RECIPE_ULV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 60)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 60)) .fluidInputs(enrichedNaquadahRichSolution.getFluidOrGas(10000)) .itemOutputs(concentratedEnrichedNaquadahSludge.get(OrePrefixes.dust, 8)) .fluidOutputs(P507.getFluidOrGas(2500)) @@ -344,7 +343,7 @@ public class NaquadahReworkRecipeLoader { .eut(TierEU.RECIPE_HV) .addTo(autoclaveRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(concentratedEnrichedNaquadahSludge.get(OrePrefixes.dust, 16)) .itemOutputs( enrichedNaquadahSulphate.get(OrePrefixes.dust, 64), @@ -361,12 +360,12 @@ public class NaquadahReworkRecipeLoader { .addTo(neutronActivatorRecipes); // Nq+(SO4)2 + 2Zn = Nq+ + 2ZnSO4 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( enrichedNaquadahSulphate.get(OrePrefixes.dust, 11), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 2)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 2)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.NaquadahEnriched, 1), + GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.NaquadahEnriched, 1), WerkstoffLoader.ZincSulfate.get(OrePrefixes.dust, 12)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_IV) @@ -374,16 +373,16 @@ public class NaquadahReworkRecipeLoader { .addTo(blastFurnaceRecipes); // KeSO4 + 2H = Ke + H2SO4 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(triniumSulphate.get(OrePrefixes.dust, 6)) .fluidInputs(Materials.Hydrogen.getGas(2000)) .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 1)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(naquadriaEarth.get(OrePrefixes.dust, 4)) .fluidInputs(Materials.PhosphoricAcid.getFluid(4000)) .itemOutputs( @@ -395,38 +394,38 @@ public class NaquadahReworkRecipeLoader { .addTo(centrifugeRecipes); // Ga(OH)3 + 3Na = Ga + 3NaOH - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( galliumHydroxide.get(OrePrefixes.dust, 7), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 3)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 3)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9)) .duration(2 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); // 2InPO4 + 3Ca = 2In + Ca3(PO4)2 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( indiumPhosphate.get(OrePrefixes.dust, 12), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 3)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 3)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 5)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 2), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 5)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(lowQualityNaquadriaPhosphate.get(OrePrefixes.dust, 10), Materials.SulfuricAcid.getCells(30)) .fluidOutputs(naquadriaRichSolution.getFluidOrGas(9000)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Barite, 1), ItemList.Cell_Empty.get(30)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Barite, 1), ItemList.Cell_Empty.get(30)) .duration(50 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemOutputs( naquadriaSulphate.get(OrePrefixes.dust, 44), lowQualityNaquadriaSulphate.get(OrePrefixes.dust, 6)) @@ -437,7 +436,7 @@ public class NaquadahReworkRecipeLoader { .noOptimize() .addTo(neutronActivatorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(lowQualityNaquadriaSulphate.get(OrePrefixes.dust, 3), Materials.Water.getCells(3)) .fluidInputs(P507.getFluidOrGas(500)) .fluidOutputs(lowQualityNaquadriaSolution.getFluidOrGas(3500)) @@ -455,12 +454,12 @@ public class NaquadahReworkRecipeLoader { TierEU.RECIPE_IV); // Nq*(SO4)2 + 2Mg = Nq* + 2MgSO4 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( naquadriaSulphate.get(OrePrefixes.dust, 11), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Naquadria, 1), + GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.Naquadria, 1), magnesiumSulphate.get(OrePrefixes.dust, 12)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_ZPM) @@ -468,17 +467,17 @@ public class NaquadahReworkRecipeLoader { .addTo(blastFurnaceRecipes); // InPO4 + Ga(OH)3 = InGaP - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( indiumPhosphate.get(OrePrefixes.dust, 6), galliumHydroxide.get(OrePrefixes.dust, 7), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IndiumGalliumPhosphide, 3)) + GTUtility.getIntegratedCircuit(2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.IndiumGalliumPhosphide, 3)) .duration(15 * TICKS) .eut(TierEU.RECIPE_ULV) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ball.get(0)) .fluidInputs(naquadahGoo.getFluidOrGas(72)) .itemOutputs(ItemRefer.Naquadah_Mass.get(1)) @@ -486,7 +485,7 @@ public class NaquadahReworkRecipeLoader { .eut(TierEU.RECIPE_LV) .addTo(fluidSolidifierRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ball.get(0)) .fluidInputs(enrichedNaquadahGoo.getFluidOrGas(72)) .itemOutputs(ItemRefer.Enriched_Naquadah_Mass.get(1)) @@ -494,7 +493,7 @@ public class NaquadahReworkRecipeLoader { .eut(TierEU.RECIPE_LV) .addTo(fluidSolidifierRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ball.get(0)) .fluidInputs(naquadriaGoo.getFluidOrGas(72)) .itemOutputs(ItemRefer.Naquadria_Mass.get(1)) @@ -502,7 +501,7 @@ public class NaquadahReworkRecipeLoader { .eut(TierEU.RECIPE_LV) .addTo(fluidSolidifierRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Naquadah_Mass.get(1)) .itemOutputs(naquadahEarth.get(OrePrefixes.dust, 1), enrichedNaquadahEarth.get(OrePrefixes.dust, 1)) .outputChances(10000, 100) @@ -510,7 +509,7 @@ public class NaquadahReworkRecipeLoader { .eut(2) .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Enriched_Naquadah_Mass.get(1)) .itemOutputs(enrichedNaquadahEarth.get(OrePrefixes.dust, 1), naquadriaEarth.get(OrePrefixes.dust, 1)) .outputChances(10000, 100) @@ -518,7 +517,7 @@ public class NaquadahReworkRecipeLoader { .eut(2) .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Naquadria_Mass.get(1)) .itemOutputs(naquadriaEarth.get(OrePrefixes.dust, 1), naquadriaEarth.get(OrePrefixes.dust, 1)) .outputChances(10000, 100) @@ -526,9 +525,9 @@ public class NaquadahReworkRecipeLoader { .eut(2) .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 16), + GTOreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 16), naquadahine.get(OrePrefixes.dust, 3), ItemList.GalliumArsenideCrystal.get(1L)) .fluidInputs(Materials.Argon.getGas(8000)) @@ -539,15 +538,15 @@ public class NaquadahReworkRecipeLoader { .addTo(blastFurnaceRecipes); // NqO2 + 4Na = 2Na2O + Nq - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(naquadahine.get(OrePrefixes.dust, 3), Materials.Sodium.getDust(4)) .itemOutputs(Materials.Naquadah.getDust(1), Materials.SodiumOxide.getDust(6)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() - .itemInputs(naquadahEarth.get(OrePrefixes.dust, 2), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(naquadahEarth.get(OrePrefixes.dust, 2), GTUtility.getIntegratedCircuit(2)) .fluidInputs(Materials.Nitrogen.getGas(1000)) .itemOutputs(Materials.Naquadah.getNuggets(1)) .duration(2 * MINUTES) @@ -556,25 +555,25 @@ public class NaquadahReworkRecipeLoader { .addTo(blastFurnaceRecipes); // C2H4 + H2O(g) = C2H6O - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(24)) .fluidInputs(Materials.Ethylene.getGas(1000), FluidRegistry.getFluidStack("steam", 2000)) .fluidOutputs(Materials.Ethanol.getFluid(1000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(Materials.Ethylene.getCells(1), GTUtility.getIntegratedCircuit(24)) .fluidInputs(FluidRegistry.getFluidStack("steam", 2000)) .itemOutputs(Materials.Ethanol.getCells(1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(chemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Naquadah, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.Naquadah, 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1)) .duration(16 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(vacuumFreezerRecipes); @@ -582,20 +581,20 @@ public class NaquadahReworkRecipeLoader { public static void SmallRecipeChange() { - GT_Recipe tRecipe; + GTRecipe tRecipe; tRecipe = RecipeMaps.chemicalReactorRecipes.findRecipe( null, false, 1 << 30, new FluidStack[] { Materials.SulfuricAcid.getFluid(500) }, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 16), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 16), ItemList.Empty_Board_Elite.get(2)); if (tRecipe != null) { RecipeMaps.chemicalReactorRecipes.getBackend() .removeRecipe(tRecipe); - GT_Recipe tRecipe2 = tRecipe.copy(); - tRecipe2.mInputs = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 8), + GTRecipe tRecipe2 = tRecipe.copy(); + tRecipe2.mInputs = new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 8), ItemList.Empty_Board_Elite.get(2) }; RecipeMaps.chemicalReactorRecipes.add(tRecipe2); RecipeMaps.chemicalReactorRecipes.getBackend() @@ -607,13 +606,13 @@ public class NaquadahReworkRecipeLoader { false, 1 << 30, new FluidStack[] { Materials.SulfuricAcid.getFluid(500) }, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 16), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 16), ItemList.Empty_Board_Elite.get(2)); if (tRecipe != null) { RecipeMaps.multiblockChemicalReactorRecipes.getBackend() .removeRecipe(tRecipe); - GT_Recipe tRecipe2 = tRecipe.copy(); - tRecipe2.mInputs = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 8), + GTRecipe tRecipe2 = tRecipe.copy(); + tRecipe2.mInputs = new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 8), ItemList.Empty_Board_Elite.get(2) }; RecipeMaps.multiblockChemicalReactorRecipes.add(tRecipe2); RecipeMaps.multiblockChemicalReactorRecipes.getBackend() @@ -625,16 +624,16 @@ public class NaquadahReworkRecipeLoader { false, 1 << 30, new FluidStack[] { Materials.Polybenzimidazole.getMolten(36) }, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.HSSS, 1), - GT_Utility.getIntegratedCircuit(1)); + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 2), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.HSSS, 1), + GTUtility.getIntegratedCircuit(1)); if (tRecipe != null) { RecipeMaps.assemblerRecipes.getBackend() .removeRecipe(tRecipe); - GT_Recipe tRecipe2 = tRecipe.copy(); + GTRecipe tRecipe2 = tRecipe.copy(); tRecipe2.mInputs = new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NaquadahEnriched, 1) }; + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 2), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.NaquadahEnriched, 1) }; RecipeMaps.assemblerRecipes.add(tRecipe2); RecipeMaps.assemblerRecipes.getBackend() .reInit(); @@ -645,15 +644,15 @@ public class NaquadahReworkRecipeLoader { if (!EnableNaquadahRework) return; - GT_Log.out.print(GoodGenerator.MOD_ID + ": Begin to remove pure Naquadah, Enriched Naquadah and Naquadria.\n"); + GTLog.out.print(GoodGenerator.MOD_ID + ": Begin to remove pure Naquadah, Enriched Naquadah and Naquadria.\n"); - HashSet<GT_Recipe> remove = new HashSet<>(5000); - HashSet<GT_Recipe> reAdd = new HashSet<>(5000); + HashSet<GTRecipe> remove = new HashSet<>(5000); + HashSet<GTRecipe> reAdd = new HashSet<>(5000); // For Crusher - for (GT_Recipe recipe : RecipeMaps.maceratorRecipes.getAllRecipes()) { + for (GTRecipe recipe : RecipeMaps.maceratorRecipes.getAllRecipes()) { ItemStack input = recipe.mInputs[0]; - if (GT_Utility.isStackValid(input)) { + if (GTUtility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { if ((OreDictionary.getOreName(oreDictID) @@ -664,22 +663,22 @@ public class NaquadahReworkRecipeLoader { .startsWith("crushed")) && OreDictionary.getOreName(oreDictID) .contains("Naq")) { - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; @@ -700,39 +699,39 @@ public class NaquadahReworkRecipeLoader { RecipeMaps.maceratorRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Crusher done!\n"); + GTLog.out.print("Crusher done!\n"); // For Washer - for (GT_Recipe recipe : RecipeMaps.oreWasherRecipes.getAllRecipes()) { + for (GTRecipe recipe : RecipeMaps.oreWasherRecipes.getAllRecipes()) { ItemStack input = recipe.mInputs[0]; - if (GT_Utility.isStackValid(input)) { + if (GTUtility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { if (OreDictionary.getOreName(oreDictID) .startsWith("crushed") && OreDictionary.getOreName(oreDictID) .contains("Naq")) { - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; @@ -753,39 +752,39 @@ public class NaquadahReworkRecipeLoader { RecipeMaps.oreWasherRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Washer done!\n"); + GTLog.out.print("Washer done!\n"); // For Thermal Centrifuge - for (GT_Recipe recipe : RecipeMaps.thermalCentrifugeRecipes.getAllRecipes()) { + for (GTRecipe recipe : RecipeMaps.thermalCentrifugeRecipes.getAllRecipes()) { ItemStack input = recipe.mInputs[0]; - if (GT_Utility.isStackValid(input)) { + if (GTUtility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { if (OreDictionary.getOreName(oreDictID) .startsWith("crushed") && OreDictionary.getOreName(oreDictID) .contains("Naq")) { - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; @@ -806,26 +805,26 @@ public class NaquadahReworkRecipeLoader { RecipeMaps.thermalCentrifugeRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Thermal Centrifuge done!\n"); + GTLog.out.print("Thermal Centrifuge done!\n"); final boolean checkCombs = Mods.Forestry.isModLoaded(); // For Centrifuge - for (GT_Recipe recipe : RecipeMaps.centrifugeRecipes.getAllRecipes()) { + for (GTRecipe recipe : RecipeMaps.centrifugeRecipes.getAllRecipes()) { ItemStack input = null; if (recipe.mInputs.length > 0) input = recipe.mInputs[0]; - if (GT_Utility.isStackValid(input)) { + if (GTUtility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); - if (checkCombs && input.isItemEqual(GT_Bees.combs.getStackForType(CombType.DOB))) { - GT_Recipe tRecipe = recipe.copy(); + if (checkCombs && input.isItemEqual(GTBees.combs.getStackForType(CombType.DOB))) { + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2L, naquadahEarth.get(OrePrefixes.dustTiny, 1)); modified = true; @@ -844,52 +843,52 @@ public class NaquadahReworkRecipeLoader { .startsWith("dustSpace") || OreDictionary.getOreName(oreDictID) .startsWith("dustNaq")) { - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dustTiny, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dustTiny, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dustTiny, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustSmall(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dustSmall, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustSmall(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dustSmall, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustSmall(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dustSmall, 1)); modified = true; @@ -910,26 +909,26 @@ public class NaquadahReworkRecipeLoader { RecipeMaps.centrifugeRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Centrifuge done!\n"); + GTLog.out.print("Centrifuge done!\n"); // For Centrifuge (PA) - for (GT_Recipe recipe : RecipeMaps.centrifugeNonCellRecipes.getAllRecipes()) { + for (GTRecipe recipe : RecipeMaps.centrifugeNonCellRecipes.getAllRecipes()) { ItemStack input = null; if (recipe.mInputs.length > 0) input = recipe.mInputs[0]; - if (GT_Utility.isStackValid(input)) { + if (GTUtility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); - if (checkCombs && input.isItemEqual(GT_Bees.combs.getStackForType(CombType.DOB))) { - GT_Recipe tRecipe = recipe.copy(); + if (checkCombs && input.isItemEqual(GTBees.combs.getStackForType(CombType.DOB))) { + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2L, naquadahEarth.get(OrePrefixes.dustTiny, 1)); modified = true; @@ -948,52 +947,52 @@ public class NaquadahReworkRecipeLoader { .startsWith("dustSpace") || OreDictionary.getOreName(oreDictID) .startsWith("dustNaq")) { - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dustTiny, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dustTiny, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dustTiny, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustSmall(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dustSmall, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustSmall(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dustSmall, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustSmall(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dustSmall, 1)); modified = true; @@ -1014,39 +1013,39 @@ public class NaquadahReworkRecipeLoader { RecipeMaps.centrifugeNonCellRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Centrifuge (PA) done!\n"); + GTLog.out.print("Centrifuge (PA) done!\n"); // For Hammer - for (GT_Recipe recipe : RecipeMaps.hammerRecipes.getAllRecipes()) { + for (GTRecipe recipe : RecipeMaps.hammerRecipes.getAllRecipes()) { ItemStack input = recipe.mInputs[0]; - if (GT_Utility.isStackValid(input)) { + if (GTUtility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { if (OreDictionary.getOreName(oreDictID) .startsWith("crushed") && OreDictionary.getOreName(oreDictID) .contains("Naq")) { - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; @@ -1067,15 +1066,15 @@ public class NaquadahReworkRecipeLoader { RecipeMaps.hammerRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Hammer done!\n"); + GTLog.out.print("Hammer done!\n"); // For Chemical Reactor - for (GT_Recipe recipe : RecipeMaps.chemicalReactorRecipes.getAllRecipes()) { + for (GTRecipe recipe : RecipeMaps.chemicalReactorRecipes.getAllRecipes()) { if (recipe.mFluidOutputs == null) continue; boolean isAny = false; for (int i = 0; i < recipe.mFluidOutputs.length; i++) { @@ -1088,7 +1087,7 @@ public class NaquadahReworkRecipeLoader { } } if (!isAny) continue; - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < recipe.mFluidOutputs.length; i++) { if (recipe.mFluidOutputs[i] == null) continue; @@ -1114,15 +1113,15 @@ public class NaquadahReworkRecipeLoader { RecipeMaps.chemicalReactorRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Chemical Reactor done!\n"); + GTLog.out.print("Chemical Reactor done!\n"); // For Multi Chemical Reactor - for (GT_Recipe recipe : RecipeMaps.multiblockChemicalReactorRecipes.getAllRecipes()) { + for (GTRecipe recipe : RecipeMaps.multiblockChemicalReactorRecipes.getAllRecipes()) { if (recipe.mFluidOutputs == null) continue; boolean isAny = false; for (int i = 0; i < recipe.mFluidOutputs.length; i++) { @@ -1135,7 +1134,7 @@ public class NaquadahReworkRecipeLoader { } } if (!isAny) continue; - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < recipe.mFluidOutputs.length; i++) { if (recipe.mFluidOutputs[i] == null) continue; @@ -1161,12 +1160,12 @@ public class NaquadahReworkRecipeLoader { RecipeMaps.multiblockChemicalReactorRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Multi Chemical Reactor done!\n"); + GTLog.out.print("Multi Chemical Reactor done!\n"); // For Gt++ Multi Centrifuge // Apparently NEI will break down if one modifies the hash list directly. @@ -1177,30 +1176,30 @@ public class NaquadahReworkRecipeLoader { // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.reInit(); // For Simple Washer - for (GT_Recipe recipe : GTPPRecipeMaps.simpleWasherRecipes.getAllRecipes()) { + for (GTRecipe recipe : GTPPRecipeMaps.simpleWasherRecipes.getAllRecipes()) { ItemStack input = recipe.mInputs[0]; - if (GT_Utility.isStackValid(input)) { + if (GTUtility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { if (OreDictionary.getOreName(oreDictID) .startsWith("dustImpureNaq") || OreDictionary.getOreName(oreDictID) .startsWith("dustPureNaq")) { - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility + tRecipe.mOutputs[i] = GTUtility .copyAmount(tRecipe.mOutputs[i].stackSize, naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize, enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility + tRecipe.mOutputs[i] = GTUtility .copyAmount(tRecipe.mOutputs[i].stackSize, naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; } @@ -1220,27 +1219,27 @@ public class NaquadahReworkRecipeLoader { GTPPRecipeMaps.simpleWasherRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Simple Washer done!\n"); + GTLog.out.print("Simple Washer done!\n"); // For Cauldron Wash registerCauldronCleaningFor(Materials.Naquadah, naquadahEarth.getBridgeMaterial()); registerCauldronCleaningFor(Materials.NaquadahEnriched, enrichedNaquadahEarth.getBridgeMaterial()); registerCauldronCleaningFor(Materials.Naquadria, naquadriaEarth.getBridgeMaterial()); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace 3! "); - GT_Log.out.print("Cauldron Wash done!\n"); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace 3! "); + GTLog.out.print("Cauldron Wash done!\n"); // For Crafting Table CraftingManager.getInstance() .getRecipeList() .forEach(NaquadahReworkRecipeLoader::replaceInCraftTable); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace Unknown! "); - GT_Log.out.print("Crafting Table done!\n"); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace Unknown! "); + GTLog.out.print("Crafting Table done!\n"); } public static void replaceInCraftTable(Object obj) { @@ -1252,17 +1251,17 @@ public class NaquadahReworkRecipeLoader { Object input = mutableRecipe.gt5u$getRecipeInputs(); - if (GT_Utility.areStacksEqual(result, Materials.Naquadah.getDust(1), true)) { + if (GTUtility.areStacksEqual(result, Materials.Naquadah.getDust(1), true)) { if (PlatinumSludgeOverHaul.checkRecipe(input, Materials.Naquadah)) { return; } mutableRecipe.gt5u$setRecipeOutputItem(naquadahEarth.get(OrePrefixes.dust, 2)); - } else if (GT_Utility.areStacksEqual(result, Materials.NaquadahEnriched.getDust(1), true)) { + } else if (GTUtility.areStacksEqual(result, Materials.NaquadahEnriched.getDust(1), true)) { if (PlatinumSludgeOverHaul.checkRecipe(input, Materials.NaquadahEnriched)) { return; } mutableRecipe.gt5u$setRecipeOutputItem(enrichedNaquadahEarth.get(OrePrefixes.dust, 2)); - } else if (GT_Utility.areStacksEqual(result, Materials.Naquadria.getDust(1), true)) { + } else if (GTUtility.areStacksEqual(result, Materials.Naquadria.getDust(1), true)) { if (PlatinumSludgeOverHaul.checkRecipe(input, Materials.Naquadria)) { return; } |