diff options
Diffstat (limited to 'src/main/java/common')
7 files changed, 104 insertions, 115 deletions
diff --git a/src/main/java/common/recipeLoaders/AlloySmelter.java b/src/main/java/common/recipeLoaders/AlloySmelter.java index 89cfcff35c..97a9a15f4e 100644 --- a/src/main/java/common/recipeLoaders/AlloySmelter.java +++ b/src/main/java/common/recipeLoaders/AlloySmelter.java @@ -1,7 +1,7 @@ package common.recipeLoaders; import static gregtech.api.enums.Mods.BartWorks; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes; +import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import common.items.MetaItem_CraftingComponent; @@ -24,7 +24,7 @@ public class AlloySmelter implements Runnable { craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), 3), ItemList.Shape_Mold_Plate.get(0)) .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 1)) - .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAlloySmelterRecipes); + .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(alloySmelterRecipes); } } } diff --git a/src/main/java/common/recipeLoaders/Assembler.java b/src/main/java/common/recipeLoaders/Assembler.java index b4138424f5..9ead02fec8 100644 --- a/src/main/java/common/recipeLoaders/Assembler.java +++ b/src/main/java/common/recipeLoaders/Assembler.java @@ -1,6 +1,6 @@ package common.recipeLoaders; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; +import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -37,7 +37,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderPearl, 3)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1)) .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(144)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); // TFFT Multi Hatch GT_Values.RA.stdBuilder() @@ -47,7 +47,7 @@ public class Assembler implements Runnable { ItemList.Field_Generator_LV.get(4), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Polytetrafluoroethylene, 25)) .itemOutputs(TileEntities.tfftHatch.getStackForm(1)).fluidInputs(Materials.Plastic.getMolten(432)) - .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); // TFFTStorageField1 GT_Values.RA.stdBuilder() @@ -58,7 +58,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Steel, 3), ItemList.FluidRegulator_LV.get(1)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 1)).fluidInputs(Materials.Glass.getMolten(144)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); // TFFTStorageField2 GT_Values.RA.stdBuilder() @@ -69,7 +69,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Plastic, 3), ItemList.FluidRegulator_MV.get(1)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 2)).fluidInputs(Materials.Plastic.getMolten(288)) - .duration(10 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .duration(10 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); // TFFTStorageField3 GT_Values.RA.stdBuilder() @@ -81,7 +81,7 @@ public class Assembler implements Runnable { ItemList.Field_Generator_LV.get(1), ItemList.FluidRegulator_HV.get(1)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 3)).fluidInputs(Materials.Plastic.getMolten(432)) - .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); // TFFTStorageField4 GT_Values.RA.stdBuilder() @@ -93,7 +93,7 @@ public class Assembler implements Runnable { ItemList.Field_Generator_MV.get(2), ItemList.FluidRegulator_EV.get(1)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 4)).fluidInputs(Materials.Epoxid.getMolten(864)) - .duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(assemblerRecipes); // TFFTStorageField5 GT_Values.RA.stdBuilder() @@ -105,7 +105,7 @@ public class Assembler implements Runnable { ItemList.Field_Generator_HV.get(4), ItemList.FluidRegulator_IV.get(1)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 5)).fluidInputs(Materials.Epoxid.getMolten(1152)) - .duration(20 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .duration(20 * SECONDS).eut(TierEU.RECIPE_IV).addTo(assemblerRecipes); // LSC Casing GT_Values.RA.stdBuilder() @@ -115,7 +115,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 2), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lapis, 1)) .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 0)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); // EV Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -124,7 +124,7 @@ public class Assembler implements Runnable { GT_ModHandler.getIC2Item("lapotronCrystal", 1L, GT_Values.W), GT_Utility.getIntegratedCircuit(7)) .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 7)).duration(10 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); // IV Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -133,7 +133,7 @@ public class Assembler implements Runnable { ItemList.Energy_LapotronicOrb.get(1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1)).duration(20 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .eut(TierEU.RECIPE_EV).addTo(assemblerRecipes); // LuV Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -143,7 +143,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24), GT_Utility.getIntegratedCircuit(6)) .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2)).duration(40 * SECONDS) - .eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .eut(TierEU.RECIPE_IV).addTo(assemblerRecipes); // ZPM Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -153,7 +153,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24), GT_Utility.getIntegratedCircuit(6)) .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3)).duration(1 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .eut(TierEU.RECIPE_LuV).addTo(assemblerRecipes); // UV Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -163,7 +163,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24), GT_Utility.getIntegratedCircuit(6)) .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4)).duration(2 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_ZPM).addTo(sAssemblerRecipes); + .eut(TierEU.RECIPE_ZPM).addTo(assemblerRecipes); // UHV Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -173,7 +173,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24), GT_Utility.getIntegratedCircuit(6)) .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5)).duration(5 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_UV).addTo(sAssemblerRecipes); + .eut(TierEU.RECIPE_UV).addTo(assemblerRecipes); // UEV Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -183,7 +183,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24), GT_Utility.getIntegratedCircuit(6)) .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8)).duration(10 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_UHV).addTo(sAssemblerRecipes); + .eut(TierEU.RECIPE_UHV).addTo(assemblerRecipes); // UIV Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -193,7 +193,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 24), GT_Utility.getIntegratedCircuit(6)) .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9)).duration(10 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_UEV).addTo(sAssemblerRecipes); + .eut(TierEU.RECIPE_UEV).addTo(assemblerRecipes); // UMV Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -203,7 +203,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 24), GT_Utility.getIntegratedCircuit(6)) .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10)).duration(10 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_UIV).addTo(sAssemblerRecipes); + .eut(TierEU.RECIPE_UIV).addTo(assemblerRecipes); final MetaItem_CraftingComponent craftingItem = MetaItem_CraftingComponent.getInstance(); @@ -217,7 +217,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1), ItemList.Electric_Motor_HV.get(1L)) .itemOutputs(new ItemStack(Blocks.yszUnit, 1)).fluidInputs(Materials.Hydrogen.getGas(4000)) - .duration(60 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); // GDC Unit GT_Values.RA.stdBuilder().itemInputs( @@ -229,7 +229,7 @@ public class Assembler implements Runnable { .get(OrePrefixes.rotor, Materials.Desh, new ItemStack(ErrorItem.getInstance(), 1), 1), ItemList.Electric_Motor_IV.get(1L)).itemOutputs(new ItemStack(Blocks.gdcUnit, 1)) .fluidInputs(Materials.Hydrogen.getGas(16000)).duration(2 * MINUTES).eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); // Hex Tiles GT_Values.RA.stdBuilder() @@ -240,7 +240,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.foil, Materials.DarkSteel, 2)) .itemOutputs(new ItemStack(Blocks.largeHexPlate, 2)) .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 36)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); } } diff --git a/src/main/java/common/recipeLoaders/FormingPress.java b/src/main/java/common/recipeLoaders/FormingPress.java index e667a448f6..358c120577 100644 --- a/src/main/java/common/recipeLoaders/FormingPress.java +++ b/src/main/java/common/recipeLoaders/FormingPress.java @@ -1,6 +1,6 @@ package common.recipeLoaders; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPressRecipes; +import static gregtech.api.recipe.RecipeMaps.formingPressRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import common.items.MetaItem_CraftingComponent; @@ -22,6 +22,6 @@ public class FormingPress implements Runnable { craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicDust.getMetaID(), 10), ItemList.Shape_Mold_Plate.get(0)) .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicPlate.getMetaID(), 1)) - .duration(40 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sPressRecipes); + .duration(40 * SECONDS).eut(TierEU.RECIPE_HV).addTo(formingPressRecipes); } } diff --git a/src/main/java/common/recipeLoaders/Mixer.java b/src/main/java/common/recipeLoaders/Mixer.java index d736e70989..c6841f5d6f 100644 --- a/src/main/java/common/recipeLoaders/Mixer.java +++ b/src/main/java/common/recipeLoaders/Mixer.java @@ -1,6 +1,6 @@ package common.recipeLoaders; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes; +import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import net.minecraft.item.ItemStack; @@ -29,7 +29,7 @@ public class Mixer implements Runnable { Items.ZirconiaDust.getOreDictedItemStack(5), GT_Utility.getIntegratedCircuit(6)) .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), 6)) - .duration(20 * SECONDS).eut(96).addTo(sMixerRecipes); + .duration(20 * SECONDS).eut(96).addTo(mixerRecipes); // GDC Ceramic Dust GT_Values.RA.stdBuilder().itemInputs( @@ -38,6 +38,6 @@ public class Mixer implements Runnable { craftingItem.getStackOfAmountFromDamage(Items.CeriaDust.getMetaID(), 9), GT_Utility.getIntegratedCircuit(6)) .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicDust.getMetaID(), 10)) - .duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMixerRecipes); + .duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(mixerRecipes); } } diff --git a/src/main/java/common/recipeLoaders/Unpackager.java b/src/main/java/common/recipeLoaders/Unpackager.java index 6e14e2bcb2..00c743e5f5 100644 --- a/src/main/java/common/recipeLoaders/Unpackager.java +++ b/src/main/java/common/recipeLoaders/Unpackager.java @@ -1,6 +1,6 @@ package common.recipeLoaders; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sUnboxinatorRecipes; +import static gregtech.api.recipe.RecipeMaps.unpackagerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import net.minecraft.item.ItemStack; @@ -27,61 +27,61 @@ public class Unpackager implements Runnable { .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CrudeSteel, 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrudeSteel, 6)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 2)) .itemOutputs( ItemList.Casing_Tank_1.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnergeticSilver, 6)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 3)) .itemOutputs( ItemList.Casing_Tank_3.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VividAlloy, 6)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 4)) .itemOutputs( ItemList.Casing_Tank_5.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Enderium, 6)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 5)) .itemOutputs( ItemList.Casing_Tank_7.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 6)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 6)) .itemOutputs( ItemList.Casing_Tank_7.get(4), GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.CrystallinePinkSlime, 6)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 7)) .itemOutputs( ItemList.Casing_Tank_10.get(16), GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.MelodicAlloy, 6)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 8)) .itemOutputs( ItemList.Quantum_Tank_IV.get(1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StellarAlloy, 12)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 9)) .itemOutputs( ItemList.Quantum_Tank_IV.get(4), GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 12)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 10)) .itemOutputs( ItemList.Quantum_Tank_IV.get(16), GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 12)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(unpackagerRecipes); } @@ -92,55 +92,55 @@ public class Unpackager implements Runnable { .itemOutputs( GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 26), new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6)) - .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1)) .itemOutputs( ItemList.Energy_LapotronicOrb.get(1L), new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6)) - .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2)) .itemOutputs( ItemList.Energy_LapotronicOrb2.get(1L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24)) - .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3)) .itemOutputs( ItemList.Energy_Module.get(1L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24)) - .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4)) .itemOutputs( ItemList.Energy_Cluster.get(1L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24)) - .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5)) .itemOutputs( ItemList.ZPM3.get(1L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24)) - .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8)) .itemOutputs( ItemList.ZPM4.get(1L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24)) - .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9)) .itemOutputs( ItemList.ZPM5.get(1L), GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 24)) - .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(unpackagerRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10)) .itemOutputs( ItemList.ZPM6.get(1L), GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 24)) - .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(unpackagerRecipes); } } diff --git a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java index 394594d0ef..147933e879 100644 --- a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java +++ b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java @@ -13,7 +13,8 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; + +import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; @@ -30,11 +31,13 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase; +import gregtech.api.recipe.RecipeMaps; +import gregtech.api.recipe.check.CheckRecipeResult; +import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_EnhancedMultiBlockBase<GTMTE_SOFuelCellMK1> { @@ -95,7 +98,7 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_EnhancedMultiBlockBas .addInfo("Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_SEC + "L/s Steam") .addInfo("Additionally, requires " + OXYGEN_PER_SEC + "L/s Oxygen gas").addSeparator() .beginStructureBlock(3, 3, 5, false).addController("Front center") - .addCasingInfo("Clean Stainless Steel Casing", 12) + .addCasingInfoMin("Clean Stainless Steel Casing", 12, false) .addOtherStructurePart("YSZ Ceramic Electrolyte Unit", "3x, Center 1x1x3") .addOtherStructurePart("Reinforced Glass", "6x, touching the electrolyte units on the horizontal sides") .addDynamoHatch("Back center", 1).addMaintenanceHatch("Any casing").addInputHatch("Fuel, any casing") @@ -123,43 +126,35 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_EnhancedMultiBlockBas return true; } + @Nonnull @Override - public boolean checkRecipe(ItemStack stack) { + public CheckRecipeResult checkProcessing() { final ArrayList<FluidStack> storedFluids = super.getStoredFluids(); - Collection<GT_Recipe> recipeList = GT_Recipe_Map.sTurbineFuels.mRecipeList; - - if ((storedFluids.size() > 0 && recipeList != null)) { - - final Iterator<FluidStack> fluidsIterator = storedFluids.iterator(); - while (fluidsIterator.hasNext()) { + Collection<GT_Recipe> recipeList = RecipeMaps.gasTurbineFuels.getAllRecipes(); - final FluidStack hatchFluid = fluidsIterator.next(); - final Iterator<GT_Recipe> recipeIterator = recipeList.iterator(); - while (recipeIterator.hasNext()) { + for (FluidStack hatchFluid : storedFluids) { + for (GT_Recipe aFuel : recipeList) { + FluidStack liquid; + if ((liquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null + && hatchFluid.isFluidEqual(liquid)) { - final GT_Recipe aFuel = recipeIterator.next(); - FluidStack liquid; - if ((liquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null - && hatchFluid.isFluidEqual(liquid)) { + liquid.amount = (EU_PER_TICK * 20) / aFuel.mSpecialValue; - liquid.amount = (EU_PER_TICK * 20) / aFuel.mSpecialValue; + if (super.depleteInput(liquid)) { - if (super.depleteInput(liquid)) { - - if (!super.depleteInput(Materials.Oxygen.getGas(OXYGEN_PER_SEC))) { - super.mEUt = 0; - super.mEfficiency = 0; - return false; - } + if (!super.depleteInput(Materials.Oxygen.getGas(OXYGEN_PER_SEC))) { + super.mEUt = 0; + super.mEfficiency = 0; + return CheckRecipeResultRegistry.NO_FUEL_FOUND; + } - super.mEUt = EU_PER_TICK; - super.mMaxProgresstime = 20; - super.mEfficiencyIncrease = 40; - if (super.mEfficiency == getMaxEfficiency(null)) { - super.addOutput(GT_ModHandler.getSteam(STEAM_PER_SEC)); - } - return true; + super.mEUt = EU_PER_TICK; + super.mMaxProgresstime = 20; + super.mEfficiencyIncrease = 40; + if (super.mEfficiency == getMaxEfficiency(null)) { + super.addOutput(GT_ModHandler.getSteam(STEAM_PER_SEC)); } + return CheckRecipeResultRegistry.GENERATING; } } } @@ -167,7 +162,7 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_EnhancedMultiBlockBas super.mEUt = 0; super.mEfficiency = 0; - return false; + return CheckRecipeResultRegistry.NO_FUEL_FOUND; } @Override diff --git a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java index aea029ddc2..737c063d07 100644 --- a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java +++ b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java @@ -13,7 +13,8 @@ import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; + +import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; @@ -31,10 +32,12 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase; +import gregtech.api.recipe.RecipeMaps; +import gregtech.api.recipe.check.CheckRecipeResult; +import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_EnhancedMultiBlockBase<GTMTE_SOFuelCellMK2> { @@ -96,7 +99,7 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_EnhancedMultiBlockBas .addInfo("Outputs " + EU_PER_TICK + "EU/t and " + STEAM_PER_SEC + "L/s Steam") .addInfo("Additionally, requires " + OXYGEN_PER_SEC + "L/s Oxygen gas").addSeparator() .beginStructureBlock(3, 3, 5, false).addController("Front center") - .addCasingInfo("Robust Tungstensteel Machine Casing", 12) + .addCasingInfoMin("Robust Tungstensteel Machine Casing", 12, false) .addOtherStructurePart("GDC Ceramic Electrolyte Unit", "3x, Center 1x1x3") .addOtherStructurePart("Reinforced Glass", "6x, touching the electrolyte units on the horizontal sides") .addDynamoHatch("Back center", 1).addMaintenanceHatch("Any casing").addInputHatch("Fuel, any casing") @@ -125,44 +128,35 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_EnhancedMultiBlockBas return true; } + @Nonnull @Override - public boolean checkRecipe(ItemStack stack) { + public CheckRecipeResult checkProcessing() { final ArrayList<FluidStack> storedFluids = super.getStoredFluids(); - Collection<GT_Recipe> recipeList = GT_Recipe_Map.sTurbineFuels.mRecipeList; - - if ((storedFluids.size() > 0 && recipeList != null)) { - - final Iterator<FluidStack> fluidsIterator = storedFluids.iterator(); - while (fluidsIterator.hasNext()) { + Collection<GT_Recipe> recipeList = RecipeMaps.gasTurbineFuels.getAllRecipes(); - final FluidStack hatchFluid = fluidsIterator.next(); - final Iterator<GT_Recipe> recipeIterator = recipeList.iterator(); - while (recipeIterator.hasNext()) { + for (FluidStack hatchFluid : storedFluids) { + for (GT_Recipe aFuel : recipeList) { + FluidStack liquid; + if ((liquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null + && hatchFluid.isFluidEqual(liquid)) { - final GT_Recipe aFuel = recipeIterator.next(); - FluidStack liquid; - if ((liquid = GT_Utility.getFluidForFilledItem(aFuel.getRepresentativeInput(0), true)) != null - && hatchFluid.isFluidEqual(liquid)) { + liquid.amount = (EU_PER_TICK * 20) / aFuel.mSpecialValue / Math.max(1, aFuel.mSpecialValue / 1000); - liquid.amount = (int) (Math.floor((EU_PER_TICK * 20) / aFuel.mSpecialValue) - / Math.max(1, aFuel.mSpecialValue / 1000)); + if (super.depleteInput(liquid)) { - if (super.depleteInput(liquid)) { - - if (!super.depleteInput(Materials.Oxygen.getGas(OXYGEN_PER_SEC))) { - super.mEUt = 0; - super.mEfficiency = 0; - return false; - } + if (!super.depleteInput(Materials.Oxygen.getGas(OXYGEN_PER_SEC))) { + super.mEUt = 0; + super.mEfficiency = 0; + return CheckRecipeResultRegistry.NO_FUEL_FOUND; + } - super.mEUt = EU_PER_TICK; - super.mMaxProgresstime = 20; - super.mEfficiencyIncrease = 80; - if (super.mEfficiency == getMaxEfficiency(null)) { - super.addOutput(FluidRegistry.getFluidStack("ic2superheatedsteam", STEAM_PER_SEC)); - } - return true; + super.mEUt = EU_PER_TICK; + super.mMaxProgresstime = 20; + super.mEfficiencyIncrease = 80; + if (super.mEfficiency == getMaxEfficiency(null)) { + super.addOutput(FluidRegistry.getFluidStack("ic2superheatedsteam", STEAM_PER_SEC)); } + return CheckRecipeResultRegistry.GENERATING; } } } @@ -170,7 +164,7 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_EnhancedMultiBlockBas super.mEUt = 0; super.mEfficiency = 0; - return false; + return CheckRecipeResultRegistry.NO_FUEL_FOUND; } @Override |