diff options
Diffstat (limited to 'src/main/java/goodgenerator/util')
| -rw-r--r-- | src/main/java/goodgenerator/util/CrackRecipeAdder.java | 211 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/util/ItemRefer.java | 4 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/util/MaterialFix.java | 129 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/util/StackUtils.java | 38 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/util/StructureHelper.java | 10 |
5 files changed, 195 insertions, 197 deletions
diff --git a/src/main/java/goodgenerator/util/CrackRecipeAdder.java b/src/main/java/goodgenerator/util/CrackRecipeAdder.java index dddb7fe69d..489732e068 100644 --- a/src/main/java/goodgenerator/util/CrackRecipeAdder.java +++ b/src/main/java/goodgenerator/util/CrackRecipeAdder.java @@ -7,27 +7,26 @@ import static gregtech.api.recipe.RecipeMaps.distilleryRecipes; import static gregtech.api.recipe.RecipeMaps.extruderRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.recipe.RecipeMaps.wiremillRecipes; -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.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; - -import gregtech.api.enums.GT_Values; +import bartworks.system.material.Werkstoff; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeBuilder; -import gregtech.api.util.GT_Utility; +import gregtech.api.metatileentity.implementations.MTECable; +import gregtech.api.metatileentity.implementations.MTEFluid; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeBuilder; +import gregtech.api.util.GTUtility; public class CrackRecipeAdder { @@ -44,24 +43,24 @@ public class CrackRecipeAdder { .getName() .replaceAll(" ", ""); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) .fluidInputs(inputFluid, cracker) .fluidOutputs(FluidRegistry.getFluidStack("lightlycracked" + name, 1000)) .duration(Math.max((long) (Duration * 0.8), 1L) * TICKS) .eut(EUt) .addTo(crackingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(2)) .fluidInputs(inputFluid, cracker) .fluidOutputs(FluidRegistry.getFluidStack("moderatelycracked" + name, 1000)) .duration(Math.max((long) (Duration), 1L) * TICKS) .eut(EUt) .addTo(crackingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(3)) .fluidInputs(inputFluid, cracker) .fluidOutputs(FluidRegistry.getFluidStack("heavilycracked" + name, 1000)) .duration(Math.max((long) (Duration * 1.2), 1L) * TICKS) @@ -112,8 +111,8 @@ public class CrackRecipeAdder { ItemStack input = material.get(OrePrefixes.dust, 1); ItemStack output = level > 1750 ? material.get(OrePrefixes.ingotHot, 1) : material.get(OrePrefixes.ingot, 1); if (gas) { - GT_Values.RA.stdBuilder() - .itemInputs(input, GT_Utility.getIntegratedCircuit(11)) + GTValues.RA.stdBuilder() + .itemInputs(input, GTUtility.getIntegratedCircuit(11)) .fluidInputs(Materials.Helium.getGas(1000)) .itemOutputs(output) .duration(duration * TICKS) @@ -121,8 +120,8 @@ public class CrackRecipeAdder { .metadata(COIL_HEAT, level) .addTo(blastFurnaceRecipes); } else { - GT_Values.RA.stdBuilder() - .itemInputs(input, GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(input, GTUtility.getIntegratedCircuit(1)) .itemOutputs(output) .duration(duration * TICKS) .eut(EUt) @@ -134,9 +133,9 @@ public class CrackRecipeAdder { public static void addUniversalDistillationRecipewithCircuit(FluidStack aInput, ItemStack[] aCircuit, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, long aEUt) { for (int i = 0; i < Math.min(aOutputs.length, 11); i++) { - GT_RecipeBuilder buildDistillation = GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(i + 1)); - if (aOutput2 != GT_Values.NI) { + GTRecipeBuilder buildDistillation = GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(i + 1)); + if (aOutput2 != GTValues.NI) { buildDistillation.itemOutputs(aOutput2); } buildDistillation.fluidInputs(aInput) @@ -145,9 +144,9 @@ public class CrackRecipeAdder { .eut(aEUt / 4) .addTo(distilleryRecipes); } - GT_RecipeBuilder buildDT = GT_Values.RA.stdBuilder() + GTRecipeBuilder buildDT = GTValues.RA.stdBuilder() .itemInputs(aCircuit); - if (aOutput2 != GT_Values.NI) { + if (aOutput2 != GTValues.NI) { buildDT.itemOutputs(aOutput2); } buildDT.fluidInputs(aInput) @@ -160,9 +159,9 @@ public class CrackRecipeAdder { public static void addUniversalDistillationRecipe(FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, long aEUt) { for (int i = 0; i < Math.min(aOutputs.length, 11); i++) { - GT_RecipeBuilder buildDistillation = GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(i + 1)); - if (aOutput2 != GT_Values.NI) { + GTRecipeBuilder buildDistillation = GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(i + 1)); + if (aOutput2 != GTValues.NI) { buildDistillation.itemOutputs(aOutput2); } buildDistillation.fluidInputs(aInput) @@ -171,8 +170,8 @@ public class CrackRecipeAdder { .eut(aEUt / 4) .addTo(distilleryRecipes); } - GT_RecipeBuilder buildDT = GT_Values.RA.stdBuilder(); - if (aOutput2 != GT_Values.NI) { + GTRecipeBuilder buildDT = GTValues.RA.stdBuilder(); + if (aOutput2 != GTValues.NI) { buildDT.itemOutputs(aOutput2); } buildDT.fluidInputs(aInput) @@ -191,9 +190,9 @@ public class CrackRecipeAdder { String unName = material.getDefaultName() .replace(" ", "_"); String Name = material.getDefaultName(); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(material.getBridgeMaterial()), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( ID, "GT_Pipe_" + unName + "_Tiny", "Tiny " + Name + " Fluid Pipe", @@ -202,9 +201,9 @@ public class CrackRecipeAdder { flow / 6, temp, gas).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(material.getBridgeMaterial()), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( ID + 1, "GT_Pipe_" + unName + "_Small", "Small " + Name + " Fluid Pipe", @@ -213,9 +212,9 @@ public class CrackRecipeAdder { flow / 3, temp, gas).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(material.getBridgeMaterial()), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( ID + 2, "GT_Pipe_" + unName, Name + " Fluid Pipe", @@ -224,9 +223,9 @@ public class CrackRecipeAdder { flow, temp, gas).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(material.getBridgeMaterial()), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( ID + 3, "GT_Pipe_" + unName + "_Large", "Large " + Name + " Fluid Pipe", @@ -235,9 +234,9 @@ public class CrackRecipeAdder { flow * 2, temp, gas).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeHuge.get(material.getBridgeMaterial()), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( ID + 4, "GT_Pipe_" + unName + "_Huge", "Huge " + Name + " Fluid Pipe", @@ -246,7 +245,7 @@ public class CrackRecipeAdder { flow * 4, temp, gas).getStackForm(1L)); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Pipe_Tiny.get(0)) .itemOutputs(material.get(OrePrefixes.pipeTiny, 2)) .duration( @@ -254,7 +253,7 @@ public class CrackRecipeAdder { .getMass() * TICKS) .eut(TierEU.RECIPE_MV) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Pipe_Small.get(0)) .itemOutputs(material.get(OrePrefixes.pipeSmall, 1)) .duration( @@ -263,7 +262,7 @@ public class CrackRecipeAdder { * TICKS) .eut(TierEU.RECIPE_MV) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot, 3), ItemList.Shape_Extruder_Pipe_Medium.get(0)) .itemOutputs(material.get(OrePrefixes.pipeMedium, 1)) .duration( @@ -272,7 +271,7 @@ public class CrackRecipeAdder { * TICKS) .eut(TierEU.RECIPE_MV) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot, 6), ItemList.Shape_Extruder_Pipe_Large.get(0)) .itemOutputs(material.get(OrePrefixes.pipeLarge, 1)) .duration( @@ -281,7 +280,7 @@ public class CrackRecipeAdder { * TICKS) .eut(TierEU.RECIPE_MV) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot, 12), ItemList.Shape_Extruder_Pipe_Huge.get(0)) .itemOutputs(material.get(OrePrefixes.pipeHuge, 1)) .duration( @@ -290,7 +289,7 @@ public class CrackRecipeAdder { * TICKS) .eut(TierEU.RECIPE_MV) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Pipe_Tiny.get(0)) .fluidInputs(material.getMolten(72)) .itemOutputs(material.get(OrePrefixes.pipeTiny, 1)) @@ -299,7 +298,7 @@ public class CrackRecipeAdder { .getMass() * TICKS) .eut(TierEU.RECIPE_LV) .addTo(fluidSolidifierRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Pipe_Small.get(0)) .fluidInputs(material.getMolten(144)) .itemOutputs(material.get(OrePrefixes.pipeSmall, 1)) @@ -309,7 +308,7 @@ public class CrackRecipeAdder { * TICKS) .eut(TierEU.RECIPE_LV) .addTo(fluidSolidifierRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Pipe_Medium.get(0)) .fluidInputs(material.getMolten(432)) .itemOutputs(material.get(OrePrefixes.pipeMedium, 1)) @@ -319,7 +318,7 @@ public class CrackRecipeAdder { * TICKS) .eut(TierEU.RECIPE_LV) .addTo(fluidSolidifierRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Pipe_Large.get(0)) .fluidInputs(material.getMolten(864)) .itemOutputs(material.get(OrePrefixes.pipeLarge, 1)) @@ -329,7 +328,7 @@ public class CrackRecipeAdder { * TICKS) .eut(TierEU.RECIPE_LV) .addTo(fluidSolidifierRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Pipe_Huge.get(0)) .fluidInputs(material.getMolten(1728)) .itemOutputs(material.get(OrePrefixes.pipeHuge, 1)) @@ -351,10 +350,10 @@ public class CrackRecipeAdder { String aTextWire2 = " Wire"; String aTextCable2 = " Cable"; int aLossInsulated = aLoss / 4; - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt01, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 0, aTextWire1 + unName + ".01", "1x " + Name + aTextWire2, @@ -365,10 +364,10 @@ public class CrackRecipeAdder { aVoltage, false, true).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt02, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 1, aTextWire1 + unName + ".02", "2x " + Name + aTextWire2, @@ -379,10 +378,10 @@ public class CrackRecipeAdder { aVoltage, false, true).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt04, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 2, aTextWire1 + unName + ".04", "4x " + Name + aTextWire2, @@ -393,10 +392,10 @@ public class CrackRecipeAdder { aVoltage, false, true).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt08, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 3, aTextWire1 + unName + ".08", "8x " + Name + aTextWire2, @@ -407,10 +406,10 @@ public class CrackRecipeAdder { aVoltage, false, true).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt12, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 4, aTextWire1 + unName + ".12", "12x " + Name + aTextWire2, @@ -421,10 +420,10 @@ public class CrackRecipeAdder { aVoltage, false, true).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt16, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 5, aTextWire1 + unName + ".16", "16x " + Name + aTextWire2, @@ -436,10 +435,10 @@ public class CrackRecipeAdder { false, true).getStackForm(1L)); if (cover) { - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt01, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 6, aTextCable1 + unName + ".01", "1x " + Name + aTextCable2, @@ -450,10 +449,10 @@ public class CrackRecipeAdder { aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt02, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 7, aTextCable1 + unName + ".02", "2x " + Name + aTextCable2, @@ -464,10 +463,10 @@ public class CrackRecipeAdder { aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt04, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 8, aTextCable1 + unName + ".04", "4x " + Name + aTextCable2, @@ -478,10 +477,10 @@ public class CrackRecipeAdder { aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt08, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 9, aTextCable1 + unName + ".08", "8x " + Name + aTextCable2, @@ -492,10 +491,10 @@ public class CrackRecipeAdder { aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt12, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 10, aTextCable1 + unName + ".12", "12x " + Name + aTextCable2, @@ -506,10 +505,10 @@ public class CrackRecipeAdder { aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt16, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 11, aTextCable1 + unName + ".16", "16x " + Name + aTextCable2, @@ -521,97 +520,97 @@ public class CrackRecipeAdder { true, false).getStackForm(1L)); } - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(material.get(OrePrefixes.wireGt01, 2)) .duration(5 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 1), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 1), GTUtility.getIntegratedCircuit(2)) .itemOutputs(material.get(OrePrefixes.wireGt02, 1)) .duration(7 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 2), GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 2), GTUtility.getIntegratedCircuit(4)) .itemOutputs(material.get(OrePrefixes.wireGt04, 1)) .duration(10 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 4), GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 4), GTUtility.getIntegratedCircuit(8)) .itemOutputs(material.get(OrePrefixes.wireGt08, 1)) .duration(12 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 6), GT_Utility.getIntegratedCircuit(12)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 6), GTUtility.getIntegratedCircuit(12)) .itemOutputs(material.get(OrePrefixes.wireGt12, 1)) .duration(15 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 8), GT_Utility.getIntegratedCircuit(16)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 8), GTUtility.getIntegratedCircuit(16)) .itemOutputs(material.get(OrePrefixes.wireGt16, 1)) .duration(17 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.stick, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(material.get(OrePrefixes.wireGt01, 1)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 2), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.stick, 2), GTUtility.getIntegratedCircuit(2)) .itemOutputs(material.get(OrePrefixes.wireGt02, 1)) .duration(5 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 4), GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.stick, 4), GTUtility.getIntegratedCircuit(4)) .itemOutputs(material.get(OrePrefixes.wireGt04, 1)) .duration(7 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 8), GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.stick, 8), GTUtility.getIntegratedCircuit(8)) .itemOutputs(material.get(OrePrefixes.wireGt08, 1)) .duration(10 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 12), GT_Utility.getIntegratedCircuit(12)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.stick, 12), GTUtility.getIntegratedCircuit(12)) .itemOutputs(material.get(OrePrefixes.wireGt12, 1)) .duration(12 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 16), GT_Utility.getIntegratedCircuit(16)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.stick, 16), GTUtility.getIntegratedCircuit(16)) .itemOutputs(material.get(OrePrefixes.wireGt16, 1)) .duration(15 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 1), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 1), GTUtility.getIntegratedCircuit(3)) .itemOutputs(material.get(OrePrefixes.wireFine, 8)) .duration(5 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 1), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.stick, 1), GTUtility.getIntegratedCircuit(3)) .itemOutputs(material.get(OrePrefixes.wireFine, 4)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.wireGt01, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.wireGt01, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(material.get(OrePrefixes.wireFine, 4)) .duration(10 * SECONDS) .eut(8) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Wire.get(0)) .itemOutputs(material.get(OrePrefixes.wireGt01, 2)) .duration( diff --git a/src/main/java/goodgenerator/util/ItemRefer.java b/src/main/java/goodgenerator/util/ItemRefer.java index 3662bb5bd1..f9af30e7df 100644 --- a/src/main/java/goodgenerator/util/ItemRefer.java +++ b/src/main/java/goodgenerator/util/ItemRefer.java @@ -7,7 +7,7 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import ic2.core.Ic2Items; public final class ItemRefer { @@ -217,7 +217,7 @@ public final class ItemRefer { public ItemStack get(int amount) { if (mItem != null) return new ItemStack(mItem, amount, mMeta); if (mBlock != null) return new ItemStack(mBlock, amount, mMeta); - if (mItemStack != null) return GT_Utility.copyAmount(amount, mItemStack); + if (mItemStack != null) return GTUtility.copyAmount(amount, mItemStack); return new ItemStack(_null_, amount, 0); } } diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java index 32827b18b2..8df7b3f4e6 100644 --- a/src/main/java/goodgenerator/util/MaterialFix.java +++ b/src/main/java/goodgenerator/util/MaterialFix.java @@ -4,31 +4,30 @@ import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; - -import gregtech.api.enums.GT_Values; +import bartworks.system.material.Werkstoff; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; public class MaterialFix { public static void MaterialFluidExtractionFix(Werkstoff material) { if (material.hasItemType(OrePrefixes.ingot)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot)) .fluidOutputs(material.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) .addTo(fluidExtractionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ingot.get(0)) .fluidInputs(material.getMolten(144)) .itemOutputs(material.get(OrePrefixes.ingot)) @@ -37,13 +36,13 @@ public class MaterialFix { .addTo(fluidSolidifierRecipes); } if (material.hasItemType(OrePrefixes.plate)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.plate)) .fluidOutputs(material.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) .addTo(fluidExtractionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Plate.get(0)) .fluidInputs(material.getMolten(144)) .itemOutputs(material.get(OrePrefixes.plate)) @@ -52,7 +51,7 @@ public class MaterialFix { .addTo(fluidSolidifierRecipes); } if (material.hasItemType(OrePrefixes.gearGtSmall)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.gearGtSmall)) .fluidOutputs(material.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) @@ -60,7 +59,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.stickLong)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.stickLong)) .fluidOutputs(material.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) @@ -68,7 +67,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.spring)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.spring)) .fluidOutputs(material.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) @@ -76,7 +75,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.stick)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.stick)) .fluidOutputs(material.getMolten(72)) .duration(16 * TICKS) @@ -84,7 +83,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.itemCasing)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.itemCasing)) .fluidOutputs(material.getMolten(72)) .duration(16 * TICKS) @@ -92,7 +91,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.wireGt01)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.wireGt01)) .fluidOutputs(material.getMolten(72)) .duration(16 * TICKS) @@ -100,16 +99,16 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.cableGt01)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.cableGt01)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2)) .fluidOutputs(material.getMolten(72)) .duration(16 * TICKS) .eut(8) .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.foil)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.foil)) .fluidOutputs(material.getMolten(36)) .duration(8 * TICKS) @@ -117,7 +116,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.springSmall)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.springSmall)) .fluidOutputs(material.getMolten(36)) .duration(8 * TICKS) @@ -125,7 +124,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.ring)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ring)) .fluidOutputs(material.getMolten(36)) .duration(8 * TICKS) @@ -133,7 +132,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.bolt)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.bolt)) .fluidOutputs(material.getMolten(18)) .duration(4 * TICKS) @@ -141,7 +140,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.wireFine)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.wireFine)) .fluidOutputs(material.getMolten(18)) .duration(4 * TICKS) @@ -149,7 +148,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.round)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.round)) .fluidOutputs(material.getMolten(16)) .duration(4 * TICKS) @@ -157,7 +156,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.screw)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.screw)) .fluidOutputs(material.getMolten(16)) .duration(4 * TICKS) @@ -165,7 +164,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.nugget)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.nugget)) .fluidOutputs(material.getMolten(16)) .duration(4 * TICKS) @@ -173,7 +172,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.rotor)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.rotor)) .fluidOutputs(material.getMolten(612)) .duration(136 * TICKS) @@ -181,7 +180,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.gearGt)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.gearGt)) .fluidOutputs(material.getMolten(576)) .duration(128 * TICKS) @@ -194,8 +193,8 @@ public class MaterialFix { for (Werkstoff tMaterial : Werkstoff.werkstoffHashSet) { if (tMaterial == null) continue; if (tMaterial.hasItemType(OrePrefixes.plateDouble) && tMaterial.hasItemType(OrePrefixes.ingotDouble)) { - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.plate, 2), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.plate, 2), GTUtility.getIntegratedCircuit(2)) .itemOutputs(tMaterial.get(OrePrefixes.plateDouble, 1)) .duration( Math.max( @@ -204,8 +203,8 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingotDouble, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingotDouble, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(tMaterial.get(OrePrefixes.plateDouble, 1)) .duration( Math.max( @@ -214,16 +213,16 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.plateDouble, 1), new Object[] { "P", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.ingotDouble, 1), new Object[] { "P", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1) }); } if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) { - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.plate, 3), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.plate, 3), GTUtility.getIntegratedCircuit(3)) .itemOutputs(tMaterial.get(OrePrefixes.plateTriple, 1)) .duration( Math.max( @@ -232,8 +231,8 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingot, 3), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingot, 3), GTUtility.getIntegratedCircuit(3)) .itemOutputs(tMaterial.get(OrePrefixes.plateTriple, 1)) .duration( Math.max( @@ -242,8 +241,8 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(tMaterial.get(OrePrefixes.plateTriple, 1)) .duration( Math.max( @@ -252,18 +251,18 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.plateTriple, 1), new Object[] { "B", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1), 'B', tMaterial.get(OrePrefixes.plateDouble, 1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.ingotTriple, 1), new Object[] { "B", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1), 'B', tMaterial.get(OrePrefixes.ingotDouble, 1) }); } if (tMaterial.hasItemType(OrePrefixes.plateDense)) { - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.plate, 9), GT_Utility.getIntegratedCircuit(9)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.plate, 9), GTUtility.getIntegratedCircuit(9)) .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) .duration( Math.max( @@ -272,8 +271,8 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingot, 9), GT_Utility.getIntegratedCircuit(9)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingot, 9), GTUtility.getIntegratedCircuit(9)) .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) .duration( Math.max( @@ -284,8 +283,8 @@ public class MaterialFix { .addTo(benderRecipes); if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) { - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.plateTriple, 3), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.plateTriple, 3), GTUtility.getIntegratedCircuit(3)) .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) .duration( Math.max( @@ -294,8 +293,8 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 3), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 3), GTUtility.getIntegratedCircuit(3)) .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) .duration( Math.max( @@ -308,7 +307,7 @@ public class MaterialFix { } if (tMaterial.hasItemType(OrePrefixes.stick)) { if (tMaterial.hasItemType(OrePrefixes.cellMolten)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Rod.get(0)) .fluidInputs(tMaterial.getMolten(72)) .itemOutputs(tMaterial.get(OrePrefixes.stick, 1)) @@ -323,7 +322,7 @@ public class MaterialFix { } if (tMaterial.hasItemType(OrePrefixes.stickLong)) { if (tMaterial.hasItemType(OrePrefixes.cellMolten)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Rod_Long.get(0)) .fluidInputs(tMaterial.getMolten(144)) .itemOutputs(tMaterial.get(OrePrefixes.stickLong, 1)) @@ -336,10 +335,10 @@ public class MaterialFix { .addTo(fluidSolidifierRecipes); } if (tMaterial.hasItemType(OrePrefixes.stick)) { - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.stickLong, 1), new Object[] { "PhP", 'P', tMaterial.get(OrePrefixes.stick, 1) }); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(tMaterial.get(OrePrefixes.stick, 2)) .itemOutputs(tMaterial.get(OrePrefixes.stickLong, 1)) .duration( @@ -352,11 +351,11 @@ public class MaterialFix { } } if (tMaterial.hasItemType(OrePrefixes.spring)) { - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.spring, 1), new Object[] { " s ", "fPx", " P ", 'P', tMaterial.get(OrePrefixes.stickLong, 1) }); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.stickLong, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.stickLong, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(tMaterial.get(OrePrefixes.spring, 1)) .duration( Math.max( @@ -367,11 +366,11 @@ public class MaterialFix { .addTo(benderRecipes); } if (tMaterial.hasItemType(OrePrefixes.springSmall)) { - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.springSmall, 1), new Object[] { " s ", "fPx", 'P', tMaterial.get(OrePrefixes.stick, 1) }); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.stick, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.stick, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(tMaterial.get(OrePrefixes.springSmall, 1)) .duration( Math.max( @@ -383,9 +382,9 @@ public class MaterialFix { } } Materials tUHV = Materials.Longasssuperconductornameforuhvwire; - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.stick, tUHV, 2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, tUHV, 1)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.stick, tUHV, 2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stickLong, tUHV, 1)) .duration(Math.max(tUHV.getMass(), 1L) * TICKS) .eut(TierEU.RECIPE_LV / 2) .addTo(hammerRecipes); diff --git a/src/main/java/goodgenerator/util/StackUtils.java b/src/main/java/goodgenerator/util/StackUtils.java index 2784828117..957ff6a4d3 100644 --- a/src/main/java/goodgenerator/util/StackUtils.java +++ b/src/main/java/goodgenerator/util/StackUtils.java @@ -13,10 +13,10 @@ import net.minecraftforge.fluids.FluidStack; import appeng.api.AEApi; import appeng.api.storage.data.IAEFluidStack; -import goodgenerator.items.MyMaterial; +import goodgenerator.items.GGMaterial; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; public class StackUtils { @@ -32,11 +32,11 @@ public class StackUtils { ArrayList<ItemStack> stacks = new ArrayList<>(); if (totalItems >= 64) { for (int i = 0; i < totalItems / 64; i++) { - stacks.add(GT_Utility.copyAmount(64, stack)); + stacks.add(GTUtility.copyAmount(64, stack)); } } if (totalItems % 64 > 0) { - stacks.add(GT_Utility.copyAmount(totalItems % 64, stack)); + stacks.add(GTUtility.copyAmount(totalItems % 64, stack)); } return stacks; } @@ -51,13 +51,13 @@ public class StackUtils { int newSize = i.stackSize; for (int j = index + 1; j < stacks.size(); j++) { ItemStack is2 = stacks.get(j); - if (GT_Utility.areStacksEqual(i, is2)) { + if (GTUtility.areStacksEqual(i, is2)) { newSize += is2.stackSize; stacks.remove(j); j--; } } - output.add(GT_Utility.copyAmountUnsafe(newSize, i)); + output.add(GTUtility.copyAmountUnsafe(newSize, i)); } return output; } @@ -70,11 +70,11 @@ public class StackUtils { HashMap<ItemStack, Integer> totals = new HashMap<>(); itemLoop: for (ItemStack item : items) { int t = items.stream() - .filter(i2 -> GT_Utility.areStacksEqual(item, i2)) + .filter(i2 -> GTUtility.areStacksEqual(item, i2)) .mapToInt(i -> i.stackSize) .sum(); - for (ItemStack i2 : totals.keySet()) if (GT_Utility.areStacksEqual(item, i2)) continue itemLoop; - totals.put(GT_Utility.copyAmount(1, item), t); + for (ItemStack i2 : totals.keySet()) if (GTUtility.areStacksEqual(item, i2)) continue itemLoop; + totals.put(GTUtility.copyAmount(1, item), t); } return totals; } @@ -96,27 +96,27 @@ public class StackUtils { case 2: // MV return Materials.RoseGold.getMolten(aAmount); case 3: // HV - return MyMaterial.zircaloy4.getMolten(aAmount); + return GGMaterial.zircaloy4.getMolten(aAmount); case 4: // EV - return MyMaterial.incoloy903.getMolten(aAmount); + return GGMaterial.incoloy903.getMolten(aAmount); case 5: // IV - return MyMaterial.titaniumBetaC.getMolten(aAmount); + return GGMaterial.titaniumBetaC.getMolten(aAmount); case 6: // LuV - return MyMaterial.artheriumSn.getMolten(aAmount); + return GGMaterial.artheriumSn.getMolten(aAmount); case 7: // ZPM - return MyMaterial.dalisenite.getMolten(aAmount); + return GGMaterial.dalisenite.getMolten(aAmount); case 8: // UV - return MyMaterial.tairitsu.getMolten(aAmount); + return GGMaterial.tairitsu.getMolten(aAmount); case 9: // UHV - return MyMaterial.preciousMetalAlloy.getMolten(aAmount); + return GGMaterial.preciousMetalAlloy.getMolten(aAmount); case 10: // UEV - return MyMaterial.enrichedNaquadahAlloy.getMolten(aAmount); + return GGMaterial.enrichedNaquadahAlloy.getMolten(aAmount); case 11: // UIV - return MyMaterial.metastableOganesson.getMolten(aAmount); + return GGMaterial.metastableOganesson.getMolten(aAmount); case 12: // UMV return MaterialsUEVplus.SpaceTime.getMolten(aAmount); default: - return MyMaterial.shirabon.getMolten(aAmount); + return GGMaterial.shirabon.getMolten(aAmount); } } diff --git a/src/main/java/goodgenerator/util/StructureHelper.java b/src/main/java/goodgenerator/util/StructureHelper.java index e66ac9f9ee..0d2c101ee9 100644 --- a/src/main/java/goodgenerator/util/StructureHelper.java +++ b/src/main/java/goodgenerator/util/StructureHelper.java @@ -19,8 +19,8 @@ import com.gtnewhorizon.structurelib.structure.IStructureElement; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.metatileentity.BaseMetaPipeEntity; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.metatileentity.implementations.MTEFrame; +import gregtech.api.util.GTOreDictUnificator; public class StructureHelper { @@ -35,8 +35,8 @@ public class StructureHelper { if (tBlock instanceof BaseMetaPipeEntity) { BaseMetaPipeEntity tFrame = (BaseMetaPipeEntity) tBlock; if (tFrame.isInvalidTileEntity()) return false; - if (tFrame.getMetaTileEntity() instanceof GT_MetaPipeEntity_Frame) { - return ((GT_MetaPipeEntity_Frame) tFrame.getMetaTileEntity()).mMaterial == aMaterials; + if (tFrame.getMetaTileEntity() instanceof MTEFrame) { + return ((MTEFrame) tFrame.getMetaTileEntity()).mMaterial == aMaterials; } } return false; @@ -54,7 +54,7 @@ public class StructureHelper { @Override public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { - ItemStack tFrame = GT_OreDictUnificator.get(OrePrefixes.frameGt, aMaterials, 1); + ItemStack tFrame = GTOreDictUnificator.get(OrePrefixes.frameGt, aMaterials, 1); if (tFrame.getItem() instanceof ItemBlock) { ItemBlock tFrameStackItem = (ItemBlock) tFrame.getItem(); return tFrameStackItem |