From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: The Great Renaming (#3014) * move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names --- .../loader/ComponentAssemblyLineMiscRecipes.java | 207 ++- .../loader/ComponentAssemblyLineRecipeLoader.java | 84 +- .../goodgenerator/loader/FuelRecipeLoader.java | 163 +- .../java/goodgenerator/loader/FuelRodLoader.java | 52 +- src/main/java/goodgenerator/loader/Loaders.java | 295 +-- .../loader/NaquadahReworkRecipeLoader.java | 497 +++--- .../loader/NeutronActivatorLoader.java | 34 +- .../java/goodgenerator/loader/RecipeLoader.java | 1057 ++++++----- .../java/goodgenerator/loader/RecipeLoader2.java | 1879 ++++++++++++++++++++ .../java/goodgenerator/loader/RecipeLoader_02.java | 1878 ------------------- 10 files changed, 3072 insertions(+), 3074 deletions(-) create mode 100644 src/main/java/goodgenerator/loader/RecipeLoader2.java delete mode 100644 src/main/java/goodgenerator/loader/RecipeLoader_02.java (limited to 'src/main/java/goodgenerator/loader') diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java index ecbb67fbf8..36ce938a04 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java @@ -15,12 +15,12 @@ import static goodgenerator.util.ItemRefer.Compassline_Casing_UXV; import static goodgenerator.util.ItemRefer.Compassline_Casing_ZPM; import static goodgenerator.util.ItemRefer.Component_Assembly_Line; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.HOURS; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; -import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM; -import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; +import static gregtech.api.util.GTRecipeBuilder.HOURS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.AssemblyLine; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME; import java.util.HashMap; @@ -31,21 +31,20 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.technus.tectech.recipe.TT_recipeAdder; - +import bartworks.system.material.WerkstoffLoader; import cpw.mods.fml.common.registry.GameRegistry; -import goodgenerator.items.MyMaterial; +import goodgenerator.items.GGMaterial; import goodgenerator.util.StackUtils; -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.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.recipe.common.CI; +import tectech.recipe.TTRecipeAdder; public class ComponentAssemblyLineMiscRecipes { @@ -63,7 +62,7 @@ public class ComponentAssemblyLineMiscRecipes { generateWrapRecipes(); // The controller itself - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, Compassline_Casing_EV.get(1)) .metadata(RESEARCH_TIME, 1 * HOURS) .itemInputs( @@ -76,8 +75,8 @@ public class ComponentAssemblyLineMiscRecipes { .get(32), ComponentType.Electric_Motor.getComponent(7) .get(32), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 16), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 32), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 16), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 32), ItemList.FluidSolidifierZPM.get(16L), getALCircuit(8, 16), getALCircuit(7, 20), @@ -96,118 +95,118 @@ public class ComponentAssemblyLineMiscRecipes { private static void generateCasingRecipes() { int t = 1; // lv 1 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Steel, 4), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Steel, 4), ComponentType.Robot_Arm.getComponent(t) .get(4), ComponentType.Electric_Piston.getComponent(t) .get(8), ComponentType.Electric_Motor.getComponent(t) .get(10), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Steel, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tin, 6), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Steel, 4), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tin, 6), getCircuit(t, 16)) .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) .itemOutputs(Compassline_Casing_LV.get(1)) .duration(16 * SECONDS) - .eut(GT_Values.VP[t]) + .eut(GTValues.VP[t]) .addTo(assemblerRecipes); // mv 2 t++; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Aluminium, 4), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Aluminium, 4), ComponentType.Robot_Arm.getComponent(t) .get(4), ComponentType.Electric_Piston.getComponent(t) .get(8), ComponentType.Electric_Motor.getComponent(t) .get(10), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Aluminium, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.AnyCopper, 6), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Aluminium, 4), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.AnyCopper, 6), getCircuit(t, 8), getCircuit(t - 1, 16)) .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) .itemOutputs(Compassline_Casing_MV.get(1)) .duration(16 * SECONDS) - .eut(GT_Values.VP[t]) + .eut(GTValues.VP[t]) .addTo(assemblerRecipes); // hv 3 t++; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StainlessSteel, 4), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.StainlessSteel, 4), ComponentType.Robot_Arm.getComponent(t) .get(4), ComponentType.Electric_Piston.getComponent(t) .get(8), ComponentType.Electric_Motor.getComponent(t) .get(10), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.StainlessSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Gold, 6), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.StainlessSteel, 4), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Gold, 6), getCircuit(t, 8), getCircuit(t - 1, 16)) .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) .itemOutputs(Compassline_Casing_HV.get(1)) .duration(16 * SECONDS) - .eut(GT_Values.VP[t]) + .eut(GTValues.VP[t]) .addTo(assemblerRecipes); // ev 4 t++; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 4), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 4), ComponentType.Robot_Arm.getComponent(t) .get(4), ComponentType.Electric_Piston.getComponent(t) .get(8), ComponentType.Electric_Motor.getComponent(t) .get(10), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 6), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 4), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 6), getCircuit(t, 8), getCircuit(t - 1, 16)) .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) .itemOutputs(Compassline_Casing_EV.get(1)) .duration(16 * SECONDS) - .eut(GT_Values.VP[t]) + .eut(GTValues.VP[t]) .addTo(assemblerRecipes); // iv 5 t++; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 4), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 4), ComponentType.Robot_Arm.getComponent(t) .get(4), ComponentType.Electric_Piston.getComponent(t) .get(8), ComponentType.Electric_Motor.getComponent(t) .get(10), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TungstenSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 6), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.TungstenSteel, 4), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 6), getCircuit(t, 8), getCircuit(t - 1, 16)) .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) .itemOutputs(Compassline_Casing_IV.get(1)) .duration(16 * SECONDS) - .eut(GT_Values.VP[t]) + .eut(GTValues.VP[t]) .addTo(assemblerRecipes); Fluid sold = FluidRegistry.getFluid("molten.indalloy140"); // Assline Recipes! // luv 6 t++; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, Compassline_Casing_IV.get(1)) .metadata(RESEARCH_TIME, (2250 << t) * TICKS) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1), WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plateDense, 6), ComponentType.Robot_Arm.getComponent(t) .get(8), @@ -217,7 +216,7 @@ public class ComponentAssemblyLineMiscRecipes { .get(16), WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGt, 4), WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGtSmall, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16)) .fluidInputs( @@ -231,21 +230,21 @@ public class ComponentAssemblyLineMiscRecipes { .addTo(AssemblyLine); // zpm 7 t++; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, Compassline_Casing_LuV.get(1)) .metadata(RESEARCH_TIME, (2250 << t) * TICKS) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 6), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 6), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) .get(10), ComponentType.Electric_Motor.getComponent(t) .get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iridium, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Naquadah, 8), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Iridium, 4), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 16), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Naquadah, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16)) .fluidInputs( @@ -260,21 +259,21 @@ public class ComponentAssemblyLineMiscRecipes { // uv 8 t++; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, Compassline_Casing_ZPM.get(1)) .metadata(RESEARCH_TIME, (2250 << t) * TICKS) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 6), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 6), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) .get(10), ComponentType.Electric_Motor.getComponent(t) .get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmium, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmium, 4), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 16), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16)) .fluidInputs( @@ -288,23 +287,23 @@ public class ComponentAssemblyLineMiscRecipes { .addTo(AssemblyLine); // uhv 9 t++; - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( Compassline_Casing_UV.get(1), 375 << (t - 2), 1 << (t - 3), (int) TierEU.RECIPE_UV, 1, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6), + new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) .get(10), ComponentType.Electric_Motor.getComponent(t) .get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.CosmicNeutronium, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 8), getALCircuit(t, 8), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.CosmicNeutronium, 4), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 16), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, @@ -314,23 +313,23 @@ public class ComponentAssemblyLineMiscRecipes { sold = FluidRegistry.getFluid("molten.mutatedlivingsolder"); // uev 10 t++; - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( Compassline_Casing_UHV.get(1), 375 << (t - 2), 1 << (t - 3), (int) TierEU.RECIPE_UHV, 1, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6), + new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) .get(10), ComponentType.Electric_Motor.getComponent(t) .get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Infinity, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Infinity, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 8), getALCircuit(t, 8), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Infinity, 4), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Infinity, 16), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, @@ -339,23 +338,23 @@ public class ComponentAssemblyLineMiscRecipes { (int) TierEU.RECIPE_UHV); // uiv 11 t++; - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( Compassline_Casing_UEV.get(1), 375 << (t - 2), 1 << (t - 3), (int) TierEU.RECIPE_UEV, 1, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 6), + new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 6), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) .get(10), ComponentType.Electric_Motor.getComponent(t) .get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.TranscendentMetal, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 8), getALCircuit(t, 8), + GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.TranscendentMetal, 4), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 16), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, @@ -364,23 +363,23 @@ public class ComponentAssemblyLineMiscRecipes { (int) TierEU.RECIPE_UEV); // umv 12 t++; - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( Compassline_Casing_UIV.get(1), 375 << (t - 2), 1 << (t - 3), (int) TierEU.RECIPE_UIV, 1, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 6), + new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 6), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) .get(10), ComponentType.Electric_Motor.getComponent(t) .get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.SpaceTime, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8), getALCircuit(t, 8), + GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.SpaceTime, 4), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, 16), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t - 1, 144 * t * 2), StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, @@ -389,31 +388,31 @@ public class ComponentAssemblyLineMiscRecipes { (int) TierEU.RECIPE_UIV); // uxv 13 t++; - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( Compassline_Casing_UMV.get(1), 375 << (t - 2), 1 << (t - 3), (int) TierEU.RECIPE_UMV, 1, new Object[] { - GT_OreDictUnificator + GTOreDictUnificator .get(OrePrefixes.frameGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1), - GT_OreDictUnificator + GTOreDictUnificator .get(OrePrefixes.plateDense, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 3), - MyMaterial.shirabon.get(OrePrefixes.plateDense, 3), ComponentType.Robot_Arm.getComponent(t) + GGMaterial.shirabon.get(OrePrefixes.plateDense, 3), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) .get(10), ComponentType.Electric_Motor.getComponent(t) .get(16), - GT_OreDictUnificator + GTOreDictUnificator .get(OrePrefixes.gearGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 2), - MyMaterial.shirabon.get(OrePrefixes.gearGt, 2), - GT_OreDictUnificator + GGMaterial.shirabon.get(OrePrefixes.gearGt, 2), + GTOreDictUnificator .get(OrePrefixes.gearGtSmall, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8), - MyMaterial.shirabon.get(OrePrefixes.gearGtSmall, 8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 4), getALCircuit(t, 8), + GGMaterial.shirabon.get(OrePrefixes.gearGtSmall, 8), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 4), + GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 4), getALCircuit(t, 8), getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), MaterialsUEVplus.BlackDwarfMatter.getMolten(144 * t * 2), MaterialsUEVplus.Eternity.getMolten(144 * t), @@ -425,27 +424,27 @@ public class ComponentAssemblyLineMiscRecipes { private static void generateWrapRecipes() { for (int i = 0; i <= 11; i++) { - GT_Values.RA.stdBuilder() - .itemInputs(getCircuit(i, 16), GT_Utility.getIntegratedCircuit(16)) + GTValues.RA.stdBuilder() + .itemInputs(getCircuit(i, 16), GTUtility.getIntegratedCircuit(16)) .fluidInputs(Materials.SolderingAlloy.getMolten(72L)) .itemOutputs(new ItemStack(Loaders.circuitWrap, 1, i)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( GameRegistry.findItemStack("dreamcraft", "item.PikoCircuit", 16), - GT_Utility.getIntegratedCircuit(16)) + GTUtility.getIntegratedCircuit(16)) .fluidInputs(Materials.SolderingAlloy.getMolten(72L)) .itemOutputs(new ItemStack(Loaders.circuitWrap, 1, 12)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( GameRegistry.findItemStack("dreamcraft", "item.QuantumCircuit", 16), - GT_Utility.getIntegratedCircuit(16)) + GTUtility.getIntegratedCircuit(16)) .fluidInputs(Materials.SolderingAlloy.getMolten(72L)) .itemOutputs(new ItemStack(Loaders.circuitWrap, 1, 13)) .duration(30 * SECONDS) @@ -466,13 +465,13 @@ public class ComponentAssemblyLineMiscRecipes { Sensor; public ItemList getComponent(int tier) { - if (tier < 0 || tier > GT_Values.VN.length) throw new IllegalArgumentException("Tier is out of range!"); - return ItemList.valueOf(this.name() + "_" + GT_Values.VN[tier]); + if (tier < 0 || tier > GTValues.VN.length) throw new IllegalArgumentException("Tier is out of range!"); + return ItemList.valueOf(this.name() + "_" + GTValues.VN[tier]); } } private static ItemStack getCircuit(int tier, long amount) { - return GT_OreDictUnificator.get(OrePrefixes.circuit, getCircuitMaterial(tier), amount); + return GTOreDictUnificator.get(OrePrefixes.circuit, getCircuitMaterial(tier), amount); } private static Object[] getALCircuit(int tier, int amount) { diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java index f72a31ed65..9de6926cf3 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java @@ -3,7 +3,7 @@ package goodgenerator.loader; import static goodgenerator.util.StackUtils.getTotalItems; import static goodgenerator.util.StackUtils.mergeStacks; import static goodgenerator.util.StackUtils.multiplyAndSplitIntoStacks; -import static gregtech.api.util.GT_RecipeConstants.COAL_CASING_TIER; +import static gregtech.api.util.GTRecipeConstants.COAL_CASING_TIER; import java.util.ArrayList; import java.util.Arrays; @@ -22,17 +22,17 @@ import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.tuple.Pair; import goodgenerator.api.recipe.GoodGeneratorRecipeMaps; -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.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.ItemData; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gregtech.common.items.GT_IntegratedCircuit_Item; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.common.items.ItemIntegratedCircuit; public class ComponentAssemblyLineRecipeLoader { @@ -42,8 +42,8 @@ public class ComponentAssemblyLineRecipeLoader { private static final String[] softBlacklistedDictPrefixes = { "Any", "crafting", "nanite" }; private static final String moltenMHDCSM = "molten.magnetohydrodynamicallyconstrainedstarmatter"; - private static LinkedHashMap, Pair> allAssemblerRecipes; - private static LinkedHashMap, Pair> allAsslineRecipes; + private static LinkedHashMap, Pair> allAssemblerRecipes; + private static LinkedHashMap, Pair> allAsslineRecipes; private static final HashMap magnetoConversionMultipliers = new HashMap<>(); private static final HashMap conversion = new HashMap<>(); @@ -88,14 +88,14 @@ public class ComponentAssemblyLineRecipeLoader { /** Normal assembler recipes (LV-IV) */ private static void generateAssemblerRecipes() { allAssemblerRecipes.forEach((recipeList, info) -> { - for (GT_Recipe recipe : recipeList) { + for (GTRecipe recipe : recipeList) { if (recipe != null) { ArrayList fixedInputs = new ArrayList<>(); ArrayList fixedFluids = new ArrayList<>(); for (int j = 0; j < recipe.mInputs.length; j++) { ItemStack input = recipe.mInputs[j]; - if (GT_Utility.isStackValid(input) && !(input.getItem() instanceof GT_IntegratedCircuit_Item)) + if (GTUtility.isStackValid(input) && !(input.getItem() instanceof ItemIntegratedCircuit)) fixedInputs.addAll(multiplyAndSplitIntoStacks(input, INPUT_MULTIPLIER)); } for (int j = 0; j < recipe.mFluidInputs.length; j++) { @@ -107,8 +107,8 @@ public class ComponentAssemblyLineRecipeLoader { fixedInputs = compactItems(fixedInputs, info.getRight()); replaceIntoFluids(fixedInputs, fixedFluids, 64); int tier = info.getRight(); - int energy = (int) Math.min(Integer.MAX_VALUE - 7, GT_Values.VP[tier - 1]); - GT_Values.RA.stdBuilder() + int energy = (int) Math.min(Integer.MAX_VALUE - 7, GTValues.VP[tier - 1]); + GTValues.RA.stdBuilder() .itemInputs(fixedInputs.toArray(new ItemStack[0])) .itemOutputs( info.getLeft() @@ -127,7 +127,7 @@ public class ComponentAssemblyLineRecipeLoader { /** Assembly Line Recipes (LuV+) **/ private static void generateAsslineRecipes() { allAsslineRecipes.forEach((recipeList, info) -> { - for (GT_Recipe.GT_Recipe_AssemblyLine recipe : recipeList) { + for (GTRecipe.RecipeAssemblyLine recipe : recipeList) { if (recipe != null) { int componentCircuit = -1; for (int i = 0; i < compPrefixes.length; i++) if (info.getLeft() @@ -153,17 +153,17 @@ public class ComponentAssemblyLineRecipeLoader { // First pass. for (ItemStack input : recipe.mInputs) { - if (GT_Utility.isStackValid(input)) { + if (GTUtility.isStackValid(input)) { int count = input.stackSize; // Mulitplies the input by its multiplier, and adjusts the stacks accordingly - if (!(input.getItem() instanceof GT_IntegratedCircuit_Item)) { + if (!(input.getItem() instanceof ItemIntegratedCircuit)) { - ItemData data = GT_OreDictUnificator.getAssociation(input); + ItemData data = GTOreDictUnificator.getAssociation(input); // trying to fix some circuit oredicting issues if (data != null && data.mPrefix == OrePrefixes.circuit) fixedInputs.addAll( multiplyAndSplitIntoStacks( - GT_OreDictUnificator.get(data.mPrefix, data.mMaterial.mMaterial, count), + GTOreDictUnificator.get(data.mPrefix, data.mMaterial.mMaterial, count), INPUT_MULTIPLIER)); else fixedInputs.addAll(multiplyAndSplitIntoStacks(input, INPUT_MULTIPLIER)); } @@ -174,10 +174,10 @@ public class ComponentAssemblyLineRecipeLoader { // If it overflows then it tries REALLY HARD to cram as much stuff into there. if (fixedInputs.size() > (addProgrammedCircuit ? 8 : 9)) replaceIntoFluids(fixedInputs, fixedFluids, FLUID_CONVERSION_STACKSIZE_THRESHOLD / 2); - if (addProgrammedCircuit) fixedInputs.add(GT_Utility.getIntegratedCircuit(componentCircuit)); + if (addProgrammedCircuit) fixedInputs.add(GTUtility.getIntegratedCircuit(componentCircuit)); addEternityForMHDCSM(fixedFluids); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(fixedInputs.toArray(new ItemStack[0])) .itemOutputs( info.getLeft() @@ -195,7 +195,7 @@ public class ComponentAssemblyLineRecipeLoader { // @allSyntheticRubber so it's quite fragile, but // it's also the least invasive change. if (swapSiliconeForStyreneButadiene(fixedFluids)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(fixedInputs.toArray(new ItemStack[0])) .itemOutputs( info.getLeft() @@ -225,15 +225,15 @@ public class ComponentAssemblyLineRecipeLoader { if (OreDictionary.getOreIDs(input).length > 0 && count > threshold) { FluidStack foundFluidStack = tryConvertItemStackToFluidMaterial(input); - ItemData data = GT_OreDictUnificator.getAssociation(input); + ItemData data = GTOreDictUnificator.getAssociation(input); // Prevents the uncraftable molten magnetic samarium from being converted into fluid during auto // generation if (data != null && data.mMaterial.mMaterial == Materials.SamariumMagnetic) { - input = GT_OreDictUnificator.get(data.mPrefix, Materials.Samarium, 1); + input = GTOreDictUnificator.get(data.mPrefix, Materials.Samarium, 1); foundFluidStack = tryConvertItemStackToFluidMaterial(input); } else if (data != null && data.mMaterial.mMaterial == Materials.TengamAttuned) { - input = GT_OreDictUnificator.get(data.mPrefix, Materials.TengamPurified, 1); + input = GTOreDictUnificator.get(data.mPrefix, Materials.TengamPurified, 1); foundFluidStack = tryConvertItemStackToFluidMaterial(input); } @@ -255,7 +255,7 @@ public class ComponentAssemblyLineRecipeLoader { } } if (!isConverted) { - newInputs.add(GT_Utility.copyAmountUnsafe(count, input)); + newInputs.add(GTUtility.copyAmountUnsafe(count, input)); } } inputs.clear(); @@ -299,10 +299,10 @@ public class ComponentAssemblyLineRecipeLoader { if (strippedOreDict.contains("Any")) continue; if (strippedOreDict.contains("PTMEG")) return FluidRegistry.getFluidStack( "molten.silicone", - (int) (orePrefix.mMaterialAmount / (GT_Values.M / 144)) * input.stackSize); + (int) (orePrefix.mMaterialAmount / (GTValues.M / 144)) * input.stackSize); return FluidRegistry.getFluidStack( "molten." + strippedOreDict.toLowerCase(), - (int) (orePrefix.mMaterialAmount / (GT_Values.M / 144)) * input.stackSize); + (int) (orePrefix.mMaterialAmount / (GTValues.M / 144)) * input.stackSize); } return null; } @@ -341,7 +341,7 @@ public class ComponentAssemblyLineRecipeLoader { HashMap totals = getTotalItems(items); for (ItemStack itemstack : totals.keySet()) { int totalItems = totals.get(itemstack); - ItemData data = GT_OreDictUnificator.getAssociation(itemstack); + ItemData data = GTOreDictUnificator.getAssociation(itemstack); boolean isCompacted = false; for (String dict : Arrays.stream(OreDictionary.getOreIDs(itemstack)) @@ -361,20 +361,20 @@ public class ComponentAssemblyLineRecipeLoader { if (data != null && !isCompacted) { OrePrefixes goInto = conversion.get(data.mPrefix); - if (goInto != null && GT_OreDictUnificator.get(goInto, data.mMaterial.mMaterial, 1) != null) { + if (goInto != null && GTOreDictUnificator.get(goInto, data.mMaterial.mMaterial, 1) != null) { compactorHelper(data, goInto, stacks, totalItems); isCompacted = true; } } - if (GT_Utility.areStacksEqual(itemstack, ItemList.Gravistar.get(1)) && tier >= 9) { + if (GTUtility.areStacksEqual(itemstack, ItemList.Gravistar.get(1)) && tier >= 9) { stacks.addAll(multiplyAndSplitIntoStacks(ItemList.NuclearStar.get(1), totalItems / 16)); isCompacted = true; } - if (GT_Utility - .areStacksEqual(itemstack, GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.Neutronium, 1))) { + if (GTUtility + .areStacksEqual(itemstack, GTOreDictUnificator.get(OrePrefixes.nanite, Materials.Neutronium, 1))) { stacks.addAll( multiplyAndSplitIntoStacks( - GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.Gold, 1), + GTOreDictUnificator.get(OrePrefixes.nanite, Materials.Gold, 1), totalItems / 16)); isCompacted = true; } @@ -390,7 +390,7 @@ public class ComponentAssemblyLineRecipeLoader { int materialRatio = (int) ((double) compactInto.mMaterialAmount / data.mPrefix.mMaterialAmount); output.addAll( multiplyAndSplitIntoStacks( - GT_OreDictUnificator.get(compactInto, data.mMaterial.mMaterial, 1), + GTOreDictUnificator.get(compactInto, data.mMaterial.mMaterial, 1), total / materialRatio)); } @@ -402,21 +402,21 @@ public class ComponentAssemblyLineRecipeLoader { allAsslineRecipes = new LinkedHashMap<>(); for (String compPrefix : compPrefixes) { for (int t = 1; t <= 13; t++) { - String vName = GT_Values.VN[t]; + String vName = GTValues.VN[t]; ItemList currentComponent = ItemList.valueOf(compPrefix + vName); if (currentComponent.hasBeenSet()) { if (t < 6) { - ArrayList foundRecipes = new ArrayList<>(); - for (GT_Recipe recipe : RecipeMaps.assemblerRecipes.getAllRecipes()) { - if (GT_Utility.areStacksEqual(currentComponent.get(1), recipe.mOutputs[0])) { + ArrayList foundRecipes = new ArrayList<>(); + for (GTRecipe recipe : RecipeMaps.assemblerRecipes.getAllRecipes()) { + if (GTUtility.areStacksEqual(currentComponent.get(1), recipe.mOutputs[0])) { foundRecipes.add(recipe); } } allAssemblerRecipes.put(foundRecipes, Pair.of(currentComponent, t)); } else { - ArrayList foundRecipes = new ArrayList<>(); - for (GT_Recipe.GT_Recipe_AssemblyLine recipe : GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes) { - if (GT_Utility.areStacksEqual(currentComponent.get(1), recipe.mOutput)) { + ArrayList foundRecipes = new ArrayList<>(); + for (GTRecipe.RecipeAssemblyLine recipe : GTRecipe.RecipeAssemblyLine.sAssemblylineRecipes) { + if (GTUtility.areStacksEqual(currentComponent.get(1), recipe.mOutput)) { foundRecipes.add(recipe); } } @@ -440,7 +440,7 @@ public class ComponentAssemblyLineRecipeLoader { private static List getMagnetoConversion(ItemStack item, int total) { ArrayList stacks = new ArrayList<>(); - ItemData data = GT_OreDictUnificator.getAssociation(item); + ItemData data = GTOreDictUnificator.getAssociation(item); if (data == null) { return stacks; } @@ -448,7 +448,7 @@ public class ComponentAssemblyLineRecipeLoader { double multiplier = magnetoConversionMultipliers.get(data.mPrefix); stacks.addAll( getWrappedCircuits( - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 1), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 1), (int) (total * multiplier), "circuitInfinite")); } diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java index fd1950c6ef..120c509d08 100644 --- a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java @@ -2,50 +2,49 @@ package goodgenerator.loader; import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.naquadahFuelRefineFactoryRecipes; import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.naquadahReactorFuels; -import static goodgenerator.main.GG_Config_Loader.NaquadahFuelTime; -import static goodgenerator.main.GG_Config_Loader.NaquadahFuelVoltage; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.LNG_BASIC_OUTPUT; -import static gregtech.api.util.GT_RecipeConstants.NFR_COIL_TIER; -import static gtPlusPlus.core.material.ELEMENT.STANDALONE.CHRONOMATIC_GLASS; +import static goodgenerator.main.GGConfigLoader.NaquadahFuelTime; +import static goodgenerator.main.GGConfigLoader.NaquadahFuelVoltage; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.LNG_BASIC_OUTPUT; +import static gregtech.api.util.GTRecipeConstants.NFR_COIL_TIER; +import static gtPlusPlus.core.material.MaterialsElements.STANDALONE.CHRONOMATIC_GLASS; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; - -import goodgenerator.items.MyMaterial; +import bartworks.system.material.WerkstoffLoader; +import goodgenerator.items.GGMaterial; import goodgenerator.util.ItemRefer; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.core.material.ELEMENT; +import gregtech.api.util.GTOreDictUnificator; +import gtPlusPlus.core.material.MaterialsElements; public class FuelRecipeLoader { public static void RegisterFuel() { - FluidStack[] inputs = new FluidStack[] { MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(1), - MyMaterial.thoriumBasedLiquidFuelExcited.getFluidOrGas(1), - MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(1), MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(1), MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(1), MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(1) }; - - FluidStack[] outputs = new FluidStack[] { MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1), - MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1), - MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkIIIDepleted.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkIVDepleted.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkVIDepleted.getFluidOrGas(1) }; + FluidStack[] inputs = new FluidStack[] { GGMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(1), + GGMaterial.thoriumBasedLiquidFuelExcited.getFluidOrGas(1), + GGMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkI.getFluidOrGas(1), GGMaterial.naquadahBasedFuelMkII.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkIII.getFluidOrGas(1), GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkV.getFluidOrGas(1), GGMaterial.naquadahBasedFuelMkVI.getFluidOrGas(1) }; + + FluidStack[] outputs = new FluidStack[] { GGMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1), + GGMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1), + GGMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkIIIDepleted.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkIVDepleted.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkVIDepleted.getFluidOrGas(1) }; for (int i = 0; i < 9; i++) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(inputs[i]) .fluidOutputs(outputs[i]) .duration(NaquadahFuelTime[i]) @@ -55,16 +54,16 @@ public class FuelRecipeLoader { } // MK III Naquadah Fuel - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 4), + GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 4), WerkstoffLoader.Tiberium.get(OrePrefixes.dust, 27), ItemRefer.High_Density_Uranium.get(2), ItemRefer.High_Density_Plutonium.get(1)) .fluidInputs( - MyMaterial.heavyNaquadahFuel.getFluidOrGas(800), - MyMaterial.lightNaquadahFuel.getFluidOrGas(1000)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(100)) + GGMaterial.heavyNaquadahFuel.getFluidOrGas(800), + GGMaterial.lightNaquadahFuel.getFluidOrGas(1000)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkIII.getFluidOrGas(100)) .duration(5 * SECONDS) .eut(1_100_000) .metadata(NFR_COIL_TIER, 1) @@ -72,16 +71,16 @@ public class FuelRecipeLoader { .addTo(naquadahFuelRefineFactoryRecipes); // Alternative higher tier recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 8), + GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 8), CHRONOMATIC_GLASS.getDust(9), ItemRefer.High_Density_Uranium.get(2), ItemRefer.High_Density_Plutonium.get(1)) .fluidInputs( - MyMaterial.heavyNaquadahFuel.getFluidOrGas(800), - MyMaterial.lightNaquadahFuel.getFluidOrGas(1000)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(200)) + GGMaterial.heavyNaquadahFuel.getFluidOrGas(800), + GGMaterial.lightNaquadahFuel.getFluidOrGas(1000)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkIII.getFluidOrGas(200)) .duration(5 * SECONDS) .eut(2_100_000) .metadata(NFR_COIL_TIER, 1) @@ -89,14 +88,14 @@ public class FuelRecipeLoader { .addTo(naquadahFuelRefineFactoryRecipes); // MK IV Naquadah Fuel - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - MyMaterial.orundum.get(OrePrefixes.dust, 32)) - .fluidInputs(MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), Materials.Praseodymium.getMolten(9216L)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250)) + GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GGMaterial.orundum.get(OrePrefixes.dust, 32)) + .fluidInputs(GGMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), Materials.Praseodymium.getMolten(9216L)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250)) .duration(8 * SECONDS) .eut(46_000_000) .metadata(NFR_COIL_TIER, 2) @@ -104,16 +103,16 @@ public class FuelRecipeLoader { .addTo(naquadahFuelRefineFactoryRecipes); // Alternate higher tier recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - MyMaterial.orundum.get(OrePrefixes.dust, 64)) + GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GGMaterial.orundum.get(OrePrefixes.dust, 64)) .fluidInputs( - MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), + GGMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 720)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(500)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(500)) .duration(8 * SECONDS) .eut(75_000_000) .metadata(NFR_COIL_TIER, 2) @@ -121,18 +120,18 @@ public class FuelRecipeLoader { .addTo(naquadahFuelRefineFactoryRecipes); // One-step recipe to allow easier scaling for MK VI - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 54), - MyMaterial.orundum.get(OrePrefixes.dust, 32), + GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 54), + GGMaterial.orundum.get(OrePrefixes.dust, 32), ItemRefer.High_Density_Uranium.get(10), ItemRefer.High_Density_Plutonium.get(5)) .fluidInputs( - MyMaterial.heavyNaquadahFuel.getFluidOrGas(4000), - MyMaterial.lightNaquadahFuel.getFluidOrGas(5000), + GGMaterial.heavyNaquadahFuel.getFluidOrGas(4000), + GGMaterial.lightNaquadahFuel.getFluidOrGas(5000), new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 360), new FluidStack(FluidRegistry.getFluid("molten.chromaticglass"), 6480)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250)) .duration(10 * TICKS) .eut(350_000_000) .metadata(NFR_COIL_TIER, 4) @@ -140,14 +139,14 @@ public class FuelRecipeLoader { .addTo(naquadahFuelRefineFactoryRecipes); // MK V Naquadah Fuel - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 8), - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 32)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 8), + GGMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 32)) .fluidInputs( - MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), + GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), FluidRegistry.getFluidStack("heavyradox", 250)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(500)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkV.getFluidOrGas(500)) .duration(10 * SECONDS) .eut(100_000_000) .metadata(NFR_COIL_TIER, 2) @@ -155,15 +154,15 @@ public class FuelRecipeLoader { .addTo(naquadahFuelRefineFactoryRecipes); // Alternate higher tier recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.SpaceTime, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.TranscendentMetal, 16), - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 48)) + GTOreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.SpaceTime, 4), + GTOreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.TranscendentMetal, 16), + GGMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 48)) .fluidInputs( - MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), + GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), FluidRegistry.getFluidStack("heavyradox", 250)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(750)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkV.getFluidOrGas(750)) .duration(5 * SECONDS) .eut(300_000_000) .metadata(NFR_COIL_TIER, 3) @@ -171,14 +170,14 @@ public class FuelRecipeLoader { .addTo(naquadahFuelRefineFactoryRecipes); // MK VI Naquadah Fuel - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - ELEMENT.STANDALONE.ASTRAL_TITANIUM.getDust(64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 32)) + MaterialsElements.STANDALONE.ASTRAL_TITANIUM.getDust(64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 32)) .fluidInputs( - MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(2000), + GGMaterial.naquadahBasedFuelMkV.getFluidOrGas(2000), FluidRegistry.getFluidStack("molten.shirabon", 360)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(500)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkVI.getFluidOrGas(500)) .duration(12 * SECONDS) .eut(320_000_000) .metadata(NFR_COIL_TIER, 3) @@ -186,15 +185,15 @@ public class FuelRecipeLoader { .addTo(naquadahFuelRefineFactoryRecipes); // Alternate higher tier recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.WhiteDwarfMatter, 4), - ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getDust(64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 48)) + GTOreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.WhiteDwarfMatter, 4), + MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getDust(64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 48)) .fluidInputs( - MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(2000), + GGMaterial.naquadahBasedFuelMkV.getFluidOrGas(2000), FluidRegistry.getFluidStack("molten.shirabon", 1440)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(750)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkVI.getFluidOrGas(750)) .duration(4 * SECONDS) .eut(TierEU.RECIPE_UXV) .metadata(NFR_COIL_TIER, 4) diff --git a/src/main/java/goodgenerator/loader/FuelRodLoader.java b/src/main/java/goodgenerator/loader/FuelRodLoader.java index 9654479861..5241c45bb7 100644 --- a/src/main/java/goodgenerator/loader/FuelRodLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRodLoader.java @@ -6,8 +6,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.GameRegistry; -import goodgenerator.items.DepletedFuelRod; -import goodgenerator.items.FuelRod; +import goodgenerator.items.ItemDepletedFuelRod; +import goodgenerator.items.ItemFuelRod; import goodgenerator.main.GoodGenerator; public class FuelRodLoader { @@ -38,62 +38,62 @@ public class FuelRodLoader { public static Item rodLiquidPlutonium_4; public static void RegisterRod() { - rodCompressedUraniumDepleted = new DepletedFuelRod( + rodCompressedUraniumDepleted = new ItemDepletedFuelRod( "rodCompressedUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 100); - rodCompressedUraniumDepleted_2 = new DepletedFuelRod( + rodCompressedUraniumDepleted_2 = new ItemDepletedFuelRod( "rodCompressedUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 200); - rodCompressedUraniumDepleted_4 = new DepletedFuelRod( + rodCompressedUraniumDepleted_4 = new ItemDepletedFuelRod( "rodCompressedUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 400); - rodCompressedPlutoniumDepleted = new DepletedFuelRod( + rodCompressedPlutoniumDepleted = new ItemDepletedFuelRod( "rodCompressedPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 120); - rodCompressedPlutoniumDepleted_2 = new DepletedFuelRod( + rodCompressedPlutoniumDepleted_2 = new ItemDepletedFuelRod( "rodCompressedPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 240); - rodCompressedPlutoniumDepleted_4 = new DepletedFuelRod( + rodCompressedPlutoniumDepleted_4 = new ItemDepletedFuelRod( "rodCompressedPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 480); - rodLiquidUraniumDepl