From f3e507eae9fad1935a529878d45b53bd21da3d61 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Sun, 1 Sep 2024 19:48:40 +0200 Subject: [PATCH] move tectech and delete some gross reflection in gt++ --- .../gthandler/GT_CraftingRecipeLoader.java | 7 +-- .../gthandler/recipes/AssemblerRecipes.java | 2 +- .../recipes/AssemblingLineRecipes.java | 61 +++++++++---------- .../recipes/SpaceAssemblerRecipes.java | 4 +- .../com/dreammaster/scripts/ScriptAmunRa.java | 3 +- .../dreammaster/scripts/ScriptSGCraft.java | 4 +- 6 files changed, 39 insertions(+), 42 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java index 236a154be..a56fcf06c 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java @@ -2079,8 +2079,7 @@ public void run() { // Pre-add planet block to EOH controller for (String dimAbbreviation : DimensionHelper.DimNameDisplayed) { ItemStack dimDisplay = new ItemStack(ModBlocks.getBlock(dimAbbreviation)); - ItemStack EOHController = com.github.technus.tectech.thing.CustomItemList.Machine_Multi_EyeOfHarmony - .get(1L); + ItemStack EOHController = tectech.thing.CustomItemList.Machine_Multi_EyeOfHarmony.get(1L); ItemStack NBTController = EOHController.copy(); NBTTagCompound nbt = new NBTTagCompound(); nbt.setString("planetBlock", dimAbbreviation); @@ -2090,8 +2089,8 @@ public void run() { // Transform EOH controller back to non-NBT one GT_ModHandler.addShapelessCraftingRecipe( - com.github.technus.tectech.thing.CustomItemList.Machine_Multi_EyeOfHarmony.get(1L), - new Object[] { com.github.technus.tectech.thing.CustomItemList.Machine_Multi_EyeOfHarmony.get(1L) }); + tectech.thing.CustomItemList.Machine_Multi_EyeOfHarmony.get(1L), + new Object[] { tectech.thing.CustomItemList.Machine_Multi_EyeOfHarmony.get(1L) }); } private Consumer shapelessUnremovableGtRecipes() { diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index dc07841ff..b758d0497 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -2373,7 +2373,7 @@ public void run() { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.foil, Materials.CosmicNeutronium, 2), CHRONOMATIC_GLASS.getFineWire(2)) - .itemOutputs(com.github.technus.tectech.thing.CustomItemList.DATApipe.get(64)) + .itemOutputs(tectech.thing.CustomItemList.DATApipe.get(64)) .fluidInputs(Materials.RadoxPolymer.getMolten(144L)).duration(10 * SECONDS).eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java index 1a61ddaf0..d2b704576 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java @@ -1,17 +1,6 @@ package com.dreammaster.gthandler.recipes; import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Californium; -import static com.github.technus.tectech.thing.CustomItemList.DATApipe; -import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_DataBank; -import static com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Switch; -import static com.github.technus.tectech.thing.CustomItemList.dataInAss_Hatch; -import static com.github.technus.tectech.thing.CustomItemList.dataInAss_Wireless_Hatch; -import static com.github.technus.tectech.thing.CustomItemList.dataIn_Hatch; -import static com.github.technus.tectech.thing.CustomItemList.dataIn_Wireless_Hatch; -import static com.github.technus.tectech.thing.CustomItemList.dataOutAss_Hatch; -import static com.github.technus.tectech.thing.CustomItemList.dataOutAss_Wireless_Hatch; -import static com.github.technus.tectech.thing.CustomItemList.dataOut_Hatch; -import static com.github.technus.tectech.thing.CustomItemList.dataOut_Wireless_Hatch; import static gregtech.api.enums.Mods.AE2FluidCraft; import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.Computronics; @@ -31,6 +20,17 @@ import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; import static gtPlusPlus.core.material.ALLOY.HASTELLOY_C276; import static gtPlusPlus.core.material.ALLOY.HASTELLOY_X; +import static tectech.thing.CustomItemList.DATApipe; +import static tectech.thing.CustomItemList.Machine_Multi_DataBank; +import static tectech.thing.CustomItemList.Machine_Multi_Switch; +import static tectech.thing.CustomItemList.dataInAss_Hatch; +import static tectech.thing.CustomItemList.dataInAss_Wireless_Hatch; +import static tectech.thing.CustomItemList.dataIn_Hatch; +import static tectech.thing.CustomItemList.dataIn_Wireless_Hatch; +import static tectech.thing.CustomItemList.dataOutAss_Hatch; +import static tectech.thing.CustomItemList.dataOutAss_Wireless_Hatch; +import static tectech.thing.CustomItemList.dataOut_Hatch; +import static tectech.thing.CustomItemList.dataOut_Wireless_Hatch; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -41,7 +41,6 @@ import com.dreammaster.gthandler.CustomItemList; import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; -import com.github.technus.tectech.recipe.TT_recipeAdder; import appeng.api.AEApi; import goodgenerator.items.MyMaterial; @@ -60,6 +59,7 @@ import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.Particle; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import tectech.recipe.TT_recipeAdder; public class AssemblingLineRecipes implements Runnable { @@ -443,7 +443,7 @@ public void run() { // Dyson Swarm Control Center Base Casing TT_recipeAdder.addResearchableAssemblylineRecipe( - com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Computer.get(1), + tectech.thing.CustomItemList.Machine_Multi_Computer.get(1), 192_000, 512, 2_000_000, @@ -451,7 +451,7 @@ public void run() { new ItemStack[] { ItemList.Hull_UIV.get(4), GT_ModHandler.getModItem(OpenComputers.ID, "item", 4, 103), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UMV, 4), - com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Computer.get(4), }, + tectech.thing.CustomItemList.Machine_Multi_Computer.get(4), }, new FluidStack[] { Materials.SuperCoolant.getFluid(32_000), new FluidStack(solderUEV, 11_520), Materials.UUMatter.getFluid(8_000) }, GT_ModHandler.getModItem(GalaxySpace.ID, "dysonswarmparts", 8, 5), @@ -460,17 +460,16 @@ public void run() { // Dyson Swarm Control Center Primary Windings TT_recipeAdder.addResearchableAssemblylineRecipe( - com.github.technus.tectech.thing.CustomItemList.tM_TeslaPrimary_6.get(1), + tectech.thing.CustomItemList.tM_TeslaPrimary_6.get(1), 192_000, 512, 2_000_000, 32, new ItemStack[] { ItemList.Circuit_Chip_QPIC.get(4), CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64), - com.github.technus.tectech.thing.CustomItemList.eM_Coil.get(4), + tectech.thing.CustomItemList.eM_Coil.get(4), CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64), - CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64), - CustomItemList.MicaInsulatorFoil.get(64) }, + CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64) }, new FluidStack[] { Materials.RadoxPolymer.getMolten(3_456), Materials.SuperCoolant.getFluid(16_000), new FluidStack(solderUEV, 11_520), Materials.UUMatter.getFluid(8_000) }, GT_ModHandler.getModItem(GalaxySpace.ID, "dysonswarmparts", 4, 6), @@ -479,7 +478,7 @@ public void run() { // Dyson Swarm Control Center Secondary Windings TT_recipeAdder.addResearchableAssemblylineRecipe( - com.github.technus.tectech.thing.CustomItemList.tM_TeslaSecondary.get(1), + tectech.thing.CustomItemList.tM_TeslaSecondary.get(1), 192_000, 512, 2_000_000, @@ -497,7 +496,7 @@ public void run() { // Dyson Swarm Control Center Toroid Casing TT_recipeAdder.addResearchableAssemblylineRecipe( - com.github.technus.tectech.thing.CustomItemList.tM_TeslaToroid.get(1), + tectech.thing.CustomItemList.tM_TeslaToroid.get(1), 192_000, 512, 2_000_000, @@ -1023,7 +1022,7 @@ public void run() { ItemList.ActivatedCarbonFilterMesh.get(16), ItemList.BlockSterileWaterPlantCasing.get(8), ItemList.Casing_Vent.get(8), - com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_LuV.get(1), + tectech.thing.CustomItemList.eM_energyMulti64_LuV.get(1), ItemList.Electric_Motor_LuV.get(4), ItemList.Electric_Pump_LuV.get(4), new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 }, @@ -1042,7 +1041,7 @@ public void run() { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 8), ItemList.BlockOzoneCasing.get(8), ItemList.Casing_Vent.get(8), - com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_LuV.get(1), + tectech.thing.CustomItemList.eM_energyMulti64_LuV.get(1), HASTELLOY_C276.getPlate(8), HASTELLOY_C276.getRotor(4), HASTELLOY_X.getRotor(4), @@ -1066,7 +1065,7 @@ public void run() { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Adamantium, 8), ItemList.BlockFlocculationCasing.get(8), ItemList.Casing_Vent.get(8), - com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_LuV.get(1), + tectech.thing.CustomItemList.eM_energyMulti64_LuV.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Trinium, 8), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Trinium, 4), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 4), @@ -1091,7 +1090,7 @@ public void run() { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 8), ItemList.BlockNaquadahReinforcedWaterPlantCasing.get(8), ItemList.BlockExtremeCorrosionResistantCasing.get(8), - com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_ZPM.get(1), + tectech.thing.CustomItemList.eM_energyMulti64_ZPM.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 4), HASTELLOY_C276.getRotor(4), @@ -1116,7 +1115,7 @@ public void run() { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 8), ItemList.BlockPlasmaHeatingCasing.get(8), ItemList.Casing_Coil_Superconductor.get(8), - com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_UV.get(1), + tectech.thing.CustomItemList.eM_energyMulti64_UV.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 4), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Osmiridium, 4), @@ -1141,7 +1140,7 @@ public void run() { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadria, 8), ItemList.BlockNaquadriaReinforcedWaterPlantCasing.get(8), ItemList.BlockUltraVioletLaserEmitter.get(8), - com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_UV.get(1), + tectech.thing.CustomItemList.eM_energyMulti64_UV.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 4), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Draconium, 4), @@ -1165,8 +1164,8 @@ public void run() { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 8), ItemList.BlockPlasmaHeatingCasing.get(8), - com.github.technus.tectech.thing.CustomItemList.eM_Computer_Casing.get(8), - com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_UEV.get(1), + tectech.thing.CustomItemList.eM_Computer_Casing.get(8), + tectech.thing.CustomItemList.eM_energyMulti64_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 8), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 4), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.CosmicNeutronium, 4), @@ -1190,7 +1189,7 @@ public void run() { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 16), ItemList.BlockQuarkContainmentCasing.get(8), ItemList.BlockQuarkReleaseChamber.get(8), - com.github.technus.tectech.thing.CustomItemList.eM_energyMulti64_UEV.get(1), + tectech.thing.CustomItemList.eM_energyMulti64_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 8), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.CosmicNeutronium, 8), @@ -1333,12 +1332,12 @@ public void run() { 64, 200000, 4, - new Object[] { com.github.technus.tectech.thing.CustomItemList.Machine_Multi_Transformer.get(1), + new Object[] { tectech.thing.CustomItemList.Machine_Multi_Transformer.get(1), AEApi.instance().definitions().materials().singularity().maybeStack(4).get(), ItemList.Field_Generator_UHV.get(4), ItemList.Emitter_UHV.get(4), ItemList.Casing_Fusion_Coil.get(4), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 2), - com.github.technus.tectech.thing.CustomItemList.LASERpipe.get(64), }, + tectech.thing.CustomItemList.LASERpipe.get(64), }, new FluidStack[] { new FluidStack(Materials.Neutronium.mStandardMoltenFluid, 144 * 12), new FluidStack(Materials.Tritanium.mStandardMoltenFluid, 144 * 12), new FluidStack(solderIndalloy, 144 * 24), diff --git a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java index d3c1b91a9..9e307ef1e 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java @@ -16,8 +16,6 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.technus.tectech.thing.CustomItemList; -import com.github.technus.tectech.thing.casing.TT_Container_Casings; import com.gtnewhorizons.gtnhintergalactic.recipe.IG_RecipeAdder; import goodgenerator.items.MyMaterial; @@ -29,6 +27,8 @@ import gregtech.api.enums.TierEU; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.material.ELEMENT; +import tectech.thing.CustomItemList; +import tectech.thing.casing.TT_Container_Casings; public class SpaceAssemblerRecipes implements Runnable { diff --git a/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java b/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java index 932e10384..e5f56e7c1 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAmunRa.java @@ -37,8 +37,6 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import com.github.technus.tectech.recipe.TT_recipeAdder; - import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import de.katzenpapst.amunra.block.ARBlocks; @@ -54,6 +52,7 @@ import gregtech.api.util.GT_RecipeConstants; import gregtech.api.util.GT_Utility; import micdoodle8.mods.galacticraft.api.recipe.SpaceStationRecipe; +import tectech.recipe.TT_recipeAdder; public class ScriptAmunRa implements IScriptLoader { diff --git a/src/main/java/com/dreammaster/scripts/ScriptSGCraft.java b/src/main/java/com/dreammaster/scripts/ScriptSGCraft.java index 811419ab0..006ed85fa 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptSGCraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptSGCraft.java @@ -13,7 +13,6 @@ import net.minecraft.item.ItemStack; import com.dreammaster.gthandler.CustomItemList; -import com.github.technus.tectech.thing.casing.TT_Container_Casings; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; import goodgenerator.items.MyMaterial; @@ -22,6 +21,7 @@ import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; +import tectech.thing.casing.TT_Container_Casings; public class ScriptSGCraft implements IScriptLoader { @@ -137,7 +137,7 @@ public void loadRecipes() { 'k', new ItemStack(TT_Container_Casings.StabilisationFieldGenerators, 1, 8), 'l', - com.github.technus.tectech.thing.CustomItemList.Machine_Multi_EyeOfHarmony.get(1), + tectech.thing.CustomItemList.Machine_Multi_EyeOfHarmony.get(1), 'm', getModItem(SGCraft.ID, "stargateRing", 1, 0, missing), 'n',