diff options
author | boubou19 <miisterunknown@gmail.com> | 2024-08-15 16:48:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-15 16:48:03 +0200 |
commit | 361adcefd72d3f58040b18cc7ae92b65ec017522 (patch) | |
tree | 8a93908c1fc4f0cf4e2395b02715f2cbd9fd805f /src/main/java/goodgenerator | |
parent | 0f990a7cfd78c3ede4db09a893e1e6edff164a2a (diff) | |
download | GT5-Unofficial-361adcefd72d3f58040b18cc7ae92b65ec017522.tar.gz GT5-Unofficial-361adcefd72d3f58040b18cc7ae92b65ec017522.tar.bz2 GT5-Unofficial-361adcefd72d3f58040b18cc7ae92b65ec017522.zip |
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
Diffstat (limited to 'src/main/java/goodgenerator')
6 files changed, 70 insertions, 115 deletions
diff --git a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java index 9ae0b911a7..cfc57ccf21 100644 --- a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java +++ b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java @@ -172,7 +172,8 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 256), new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 128))) }); ItemStack broad = new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6); - if (NewHorizonsCoreMod.isModLoaded()) broad = GT_ModHandler.getModItem("dreamcraft", "item.ArcaneSlate", 1); + if (NewHorizonsCoreMod.isModLoaded()) + broad = GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ArcaneSlate", 1); GregTech_API.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_BLANK", "Upgrade your generator", @@ -316,7 +317,8 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 128))), "research.ESSENTIA_UPGRADE_UNSTABLE.page.1", "research.ESSENTIA_UPGRADE_UNSTABLE.page.2" }); ItemStack meatDust = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1); - if (NewHorizonsCoreMod.isModLoaded()) meatDust = GT_ModHandler.getModItem("dreamcraft", "GTNHBioItems", 1, 2); + if (NewHorizonsCoreMod.isModLoaded()) + meatDust = GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "GTNHBioItems", 1, 2); GregTech_API.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_VICTUS", "Essentia: VICTUS", @@ -515,21 +517,21 @@ public class Research { "research.ESSENTIA_UPGRADE_ELECTRIC.page.1" }); ItemStack nodeLinkDevice = ThaumicBases.isModLoaded() - ? GT_ModHandler.getModItem("thaumicbases", "nodeLinker", 1, 0) + ? GT_ModHandler.getModItem(ThaumicBases.ID, "nodeLinker", 1, 0) : new ItemStack(ConfigBlocks.blockStoneDevice, 1, 11); ItemStack alchemicalFurnace = ThaumicBases.isModLoaded() - ? GT_ModHandler.getModItem("thaumicbases", "advAlchFurnace", 1, 0) + ? GT_ModHandler.getModItem(ThaumicBases.ID, "advAlchFurnace", 1, 0) : new ItemStack(ConfigBlocks.blockStoneDevice, 1, 0); ItemStack nitor = ThaumicTinkerer.isModLoaded() - ? GT_ModHandler.getModItem("ThaumicTinkerer", "brightNitor", 1, 0) + ? GT_ModHandler.getModItem(ThaumicTinkerer.ID, "brightNitor", 1, 0) : new ItemStack(ConfigItems.itemResource, 1, 1); - ItemStack alchemicalBoiler = Automagy.isModLoaded() ? GT_ModHandler.getModItem("Automagy", "blockBoiler", 1, 0) + ItemStack alchemicalBoiler = Automagy.isModLoaded() ? GT_ModHandler.getModItem(Automagy.ID, "blockBoiler", 1, 0) : new ItemStack(ConfigBlocks.blockStoneDevice, 1, 1); ItemStack essentiaLocus = Automagy.isModLoaded() - ? GT_ModHandler.getModItem("Automagy", "blockEssentiaLocus", 1, 0) + ? GT_ModHandler.getModItem(Automagy.ID, "blockEssentiaLocus", 1, 0) : new ItemStack(ConfigBlocks.blockJar, 1, 1); ItemStack thauminiteBlock = ThaumicBases.isModLoaded() - ? GT_ModHandler.getModItem("thaumicbases", "thauminiteBlock", 1, 0) + ? GT_ModHandler.getModItem(ThaumicBases.ID, "thauminiteBlock", 1, 0) : new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 4); GregTech_API.sThaumcraftCompat .addResearch( @@ -613,10 +615,10 @@ public class Research { if (ThaumicEnergistics.isModLoaded()) { ItemStack essentiaPump = WitchingGadgets.isModLoaded() - ? GT_ModHandler.getModItem("WitchingGadgets", "WG_MetalDevice", 1, 0) + ? GT_ModHandler.getModItem(WitchingGadgets.ID, "WG_MetalDevice", 1, 0) : new ItemStack(ConfigBlocks.blockTube, 1, 4); ItemStack inter = ThaumicTinkerer.isModLoaded() - ? GT_ModHandler.getModItem("ThaumicTinkerer", "interface", 1, 0) + ? GT_ModHandler.getModItem(ThaumicTinkerer.ID, "interface", 1, 0) : new ItemStack(ConfigItems.itemResource, 1, 15); GregTech_API.sThaumcraftCompat.addResearch( "ESSENTIA_OUTPUT_HATCH_ME", @@ -642,7 +644,7 @@ public class Research { ItemRefer.Essentia_Output_Hatch.get(1), new ItemStack[] { GT_ModHandler - .getModItem("thaumicenergistics", "thaumicenergistics.block.essentia.provider", 1), + .getModItem(ThaumicEnergistics.ID, "thaumicenergistics.block.essentia.provider", 1), new ItemStack(ConfigBlocks.blockEssentiaReservoir, 1, 0), essentiaPump, inter, }, ItemRefer.Essentia_Output_Hatch_ME.get(1), 8, diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java index b4195c13f1..79787fa567 100644 --- a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java @@ -4,11 +4,11 @@ import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.naquadahFuelRefin import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.naquadahReactorFuels; import static goodgenerator.main.GG_Config_Loader.NaquadahFuelTime; import static goodgenerator.main.GG_Config_Loader.NaquadahFuelVoltage; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.api.util.GT_RecipeConstants.LNG_BASIC_OUTPUT; import static gregtech.api.util.GT_RecipeConstants.NFR_COIL_TIER; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.CHRONOMATIC_GLASS; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -21,7 +21,6 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.material.ELEMENT; @@ -75,7 +74,7 @@ public class FuelRecipeLoader { GT_Values.RA.stdBuilder() .itemInputs( MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 8), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustChromaticGlass", 9), + CHRONOMATIC_GLASS.getDust(9), ItemRefer.High_Density_Uranium.get(2), ItemRefer.High_Density_Plutonium.get(1)) .fluidInputs( diff --git a/src/main/java/goodgenerator/loader/IDs_GoodGenerator.java b/src/main/java/goodgenerator/loader/IDs_GoodGenerator.java deleted file mode 100644 index a6dc54e3e1..0000000000 --- a/src/main/java/goodgenerator/loader/IDs_GoodGenerator.java +++ /dev/null @@ -1,46 +0,0 @@ -package goodgenerator.loader; - -public enum IDs_GoodGenerator { - - DieselGeneratorEV(1113), - DieselGeneratorIV(1114), - MultiNqGenerator(12732), - FuelRefineFactory(16999), - PipeIncoloy903(30995), - UniversalChemicalFuelEngine(32001), - LargeEssentiaGenerator(32002), - NeutronAcceleratorULV(32003), - NeutronAcceleratorLV(32004), - NeutronAcceleratorMV(32005), - NeutronAcceleratorHV(32006), - NeutronAcceleratorEV(32007), - NeutronAcceleratorIV(32008), - NeutronAcceleratorLuV(32009), - NeutronAcceleratorZPM(32010), - NeutronAcceleratorUV(32011), - NeutronSensor(32012), - NeutronActivator(32013), - YottaFluidTank(32014), - YottaHatch(32015), - SupercriticalFluidTurbine(32016), - ExtremeHeatExchanger(32017), - PreciseAssembler(32018), - LargeFusionComputer1(32019), - LargeFusionComputer2(32020), - LargeFusionComputer3(32021), - LargeFusionComputer4(32022), - LargeFusionComputer5(32023), - LargeEssentiaSmeltery(32024), - CoolantTower(32025), - ComponentAssemblyLine(32026), - WireSignalium(32749), - WireLumiium(32737), - - ; - - public final int ID; - - IDs_GoodGenerator(int ID) { - this.ID = ID; - } -} diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java index 51f0202aa1..d72ee2fabb 100644 --- a/src/main/java/goodgenerator/loader/Loaders.java +++ b/src/main/java/goodgenerator/loader/Loaders.java @@ -53,6 +53,7 @@ import goodgenerator.util.CrackRecipeAdder; import goodgenerator.util.MaterialFix; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.MetaTileEntityIDs; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.render.TextureFactory; @@ -266,19 +267,19 @@ public class Loaders { // public static Item Isotope = new NuclearMetaItemGenerator(); public static void GTMetaTileRegister() { - Loaders.MAR = new MultiNqGenerator(IDs_GoodGenerator.MultiNqGenerator.ID, "NaG", "Large Naquadah Reactor") + Loaders.MAR = new MultiNqGenerator(MetaTileEntityIDs.MultiNqGenerator.ID, "NaG", "Large Naquadah Reactor") .getStackForm(1L); - Loaders.FRF = new FuelRefineFactory(IDs_GoodGenerator.FuelRefineFactory.ID, "FRF", "Naquadah Fuel Refinery") + Loaders.FRF = new FuelRefineFactory(MetaTileEntityIDs.FuelRefineFactory.ID, "FRF", "Naquadah Fuel Refinery") .getStackForm(1L); Loaders.UCFE = new UniversalChemicalFuelEngine( - IDs_GoodGenerator.UniversalChemicalFuelEngine.ID, + MetaTileEntityIDs.UniversalChemicalFuelEngine.ID, "UniversalChemicalFuelEngine", "Universal Chemical Fuel Engine").getStackForm(1L); - int[] neutronAcceleratorIDs = new int[] { IDs_GoodGenerator.NeutronAcceleratorULV.ID, - IDs_GoodGenerator.NeutronAcceleratorLV.ID, IDs_GoodGenerator.NeutronAcceleratorMV.ID, - IDs_GoodGenerator.NeutronAcceleratorHV.ID, IDs_GoodGenerator.NeutronAcceleratorEV.ID, - IDs_GoodGenerator.NeutronAcceleratorIV.ID, IDs_GoodGenerator.NeutronAcceleratorLuV.ID, - IDs_GoodGenerator.NeutronAcceleratorZPM.ID, IDs_GoodGenerator.NeutronAcceleratorUV.ID, }; + int[] neutronAcceleratorIDs = new int[] { MetaTileEntityIDs.NeutronAcceleratorULV.ID, + MetaTileEntityIDs.NeutronAcceleratorLV.ID, MetaTileEntityIDs.NeutronAcceleratorMV.ID, + MetaTileEntityIDs.NeutronAcceleratorHV.ID, MetaTileEntityIDs.NeutronAcceleratorEV.ID, + MetaTileEntityIDs.NeutronAcceleratorIV.ID, MetaTileEntityIDs.NeutronAcceleratorLuV.ID, + MetaTileEntityIDs.NeutronAcceleratorZPM.ID, MetaTileEntityIDs.NeutronAcceleratorUV.ID, }; for (int i = 0; i < 9; i++) { Loaders.NeutronAccelerators[i] = new NeutronAccelerator( neutronAcceleratorIDs[i], @@ -286,67 +287,67 @@ public class Loaders { "Neutron Accelerator " + GT_Values.VN[i], i).getStackForm(1L); } - Loaders.NS = new NeutronSensor(IDs_GoodGenerator.NeutronSensor.ID, "Neutron Sensor", "Neutron Sensor", 5) + Loaders.NS = new NeutronSensor(MetaTileEntityIDs.NeutronSensor.ID, "Neutron Sensor", "Neutron Sensor", 5) .getStackForm(1L); Loaders.NA = new NeutronActivator( - IDs_GoodGenerator.NeutronActivator.ID, + MetaTileEntityIDs.NeutronActivator.ID, "NeutronActivator", "Neutron Activator").getStackForm(1L); - Loaders.YFT = new YottaFluidTank(IDs_GoodGenerator.YottaFluidTank.ID, "YottaFluidTank", "YOTTank") + Loaders.YFT = new YottaFluidTank(MetaTileEntityIDs.YottaFluidTank.ID, "YottaFluidTank", "YOTTank") .getStackForm(1L); - Loaders.YFH = new YOTTAHatch(IDs_GoodGenerator.YottaHatch.ID, "YottaFluidTankHatch", "YOTHatch", 5) + Loaders.YFH = new YOTTAHatch(MetaTileEntityIDs.YottaHatch.ID, "YottaFluidTankHatch", "YOTHatch", 5) .getStackForm(1L); Loaders.SCTurbine = new SupercriticalFluidTurbine( - IDs_GoodGenerator.SupercriticalFluidTurbine.ID, + MetaTileEntityIDs.SupercriticalFluidTurbine.ID, "SupercriticalSteamTurbine", "SC Steam Turbine").getStackForm(1L); Loaders.XHE = new ExtremeHeatExchanger( - IDs_GoodGenerator.ExtremeHeatExchanger.ID, + MetaTileEntityIDs.ExtremeHeatExchanger.ID, "ExtremeHeatExchanger", "Extreme Heat Exchanger").getStackForm(1L); Loaders.PA = new PreciseAssembler( - IDs_GoodGenerator.PreciseAssembler.ID, + MetaTileEntityIDs.PreciseAssembler.ID, "PreciseAssembler", "Precise Auto-Assembler MT-3662").getStackForm(1L); Loaders.LFC[0] = new LargeFusionComputer1( - IDs_GoodGenerator.LargeFusionComputer1.ID, + MetaTileEntityIDs.LargeFusionComputer1.ID, "LargeFusionComputer1", "Compact Fusion Computer MK-I Prototype").getStackForm(1); Loaders.LFC[1] = new LargeFusionComputer2( - IDs_GoodGenerator.LargeFusionComputer2.ID, + MetaTileEntityIDs.LargeFusionComputer2.ID, "LargeFusionComputer2", "Compact Fusion Computer MK-II").getStackForm(1L); Loaders.LFC[2] = new LargeFusionComputer3( - IDs_GoodGenerator.LargeFusionComputer3.ID, + MetaTileEntityIDs.LargeFusionComputer3.ID, "LargeFusionComputer3", "Compact Fusion Computer MK-III").getStackForm(1L); Loaders.LFC[3] = new LargeFusionComputer4( - IDs_GoodGenerator.LargeFusionComputer4.ID, + MetaTileEntityIDs.LargeFusionComputer4.ID, "LargeFusionComputer4", "Compact Fusion Computer MK-IV Prototype").getStackForm(1L); Loaders.LFC[4] = new LargeFusionComputer5( - IDs_GoodGenerator.LargeFusionComputer5.ID, + MetaTileEntityIDs.LargeFusionComputer5.ID, "LargeFusionComputer5", "Compact Fusion Computer MK-V").getStackForm(1L); Loaders.Generator_Diesel[0] = new DieselGenerator( - IDs_GoodGenerator.DieselGeneratorEV.ID, + MetaTileEntityIDs.DieselGeneratorEV.ID, "basicgenerator.diesel.tier.04", "Turbo Supercharging Combustion Generator", 4).getStackForm(1L); Loaders.Generator_Diesel[1] = new DieselGenerator( - IDs_GoodGenerator.DieselGeneratorIV.ID, + MetaTileEntityIDs.DieselGeneratorIV.ID, "basicgenerator.diesel.tier.05", "Ultimate Chemical Energy Releaser", 5).getStackForm(1L); - Loaders.CT = new CoolantTower(IDs_GoodGenerator.CoolantTower.ID, "CoolantTower", "Coolant Tower") + Loaders.CT = new CoolantTower(MetaTileEntityIDs.CoolantTower.ID, "CoolantTower", "Coolant Tower") .getStackForm(1L); Loaders.CompAssline = new ComponentAssemblyLine( - IDs_GoodGenerator.ComponentAssemblyLine.ID, + MetaTileEntityIDs.ComponentAssemblyLine.ID, "ComponentAssemblyLine", "Component Assembly Line").getStackForm(1L); - CrackRecipeAdder.registerPipe(IDs_GoodGenerator.PipeIncoloy903.ID, MyMaterial.incoloy903, 15000, 8000, true); - CrackRecipeAdder.registerWire(IDs_GoodGenerator.WireSignalium.ID, MyMaterial.signalium, 12, 131072, 16, true); - CrackRecipeAdder.registerWire(IDs_GoodGenerator.WireLumiium.ID, MyMaterial.lumiium, 8, 524288, 64, true); + CrackRecipeAdder.registerPipe(MetaTileEntityIDs.PipeIncoloy903.ID, MyMaterial.incoloy903, 15000, 8000, true); + CrackRecipeAdder.registerWire(MetaTileEntityIDs.WireSignalium.ID, MyMaterial.signalium, 12, 131072, 16, true); + CrackRecipeAdder.registerWire(MetaTileEntityIDs.WireLumiium.ID, MyMaterial.lumiium, 8, 524288, 64, true); } public static void Register() { @@ -416,11 +417,11 @@ public class Loaders { GameRegistry.registerTileEntity(EssentiaOutputHatch.class, "EssentiaOutputHatch"); GameRegistry.registerTileEntity(EssentiaOutputHatch_ME.class, "EssentiaOutputHatch_ME"); Loaders.LEG = new LargeEssentiaGenerator( - IDs_GoodGenerator.LargeEssentiaGenerator.ID, + MetaTileEntityIDs.LargeEssentiaGenerator.ID, "LargeEssentiaGenerator", "Large Essentia Generator - Marked for Deprecation").getStackForm(1L); Loaders.LES = new LargeEssentiaSmeltery( - IDs_GoodGenerator.LargeEssentiaSmeltery.ID, + MetaTileEntityIDs.LargeEssentiaSmeltery.ID, "LargeEssentiaSmeltery", "Large Essentia Smeltery").getStackForm(1L); essentiaHatch = new TEBlock("essentiaHatch", new String[] { GoodGenerator.MOD_ID + ":essentiaHatch" }, 1); diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index d6f1682da9..261ecc69cc 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -1044,7 +1044,7 @@ public class RecipeLoader { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Multifiberglass_Elite.get(1), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedGoldChip", 16), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedGoldChip", 16), ItemList.Circuit_Chip_SoC2.get(8), ItemList.Circuit_Chip_NOR.get(32), MyMaterial.signalium.get(OrePrefixes.bolt, 32), @@ -1059,7 +1059,7 @@ public class RecipeLoader { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Multifiberglass_Elite.get(1), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedGoldChip", 16), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedGoldChip", 16), ItemList.Circuit_Chip_SoC2.get(8), ItemList.Circuit_Chip_NOR.get(32), MyMaterial.signalium.get(OrePrefixes.bolt, 32), diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java index 472612c901..e7411f3c6c 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java @@ -4,7 +4,9 @@ import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getItemC import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.neutronActivatorRecipes; import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.preciseAssemblerRecipes; import static goodgenerator.util.MyRecipeAdder.computeRangeNKE; -import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.Avaritia; +import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; @@ -244,7 +246,7 @@ public class RecipeLoader_02 { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hatch_Output_IV.get(1), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 440), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 440), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CertusQuartz, 8), GT_Utility.getIntegratedCircuit(1)) .fluidInputs(Materials.Plastic.getMolten(144)) @@ -344,7 +346,7 @@ public class RecipeLoader_02 { ItemList.Electric_Pump_HV.get(8), ItemList.Quantum_Tank_LV.get(1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 8), - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 1L, 6), + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 1L, 6), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polycaprolactam, 32)) .fluidInputs(new FluidStack(solderIndalloy, 2304), Materials.Lubricant.getFluid(4000)) .itemOutputs(ItemRefer.Fluid_Storage_Core_T3.get(1)) @@ -360,7 +362,7 @@ public class RecipeLoader_02 { ItemList.Electric_Pump_EV.get(8), ItemList.Quantum_Tank_LV.get(4), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 8), - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 4L, 6), + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 4L, 6), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.StyreneButadieneRubber, 64), GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 64)) .fluidInputs(new FluidStack(solderIndalloy, 18432), Materials.Lubricant.getFluid(16000)) @@ -377,7 +379,7 @@ public class RecipeLoader_02 { ItemList.Electric_Pump_IV.get(8), ItemList.Quantum_Tank_HV.get(8), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 8), - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 16L, 6), + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 16L, 6), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Polycaprolactam, 24), GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Titanium, 64)) .fluidInputs( @@ -398,7 +400,7 @@ public class RecipeLoader_02 { ItemList.Quantum_Tank_EV.get(16), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 16), - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), ItemList.Machine_IV_Compressor.get(64)) .fluidInputs( Materials.Draconium.getMolten(2304), @@ -413,9 +415,9 @@ public class RecipeLoader_02 { .metadata(RESEARCH_ITEM, ItemRefer.Fluid_Storage_Core_T6.get(1)) .metadata(RESEARCH_TIME, 4 * HOURS + 30 * MINUTES) .itemInputs( - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), ItemList.Electric_Pump_ZPM.get(8), - GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 1L, 0), + GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 1L, 0), ItemList.Quantum_Tank_EV.get(32), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 8), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.InfinityCatalyst, 8), @@ -433,9 +435,9 @@ public class RecipeLoader_02 { .metadata(RESEARCH_ITEM, ItemRefer.Fluid_Storage_Core_T7.get(1)) .metadata(RESEARCH_TIME, 9 * HOURS) .itemInputs( - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), ItemList.Electric_Pump_UV.get(8), - GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 2L, 0), + GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 2L, 0), ItemList.Quantum_Tank_EV.get(64), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 16), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 24), @@ -453,9 +455,9 @@ public class RecipeLoader_02 { .metadata(RESEARCH_ITEM, ItemRefer.Fluid_Storage_Core_T8.get(1)) .metadata(RESEARCH_TIME, 180 * HOURS) .itemInputs( - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), ItemList.Electric_Pump_UHV.get(8), - GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 2L, 0), + GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 2L, 0), ItemList.Quantum_Tank_IV.get(8), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 32), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 36), @@ -474,9 +476,9 @@ public class RecipeLoader_02 { .metadata(RESEARCH_ITEM, ItemRefer.Fluid_Storage_Core_T9.get(1)) .metadata(RESEARCH_TIME, 360 * HOURS) .itemInputs( - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), ItemList.Electric_Pump_UEV.get(8), - GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 4L, 0), + GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 4L, 0), ItemList.Quantum_Tank_IV.get(16), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 32), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.CosmicNeutronium, 24), @@ -1194,7 +1196,7 @@ public class RecipeLoader_02 { GT_Values.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T1.get(2), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedDiamondCrystalChip", 8), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedDiamondCrystalChip", 8), ItemList.Circuit_Chip_NAND.get(16), GT_ModHandler.getIC2Item("reactorVentCore", 1L, 1)) .itemOutputs(ItemRefer.HiC_T2.get(1)) @@ -1211,7 +1213,7 @@ public class RecipeLoader_02 { GT_Values.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T1.get(2), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedDiamondCrystalChip", 8), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedDiamondCrystalChip", 8), ItemList.Circuit_Chip_NAND.get(16), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Aluminium, 2)) .itemOutputs(ItemRefer.HiC_T2.get(1)) @@ -1262,7 +1264,7 @@ public class RecipeLoader_02 { GT_Values.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T3.get(2), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedEnergyChip", 8), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedEnergyChip", 8), ItemList.Circuit_Chip_QuantumCPU.get(16), GT_ModHandler.getIC2Item("reactorVentGold", 1L, 1)) .itemOutputs(ItemRefer.HiC_T4.get(1)) @@ -1279,7 +1281,7 @@ public class RecipeLoader_02 { GT_Values.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T3.get(2), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedEnergyChip", 8), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedEnergyChip", 8), ItemList.Circuit_Chip_QuantumCPU.get(16), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.EnergeticAlloy, 2)) .itemOutputs(ItemRefer.HiC_T4.get(1)) @@ -1296,7 +1298,7 @@ public class RecipeLoader_02 { GT_Values.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T4.get(2), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedManyullynCrystalChip", 8), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedManyullynCrystalChip", 8), ItemList.Circuit_Chip_BioCPU.get(1), Ic2Items.reactorVentSpread) .itemOutputs(ItemRefer.HiC_T5.get(1)) @@ -1313,7 +1315,7 @@ public class RecipeLoader_02 { GT_Values.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T4.get(2), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedManyullynCrystalChip", 8), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedManyullynCrystalChip", 8), ItemList.Circuit_Chip_BioCPU.get(1), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenCarbide, 2)) .itemOutputs(ItemRefer.HiC_T5.get(1)) @@ -1510,10 +1512,7 @@ public class RecipeLoader_02 { // Compact MK4 Fusion Coil GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.3", 3, 13), - ItemRefer.HiC_T5.get(1), - GT_ModHandler.getModItem(GTPlusPlus.ID, "item.itemBufferCore4", 1)) + .itemInputs(GregtechItemList.Casing_Fusion_Internal.get(3), ItemRefer.HiC_T5.get(1), CI.getEnergyCore(4, 1)) .itemOutputs(ItemRefer.Compact_Fusion_Coil_T3.get(1)) .fluidInputs( FluidRegistry.getFluidStack("molten.energycrystal", 1152), |