From 361adcefd72d3f58040b18cc7ae92b65ec017522 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Thu, 15 Aug 2024 16:48:03 +0200 Subject: add forbidden getModItem calls (#2869) * add forbidden getModItem calls * remove bartworks gmi * remove goodgenerators gmi * spotless * no more literals in getModItem calls * fix kekztech calls * fix kubatech calls * fix gregtech calls (1/?) * move WA from NHCore to GT5U * MTE enum expanded with bw values * MTE enum expanded with tectech values * fix inversion * fix gregtech calls (2/?) * copied enum from NHCore to GT5U and moved machine hulls * moved plasma gens and alloy smelters * moved machine matter amplifiers, assemblers, scanners, Pump, transformers * moved battery buffer 1,2,3,4, battery charger 4x4, dynamo hatches, energy hatches * moved wet transformers, hi amps transformers, turbo chargers, chest buffers, rock breakers, input hatches, output hatches * moved circuit assemblers * moved chemical bath, chemical reactor, fermenter, fluid canner, fluid extractor, fluid heater, mixer * moved autoclave, bending machine, compressor, cutting machine, distillery, electric furnace, electrolyzer, electromagnetic separator, extractor, extruder, fluid solidifier, forming press, forge hammer, lathe, precision laser engraver, macerator, matter fabricator, microwave, washing plant, polarizer, recycler, replicator, sifter, slicer, thermal centrifuge, wiremill, arc furnace, centrifuge, plasma arc furnace, canning machine * moved batteries * comment * spotless apply * yeet * imports * bronze blast furnace is no more since a while * sanitize kubatech MTE registration * merge GG's MTE enum into GT5U one * fix gregtech calls (3/4) * fix gt++ calls (1/?) * small cleanup * fix gt++ calls (2/3) * fix gt++ calls (3/3) * temporary test * fix config * Revert "temporary test" This reverts commit ad99b8a4736794aab1d01ff453809c6f7e721724. * disabled the GT check until GTNH-Intergalactic is merged into GT5U or at least its GT5U parts * spotless apply * dumb dumb * fix dynamic access to CustomItemList * update tests * fix scala test * fix script? * fix script? * actual fix? * there we go! * yeet GT for now, until we move the EOH Controller recipe somewhere else * fix dep --- .../com/elisis/gtnhlanth/loader/RecipeLoader.java | 42 +- .../bartworks/common/configs/ConfigHandler.java | 22 - .../ElectricImplosionCompressorRecipes.java | 21 +- .../bartworks/common/loaders/ItemRegistry.java | 316 ++++- .../common/loaders/recipes/CraftingRecipes.java | 51 +- .../tiered/GT_MetaTileEntity_Diode.java | 29 +- .../GT_Enhancement/PlatinumSludgeOverHaul.java | 7 +- .../technus/tectech/loader/recipe/Assembler.java | 213 ++- .../tectech/loader/recipe/AssemblyLine.java | 3 +- .../loader/recipe/ResearchStationAssemblyLine.java | 315 ++--- .../tectech/loader/thing/MachineLoader.java | 1453 ++++++++++++++------ .../single/GT_MetaTileEntity_WetTransformer.java | 1 + 12 files changed, 1639 insertions(+), 834 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index 19c258d429..140485c317 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -81,6 +81,8 @@ import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.Thulium import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.YtterbiumChlorideConcentrate; import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.YtterbiumExtractingNanoResin; import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.YtterbiumOreConcentrate; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.enums.OrePrefixes.blockCasingAdvanced; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; @@ -281,7 +283,7 @@ public class RecipeLoader { .eut(7680) .addTo(assemblerRecipes); - ItemStack insulator = GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorSheet", 1); + ItemStack insulator = GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorSheet", 1); // Coolant Delivery Casing @@ -629,7 +631,7 @@ public class RecipeLoader { .itemInputs( new ItemStack(LanthItemList.MASKED_MASK), MyMaterial.lithiumChloride.get(OrePrefixes.dust, 2), - GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 4)) + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 4)) .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.BLANK2))) .duration(25 * GT_RecipeBuilder.SECONDS) .eut(1920) @@ -948,7 +950,7 @@ public class RecipeLoader { // IODINE-START // SeaweedAsh GT_ModHandler.addSmeltingRecipe( - GT_ModHandler.getModItem("harvestcraft", "seaweedItem", 1), + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "seaweedItem", 1), WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dustSmall, 1)); // SeaweedConcentrate @@ -985,7 +987,7 @@ public class RecipeLoader { GT_Values.RA.stdBuilder() .itemInputs( Materials.Pyrolusite.getDust(6), - GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 6), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 6), WerkstoffMaterialPool.PotassiumChlorate.get(OrePrefixes.dust, 5)) .itemOutputs( WerkstoffMaterialPool.PotassiumPermanganate.get(OrePrefixes.dust, 12), @@ -1008,7 +1010,7 @@ public class RecipeLoader { // 6KOH + 6Cl = KClO3 + 5KCl + 3H2O GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 18), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 18), GT_Utility.getIntegratedCircuit(3)) .itemOutputs( Materials.RockSalt.getDust(10), @@ -2224,7 +2226,7 @@ public class RecipeLoader { // Lanthanum GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Lanthanum.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2236,7 +2238,7 @@ public class RecipeLoader { // Praseodymium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Praseodymium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2248,7 +2250,7 @@ public class RecipeLoader { // Cerium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Cerium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2260,7 +2262,7 @@ public class RecipeLoader { // Neodymium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Neodymium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2272,7 +2274,7 @@ public class RecipeLoader { // Promethium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Promethium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2284,7 +2286,7 @@ public class RecipeLoader { // Sm GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Samarium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2296,7 +2298,7 @@ public class RecipeLoader { // Europium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Europium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2308,7 +2310,7 @@ public class RecipeLoader { // Gadolinium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Gadolinium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2320,7 +2322,7 @@ public class RecipeLoader { // Terbium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Terbium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2332,7 +2334,7 @@ public class RecipeLoader { // Dysprosium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Dysprosium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2344,7 +2346,7 @@ public class RecipeLoader { // Holmium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Holmium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2356,7 +2358,7 @@ public class RecipeLoader { // Erbium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Erbium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2368,7 +2370,7 @@ public class RecipeLoader { // Thulium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Thulium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2380,7 +2382,7 @@ public class RecipeLoader { // Ytterbium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Ytterbium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2392,7 +2394,7 @@ public class RecipeLoader { // Lutetium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Lutetium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java index 4378f87a96..27cf0f4fe6 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java @@ -24,10 +24,8 @@ import com.github.bartimaeusnek.bartworks.API.API_ConfigValues; public class ConfigHandler { - private static final int IDU = 10 * 8 + 5; public static Configuration c; - public static int IDOffset = 12600; public static int megaMachinesMax = 256; public static int mbWaterperSec = 150; public static int ross128BID = -64; @@ -130,14 +128,6 @@ public class ConfigHandler { "If you wish to enable \"Shared Item Stack\" tooltips") .getBoolean(true); - ConfigHandler.IDOffset = ConfigHandler.c - .get( - "System", - "ID Offset", - 12600, - "ID Offset for this mod. This Mod uses " + ConfigHandler.IDU - + " IDs. DO NOT CHANGE IF YOU DONT KNOW WHAT THIS IS") - .getInt(12600); ConfigHandler.teslastaff = ConfigHandler.c .get( "System", @@ -238,18 +228,6 @@ public class ConfigHandler { "How much should the MBF produce pollution per tick per ingot. Then it'll be multiplied by the amount of ingots done in parallel") .getInt(ConfigHandler.basePollutionMBFSecond); - if (ConfigHandler.IDOffset == 0) { - ConfigHandler.IDOffset = 12600; - ConfigHandler.c - .get( - "System", - "ID Offset", - 12600, - "ID Offset for this mod. This Mod uses " + ConfigHandler.IDU - + " IDs. DO NOT CHANGE IF YOU DONT KNOW WHAT THIS IS") - .set(12600); - } - ConfigHandler.GTppLogDisabler = ConfigHandler.c .get("System", "Disable GT++ Logging", false, "Enables or Disables GT++ Logging.") .getBoolean(false); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java index 0e7614110b..dfc3ab7e83 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java @@ -1,10 +1,15 @@ package com.github.bartimaeusnek.bartworks.common.loaders; import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.electricImplosionCompressorRecipes; +import static goodgenerator.loader.Loaders.highDensityPlutonium; +import static goodgenerator.loader.Loaders.highDensityPlutoniumNugget; +import static goodgenerator.loader.Loaders.highDensityThorium; +import static goodgenerator.loader.Loaders.highDensityThoriumNugget; +import static goodgenerator.loader.Loaders.highDensityUranium; +import static goodgenerator.loader.Loaders.highDensityUraniumNugget; import static gregtech.api.enums.GT_Values.M; import static gregtech.api.enums.Mods.Avaritia; import static gregtech.api.enums.Mods.EternalSingularity; -import static gregtech.api.enums.Mods.GoodGenerator; import static gregtech.api.enums.Mods.OpenComputers; import static gregtech.api.enums.Mods.SuperSolarPanels; import static gregtech.api.enums.Mods.UniversalSingularities; @@ -12,6 +17,8 @@ import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -51,8 +58,8 @@ public class ElectricImplosionCompressorRecipes implements Runnable { } GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GoodGenerator.ID, "highDensityPlutoniumNugget", 5L)) - .itemOutputs(getModItem(GoodGenerator.ID, "highDensityPlutonium", 1L)) + .itemInputs(new ItemStack(highDensityPlutoniumNugget, 5)) + .itemOutputs(new ItemStack(highDensityPlutonium, 1)) .fluidInputs(Materials.Neutronium.getMolten(72L)) .duration(1) .eut(TierEU.RECIPE_UEV) @@ -60,8 +67,8 @@ public class ElectricImplosionCompressorRecipes implements Runnable { .addTo(electricImplosionCompressorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GoodGenerator.ID, "highDensityUraniumNugget", 5L)) - .itemOutputs(getModItem(GoodGenerator.ID, "highDensityUranium", 1L)) + .itemInputs(new ItemStack(highDensityUraniumNugget, 5)) + .itemOutputs(new ItemStack(highDensityUranium, 1)) .fluidInputs(Materials.Neutronium.getMolten(72L)) .duration(1) .eut(TierEU.RECIPE_UEV) @@ -69,8 +76,8 @@ public class ElectricImplosionCompressorRecipes implements Runnable { .addTo(electricImplosionCompressorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GoodGenerator.ID, "highDensityThoriumNugget", 5L)) - .itemOutputs(getModItem(GoodGenerator.ID, "highDensityThorium", 1L)) + .itemInputs(new ItemStack(highDensityThoriumNugget, 5)) + .itemOutputs(new ItemStack(highDensityThorium, 1)) .fluidInputs(Materials.Neutronium.getMolten(72L)) .duration(1) .eut(TierEU.RECIPE_UEV) diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java index 841066a893..d1167b3a09 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java @@ -15,6 +15,165 @@ package com.github.bartimaeusnek.bartworks.common.loaders; import static com.github.bartimaeusnek.bartworks.MainMod.BWT; import static com.github.bartimaeusnek.bartworks.MainMod.GT2; +import static gregtech.api.enums.MetaTileEntityIDs.AcidGeneratorEV; +import static gregtech.api.enums.MetaTileEntityIDs.AcidGeneratorHV; +import static gregtech.api.enums.MetaTileEntityIDs.AcidGeneratorLV; +import static gregtech.api.enums.MetaTileEntityIDs.AcidGeneratorMV; +import static gregtech.api.enums.MetaTileEntityIDs.CircuitAssemblyLine; +import static gregtech.api.enums.MetaTileEntityIDs.CompressedFluidHatch; +import static gregtech.api.enums.MetaTileEntityIDs.DeepEarthHeatingPump; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_HV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_LV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_UV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_HV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_LV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_UV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_HV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_LV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_UV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_HV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_LV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_UV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_HV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_LV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_UV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.ElectricImplosionCompressor; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_EV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_HV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_IV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_LV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_MV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_UV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.EnergyDistributor_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.GiantOutputHatch; +import static gregtech.api.enums.MetaTileEntityIDs.HighTemperatureGasCooledReactor; +import static gregtech.api.enums.MetaTileEntityIDs.HumongousInputHatch; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter128A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter128A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter128A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter128A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter32A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter32A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter32A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter32A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter64A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter64A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter64A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter64A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter96A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter96A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter96A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserConverter96A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserPipe; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch128A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch128A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch128A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch128A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch32A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch32A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch32A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch32A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch64A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch64A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch64A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch64A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch96A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch96A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch96A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserSourceHatch96A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch128A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch128A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch128A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch128A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch32A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch32A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch32A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch32A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch64A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch64A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch64A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch64A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch96A_EV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch96A_IV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch96A_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.LowPowerLaserTargetHatch96A_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.MegaBlastFurnace; +import static gregtech.api.enums.MetaTileEntityIDs.MegaChemicalReactor; +import static gregtech.api.enums.MetaTileEntityIDs.MegaDistillationTower; +import static gregtech.api.enums.MetaTileEntityIDs.MegaOilCracker; +import static gregtech.api.enums.MetaTileEntityIDs.MegaVacuumFreezer; +import static gregtech.api.enums.MetaTileEntityIDs.ThoriumHighTemperatureReactor; +import static gregtech.api.enums.MetaTileEntityIDs.VoidMinerI; +import static gregtech.api.enums.MetaTileEntityIDs.VoidMinerII; +import static gregtech.api.enums.MetaTileEntityIDs.VoidMinerIII; import static gregtech.api.enums.Mods.GalactiGreg; import net.minecraft.block.Block; @@ -71,6 +230,7 @@ import fox.spiteful.avaritia.blocks.LudicrousBlocks; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; +import gregtech.api.enums.MetaTileEntityIDs; import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; @@ -261,9 +421,13 @@ public class ItemRegistry { GameRegistry.registerItem(ItemRegistry.ROCKCUTTER_HV, ItemRegistry.ROCKCUTTER_HV.getUnlocalizedName()); GameRegistry.registerItem(ItemRegistry.TAB, "tabIconGT2"); - new CreativeScanner(ConfigHandler.IDOffset + 200, "Creative Debug Scanner", "Creative Debug Scanner", 14); + new CreativeScanner( + MetaTileEntityIDs.CreativeScanner.ID, + "Creative Debug Scanner", + "Creative Debug Scanner", + 14); ItemRegistry.eic = new GT_TileEntity_ElectricImplosionCompressor( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 6, + ElectricImplosionCompressor.ID, "ElectricImplosionCompressor", "Electric Implosion Compressor").getStackForm(1L); @@ -282,160 +446,218 @@ public class ItemRegistry { } ItemRegistry.THTR = new GT_TileEntity_THTR( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 5, + ThoriumHighTemperatureReactor.ID, "THTR", "Thorium High Temperature Reactor").getStackForm(1L); GT_TileEntity_THTR.THTRMaterials.registeraTHR_Materials(); ItemRegistry.HTGR = new GT_TileEntity_HTGR( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15 + 48, + HighTemperatureGasCooledReactor.ID, "HTGR", "High Temperature Gas-cooled Reactor").getStackForm(1L); GT_TileEntity_HTGR.HTGRMaterials.registeraTHR_Materials(); - // ID ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15 + 49 IS TAKEN !!! (12792) + // ID 12728 + 15 + 49 IS TAKEN !!! (12792) GT_OreDictUnificator .add(OrePrefixes.block, Materials.BorosilicateGlass, new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)); GT_OreDictUnificator .registerOre(OrePrefixes.block, Materials.NickelZincFerrite, new ItemStack(ItemRegistry.BW_BLOCKS[2])); + + int[] Diode2A = new int[] { Diode2A_ULV.ID, Diode2A_LV.ID, Diode2A_MV.ID, Diode2A_HV.ID, Diode2A_EV.ID, + Diode2A_IV.ID, Diode2A_LuV.ID, Diode2A_ZPM.ID, Diode2A_UV.ID, Diode2A_UHV.ID, Diode2A_UEV.ID, + Diode2A_UIV.ID, Diode2A_UMV.ID, Diode2A_UXV.ID, Diode2A_MAX.ID }; + int[] Diode4A = new int[] { Diode4A_ULV.ID, Diode4A_LV.ID, Diode4A_MV.ID, Diode4A_HV.ID, Diode4A_EV.ID, + Diode4A_IV.ID, Diode4A_LuV.ID, Diode4A_ZPM.ID, Diode4A_UV.ID, Diode4A_UHV.ID, Diode4A_UEV.ID, + Diode4A_UIV.ID, Diode4A_UMV.ID, Diode4A_UXV.ID, Diode4A_MAX.ID }; + int[] Diode8A = new int[] { Diode8A_ULV.ID, Diode8A_LV.ID, Diode8A_MV.ID, Diode8A_HV.ID, Diode8A_EV.ID, + Diode8A_IV.ID, Diode8A_LuV.ID, Diode8A_ZPM.ID, Diode8A_UV.ID, Diode8A_UHV.ID, Diode8A_UEV.ID, + Diode8A_UIV.ID, Diode8A_UMV.ID, Diode8A_UXV.ID, Diode8A_MAX.ID }; + int[] Diode12A = new int[] { Diode12A_ULV.ID, Diode12A_LV.ID, Diode12A_MV.ID, Diode12A_HV.ID, Diode12A_EV.ID, + Diode12A_IV.ID, Diode12A_LuV.ID, Diode12A_ZPM.ID, Diode12A_UV.ID, Diode12A_UHV.ID, Diode12A_UEV.ID, + Diode12A_UIV.ID, Diode12A_UMV.ID, Diode12A_UXV.ID, Diode12A_MAX.ID }; + int[] Diode16A = new int[] { Diode16A_ULV.ID, Diode16A_LV.ID, Diode16A_MV.ID, Diode16A_HV.ID, Diode16A_EV.ID, + Diode16A_IV.ID, Diode16A_LuV.ID, Diode16A_ZPM.ID, Diode16A_UV.ID, Diode16A_UHV.ID, Diode16A_UEV.ID, + Diode16A_UIV.ID, Diode16A_UMV.ID, Diode16A_UXV.ID, Diode16A_MAX.ID }; + int[] EnergyDistributors = new int[] { EnergyDistributor_ULV.ID, EnergyDistributor_LV.ID, + EnergyDistributor_MV.ID, EnergyDistributor_HV.ID, EnergyDistributor_EV.ID, EnergyDistributor_IV.ID, + EnergyDistributor_LuV.ID, EnergyDistributor_ZPM.ID, EnergyDistributor_UV.ID, EnergyDistributor_UHV.ID, + EnergyDistributor_UEV.ID, EnergyDistributor_UIV.ID, EnergyDistributor_UMV.ID, EnergyDistributor_UXV.ID, + EnergyDistributor_MAX.ID }; + for (int i = 0; i < GT_Values.VN.length - 1; i++) { ItemRegistry.diode2A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length + 1 + i, + Diode2A[i], "diode" + "2A" + GT_Values.VN[i], StatCollector.translateToLocal("tile.diode.name") + " 2A " + GT_Values.VN[i], i).getStackForm(1L); ItemRegistry.diode4A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length * 2 + 1 + i, + Diode4A[i], "diode" + "4A" + GT_Values.VN[i], StatCollector.translateToLocal("tile.diode.name") + " 4A " + GT_Values.VN[i], i).getStackForm(1L); ItemRegistry.diode8A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length * 3 + 1 + i, + Diode8A[i], "diode" + "8A" + GT_Values.VN[i], StatCollector.translateToLocal("tile.diode.name") + " 8A " + GT_Values.VN[i], i).getStackForm(1L); ItemRegistry.diode12A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length * 4 + 1 + i, + Diode12A[i], "diode" + "12A" + GT_Values.VN[i], StatCollector.translateToLocal("tile.diode.name") + " 12A " + GT_Values.VN[i], i).getStackForm(1L); ItemRegistry.diode16A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length * 5 + 1 + i, + Diode16A[i], "diode" + "16A" + GT_Values.VN[i], StatCollector.translateToLocal("tile.diode.name") + " 16A " + GT_Values.VN[i], i).getStackForm(1L); ItemRegistry.energyDistributor[i] = new GT_MetaTileEntity_EnergyDistributor( - ConfigHandler.IDOffset + 1 + i, + EnergyDistributors[i], "energydistributor" + GT_Values.VN[i], StatCollector.translateToLocal("tile.energydistributor.name") + " " + GT_Values.VN[i], i).getStackForm(1L); } - for (int i = 0; i < 3; i++) { - ItemRegistry.acidGens[i] = new GT_MetaTileEntity_AcidGenerator( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 - 2 + i, - "acidgenerator" + GT_Values.VN[i + 2], - StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[i + 2], - i + 2).getStackForm(1); - } + + ItemRegistry.acidGens[0] = new GT_MetaTileEntity_AcidGenerator( + AcidGeneratorMV.ID, + "acidgenerator" + GT_Values.VN[2], + StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[2], + 2).getStackForm(1); + ItemRegistry.acidGens[1] = new GT_MetaTileEntity_AcidGenerator( + AcidGeneratorHV.ID, + "acidgenerator" + GT_Values.VN[3], + StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[3], + 3).getStackForm(1); + ItemRegistry.acidGens[2] = new GT_MetaTileEntity_AcidGenerator( + AcidGeneratorEV.ID, + "acidgenerator" + GT_Values.VN[4], + StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[4], + 4).getStackForm(1); ItemRegistry.acidGensLV = new GT_MetaTileEntity_AcidGenerator( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 65, + AcidGeneratorLV.ID, "acidgenerator" + GT_Values.VN[1], StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[1], +1).getStackForm(1L); - ItemRegistry.dehp = new GT_TileEntity_DEHP( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 1, - 1, - "DEHP", - "Deep Earth Heating Pump").getStackForm(1L); + ItemRegistry.dehp = new GT_TileEntity_DEHP(DeepEarthHeatingPump.ID, 1, "DEHP", "Deep Earth Heating Pump") + .getStackForm(1L); ItemRegistry.megaMachines[0] = new GT_TileEntity_MegaBlastFurnace( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 2, + MegaBlastFurnace.ID, "MegaBlastFurnace", StatCollector.translateToLocal("tile.bw.mbf.name")).getStackForm(1L); ItemRegistry.megaMachines[1] = new GT_TileEntity_MegaVacuumFreezer( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 3, + MegaVacuumFreezer.ID, "MegaVacuumFreezer", StatCollector.translateToLocal("tile.bw.mvf.name")).getStackForm(1L); ItemRegistry.cal = new GT_TileEntity_CircuitAssemblyLine( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 7, + CircuitAssemblyLine.ID, "CircuitAssemblyLine", "Circuit Assembly Line").getStackForm(1L); ItemRegistry.compressedHatch = new GT_MetaTileEntity_CompressedFluidHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 8, + CompressedFluidHatch.ID, "CompressedFluidHatch", "Liquid Air Fluid Hatch").getStackForm(1L); ItemRegistry.giantOutputHatch = new GT_MetaTileEntity_GiantOutputHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 9, + GiantOutputHatch.ID, "GiantOutputHatch", "Giant Output Hatch").getStackForm(1L); ItemRegistry.humongousInputHatch = new GT_MetaTileEntity_HumongousInputHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 9 + 55, + HumongousInputHatch.ID, "HumongousInputHatch", "Humongous Input Hatch").getStackForm(1L); ItemRegistry.megaMachines[2] = new GT_TileEntity_MegaDistillTower( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 10, + MegaDistillationTower.ID, "MegaDistillationTower", "Mega Distillation Tower").getStackForm(1L); ItemRegistry.megaMachines[3] = new GT_TileEntity_MegaChemicalReactor( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 638, + MegaChemicalReactor.ID, "MegaChemicalReactor", "Mega Chemical Reactor").getStackForm(1L); ItemRegistry.megaMachines[4] = new GT_TileEntity_MegaOilCracker( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 639, + MegaOilCracker.ID, "MegaOilCracker", "Mega Oil Cracker").getStackForm(1L); if (GalactiGreg.isModLoaded()) { ItemRegistry.voidminer[2] = new GT_TileEntity_VoidMiners.VMUV( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 11, + VoidMinerIII.ID, "VoidMiner3", "Void Miner III").getStackForm(1L); ItemRegistry.voidminer[1] = new GT_TileEntity_VoidMiners.VMZPM( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 12, + VoidMinerII.ID, "VoidMiner2", "Void Miner II").getStackForm(1L); - ItemRegistry.voidminer[0] = new GT_TileEntity_VoidMiners.VMLUV( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 13, - "VoidMiner1", - "Void Miner I").getStackForm(1L); + ItemRegistry.voidminer[0] = new GT_TileEntity_VoidMiners.VMLUV(VoidMinerI.ID, "VoidMiner1", "Void Miner I") + .getStackForm(1L); } TecTechPipeEnergyLowPower = new TT_MetaTileEntity_Pipe_Energy_LowPower( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 14, + LowPowerLaserPipe.ID, "pipe.lowpowerlaser", "Low Power Laser Pipe").getStackForm(1L); - int startID = ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15; + + int[] LowPowerLaserConverter32A = new int[] { LowPowerLaserConverter32A_EV.ID, LowPowerLaserConverter32A_IV.ID, + LowPowerLaserConverter32A_LuV.ID, LowPowerLaserConverter32A_ZPM.ID }; + int[] LowPowerLaserConverter64A = new int[] { LowPowerLaserConverter64A_EV.ID, LowPowerLaserConverter64A_IV.ID, + LowPowerLaserConverter64A_LuV.ID, LowPowerLaserConverter64A_ZPM.ID }; + int[] LowPowerLaserConverter96A = new int[] { LowPowerLaserConverter96A_EV.ID, LowPowerLaserConverter96A_IV.ID, + LowPowerLaserConverter96A_LuV.ID, LowPowerLaserConverter96A_ZPM.ID }; + int[] LowPowerLaserConverter128A = new int[] { LowPowerLaserConverter128A_EV.ID, + LowPowerLaserConverter128A_IV.ID, LowPowerLaserConverter128A_LuV.ID, LowPowerLaserConverter128A_ZPM.ID }; + int[][] LowPowerLaserConverter = new int[][] { LowPowerLaserConverter32A, LowPowerLaserConverter64A, + LowPowerLaserConverter96A, LowPowerLaserConverter128A }; + for (int amps = 32; amps <= 128; amps += 32) { for (int tier = 4; tier < 8; tier++) { TecTechLaserAdditions[0][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserBox( - startID, + LowPowerLaserConverter[amps / 32 - 1][tier - 4], GT_Values.VN[tier] + "_LPLaser_Converter_" + amps, GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Converter", tier, amps).getStackForm(1L); - startID++; } } + + int[] LowPowerLaserTargetHatch32A = new int[] { LowPowerLaserTargetHatch32A_EV.ID, + LowPowerLaserTargetHatch32A_IV.ID, LowPowerLaserTargetHatch32A_LuV.ID, LowPowerLaserTargetHatch32A_ZPM.ID }; + int[] LowPowerLaserTargetHatch64A = new int[] { LowPowerLaserTargetHatch64A_EV.ID, + LowPowerLaserTargetHatch64A_IV.ID, LowPowerLaserTargetHatch64A_LuV.ID, LowPowerLaserTargetHatch64A_ZPM.ID }; + int[] LowPowerLaserTargetHatch96A = new int[] { LowPowerLaserTargetHatch96A_EV.ID, + LowPowerLaserTargetHatch96A_IV.ID, LowPowerLaserTargetHatch96A_LuV.ID, LowPowerLaserTargetHatch96A_ZPM.ID }; + int[] LowPowerLaserTargetHatch128A = new int[] { LowPowerLaserTargetHatch128A_EV.ID, + LowPowerLaserTargetHatch128A_IV.ID, LowPowerLaserTargetHatch128A_LuV.ID, + LowPowerLaserTargetHatch128A_ZPM.ID }; + int[][] LowPowerLaserTargetHatch = new int[][] { LowPowerLaserTargetHatch32A, LowPowerLaserTargetHatch64A, + LowPowerLaserTargetHatch96A, LowPowerLaserTargetHatch128A }; for (int amps = 32; amps <= 128; amps += 32) { for (int tier = 4; tier < 8; tier++) { TecTechLaserAdditions[1][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserHatch( - startID, + LowPowerLaserTargetHatch[amps / 32 - 1][tier - 4], GT_Values.VN[tier] + "_LPLaser_Hatch_" + amps, GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Target Hatch", tier, amps).getStackForm(1L); - startID++; } } + + int[] LowPowerLaserSourceHatch32A = new int[] { LowPowerLaserSourceHatch32A_EV.ID, + LowPowerLaserSourceHatch32A_IV.ID, LowPowerLaserSourceHatch32A_LuV.ID, LowPowerLaserSourceHatch32A_ZPM.ID }; + int[] LowPowerLaserSourceHatch64A = new int[] { LowPowerLaserSourceHatch64A_EV.ID, + LowPowerLaserSourceHatch64A_IV.ID, LowPowerLaserSourceHatch64A_LuV.ID, LowPowerLaserSourceHatch64A_ZPM.ID }; + int[] LowPowerLaserSourceHatch96A = new int[] { LowPowerLaserSourceHatch96A_EV.ID, + LowPowerLaserSourceHatch96A_IV.ID, LowPowerLaserSourceHatch96A_LuV.ID, LowPowerLaserSourceHatch96A_ZPM.ID }; + int[] LowPowerLaserSourceHatch128A = new int[] { LowPowerLaserSourceHatch128A_EV.ID, + LowPowerLaserSourceHatch128A_IV.ID, LowPowerLaserSourceHatch128A_LuV.ID, + LowPowerLaserSourceHatch128A_ZPM.ID }; + int[][] LowPowerLaserSourceHatch = new int[][] { LowPowerLaserSourceHatch32A, LowPowerLaserSourceHatch64A, + LowPowerLaserSourceHatch96A, LowPowerLaserSourceHatch128A }; for (int amps = 32; amps <= 128; amps += 32) { for (int tier = 4; tier < 8; tier++) { TecTechLaserAdditions[2][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserDynamo( - startID, + LowPowerLaserSourceHatch[amps / 32 - 1][tier - 4], GT_Values.VN[tier] + "_LPLaser_Dynamo_" + amps, GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Source Hatch", tier, amps).getStackForm(1L); - startID++; } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java index e156aacbe7..6c6896d786 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java @@ -1,5 +1,33 @@ package com.github.bartimaeusnek.bartworks.common.loaders.recipes; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_EV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_HV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_IV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.BioLab_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.BioVat; +import static gregtech.api.enums.MetaTileEntityIDs.LESU; +import static gregtech.api.enums.MetaTileEntityIDs.ManualTrafo; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_EV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_HV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_IV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UEV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UIV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UMV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_UXV; +import static gregtech.api.enums.MetaTileEntityIDs.RadioHatch_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.Windmill; import static gregtech.api.enums.Mods.IndustrialCraft2; import net.minecraft.init.Blocks; @@ -68,7 +96,7 @@ public class CraftingRecipes implements Runnable { ItemList.Machine_EV_ChemicalReactor.get(1L) }; GT_ModHandler.addCraftingRecipe( - new GT_TileEntity_LESU(ConfigHandler.IDOffset, "LESU", "L.E.S.U.").getStackForm(1L), + new GT_TileEntity_LESU(LESU.ID, "LESU", "L.E.S.U.").getStackForm(1L), RecipeLoader.BITSD, new Object[] { "CDC", "SBS", "CFC", 'C', "circuitAdvanced", 'D', ItemList.Cover_Screen.get(1L), 'S', GT_OreDictUnificator.get(OrePrefixes.cableGt12, Materials.Platinum, 1L), 'B', @@ -241,7 +269,7 @@ public class CraftingRecipes implements Runnable { GT_ModHandler.addCraftingRecipe( new GT_TileEntity_ManualTrafo( - ConfigHandler.IDOffset + GT_Values.VN.length * 6 + 1, + ManualTrafo.ID, "bw.manualtrafo", StatCollector.translateToLocal("tile.manutrafo.name")).getStackForm(1L), RecipeLoader.BITSD, @@ -251,7 +279,7 @@ public class CraftingRecipes implements Runnable { GT_ModHandler.addCraftingRecipe( new GT_TileEntity_Windmill( - ConfigHandler.IDOffset + GT_Values.VN.length * 6 + 2, + Windmill.ID, "bw.windmill", StatCollector.translateToLocal("tile.bw.windmill.name")).getStackForm(1L), RecipeLoader.BITSD, @@ -399,10 +427,8 @@ public class CraftingRecipes implements Runnable { ItemList.Sensor_LuV.get(1L), 'P', WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 1), }); GT_ModHandler.addCraftingRecipe( - new GT_TileEntity_BioVat( - ConfigHandler.IDOffset + GT_Values.VN.length * 7, - "bw.biovat", - StatCollector.translateToLocal("tile.biovat.name")).getStackForm(1L), + new GT_TileEntity_BioVat(BioVat.ID, "bw.biovat", StatCollector.translateToLocal("tile.biovat.name")) + .getStackForm(1L), RecipeLoader.BITSD, new Object[] { "GCG", "KHK", "GCG", 'G', new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), 'C', "circuit" + Materials.EV, 'K', GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Silver, 1L), @@ -422,15 +448,20 @@ public class CraftingRecipes implements Runnable { Materials[] circuits2 = { Materials.HV, Materials.EV, Materials.IV, Materials.LuV, Materials.ZPM, Materials.UV }; + int[] BioLab = new int[] { BioLab_HV.ID, BioLab_EV.ID, BioLab_IV.ID, BioLab_LuV.ID, BioLab_ZPM.ID, BioLab_UV.ID, + BioLab_UHV.ID, BioLab_UEV.ID, BioLab_UIV.ID, BioLab_UMV.ID, BioLab_UXV.ID, BioLab_MAX.ID }; + int[] RadioHatch = new int[] { RadioHatch_HV.ID, RadioHatch_EV.ID, RadioHatch_IV.ID, RadioHatch_LuV.ID, + RadioHatch_ZPM.ID, RadioHatch_UV.ID, RadioHatch_UHV.ID, RadioHatch_UEV.ID, RadioHatch_UIV.ID, + RadioHatch_UMV.ID, RadioHatch_UXV.ID, RadioHatch_MAX.ID }; + for (int i = 3; i < GT_Values.VN.length - 1; i++) { - // 12625 BioLab2[i - 3] = new GT_MetaTileEntity_BioLab( - ConfigHandler.IDOffset + GT_Values.VN.length * 6 + i, + BioLab[i - 3], "bw.biolab" + GT_Values.VN[i], GT_Values.VN[i] + " " + StatCollector.translateToLocal("tile.biolab.name"), i).getStackForm(1L); RadioHatch2[i - 3] = new GT_MetaTileEntity_RadioHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 7 - 2 + i, + RadioHatch[i - 3], "bw.radiohatch" + GT_Values.VN[i], GT_Values.VN[i] + " " + StatCollector.translateToLocal("tile.radiohatch.name"), i).getStackForm(1L); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java index 57512e40c0..4bcf4f829c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java @@ -13,6 +13,17 @@ package com.github.bartimaeusnek.bartworks.common.tileentities.tiered; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode12A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode16A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode2A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode4A_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_MAX; +import static gregtech.api.enums.MetaTileEntityIDs.Diode8A_ULV; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; @@ -21,7 +32,6 @@ import net.minecraftforge.common.util.ForgeDirection; import org.apache.commons.lang3.ArrayUtils; -import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference; import gregtech.api.enums.GT_Values; @@ -104,17 +114,12 @@ public class GT_MetaTileEntity_Diode extends GT_MetaTileEntity_BasicHull { } private long getAmpsfromMeta(int meta) { - if (meta > ConfigHandler.IDOffset + GT_Values.VN.length - && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 2) return 2L; - if (meta > ConfigHandler.IDOffset + GT_Values.VN.length * 2 - && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 3) return 4L; - else if (meta > ConfigHandler.IDOffset + GT_Values.VN.length * 3 - && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 4) return 8L; - else if (meta > ConfigHandler.IDOffset + GT_Values.VN.length * 4 - && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 5) return 12L; - else if (meta > ConfigHandler.IDOffset + GT_Values.VN.length * 5 - && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 6) return 16L; - else return 0L; + if (meta >= Diode2A_ULV.ID && meta <= Diode2A_MAX.ID) return 2L; + if (meta >= Diode4A_ULV.ID && meta <= Diode4A_MAX.ID) return 4L; + if (meta >= Diode8A_ULV.ID && meta <= Diode8A_MAX.ID) return 8L; + if (meta >= Diode12A_ULV.ID && meta <= Diode12A_MAX.ID) return 12L; + if (meta >= Diode16A_ULV.ID && meta <= Diode16A_MAX.ID) return 16L; + return 0L; } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java index 79fe34bb82..c1f7bf5439 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java @@ -57,7 +57,6 @@ import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Sodiumformate; import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Sodiumsulfate; import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.ZincSulfate; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GalaxySpace; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.OrePrefixes.cell; @@ -79,6 +78,8 @@ import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gtPlusPlus.core.material.ALLOY.HELICOPTER; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.WHITE_METAL; import java.util.ArrayList; import java.util.Arrays; @@ -1079,11 +1080,11 @@ public class PlatinumSludgeOverHaul { } catch (ClassNotFoundException e) { e.printStackTrace(); } - if (stack.getItem() == GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustHeLiCoPtEr", 1L) + if (stack.getItem() == HELICOPTER.getDust(1) .getItem()) { return true; } - if (stack.getItem() == GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustWhiteMetal", 1L) + if (stack.getItem() == WHITE_METAL.getDust(1) .getItem()) { return true; } diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java index d0c34f50cd..7198832c4f 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java @@ -1,10 +1,9 @@ package com.github.technus.tectech.loader.recipe; +import static com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry.bw_realglas; import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getItemContainer; import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getOrDefault; -import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; -import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -287,7 +286,7 @@ public class Assembler implements Runnable { // Dynamo UHV 4A GT_Values.RA.stdBuilder() .itemInputs( - ItemList.Hatch_Dynamo_MAX.get(1), + ItemList.Hatch_Dynamo_UHV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2)) .itemOutputs(CustomItemList.eM_dynamoMulti4_UHV.get(1)) @@ -298,7 +297,7 @@ public class Assembler implements Runnable { // Dynamo UEV 4A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hatch_Dynamo_UEV").get(1), + ItemList.Hatch_Dynamo_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Draconium, 2), GT_OreDictUnificator .get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2)) @@ -310,7 +309,7 @@ public class Assembler implements Runnable { // Dynamo UIV 4A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hatch_Dynamo_UIV").get(1), + ItemList.Hatch_Dynamo_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 2), GT_OreDictUnificator .get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2)) @@ -322,7 +321,7 @@ public class Assembler implements Runnable { // Dynamo UMV 4A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hatch_Dynamo_UMV").get(1), + ItemList.Hatch_Dynamo_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Quantium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 2)) .itemOutputs(CustomItemList.eM_dynamoMulti4_UMV.get(1)) @@ -333,7 +332,7 @@ public class Assembler implements Runnable { // Dynamo UXV 4A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Hatch_Dynamo_UXV").get(1), + ItemList.Hatch_Dynamo_UXV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.BlackPlutonium, 2), GT_OreDictUnificator .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1), @@ -412,7 +411,7 @@ public class Assembler implements Runnable { // Dynamo UHV 16A GT_Values.RA.stdBuilder() .itemInputs( - getItemContainer("Transformer_UEV_UHV").get(1), + ItemList.Transformer_UEV_UHV.get(1), CustomItemList.eM_dynamoMulti4_UHV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUHV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4)) @@ -424,7 +423,7 @@ public class Assembler implements Runnable { // Dynamo UEV 16A GT_Values.RA