diff options
Diffstat (limited to 'src/main/java')
11 files changed, 352 insertions, 130 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index cd51a532d3..158f10da25 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -36,7 +36,9 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Collection; import java.util.Iterator; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; +import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks; @Mod( modid = Reference.MODID, @@ -232,6 +234,12 @@ public class TecTech { pEvent.registerServerCommand(new ChargeCommand()); pEvent.registerServerCommand(new MassCommand()); } + + // This must be done after game load otherwise it fails. + eyeOfHarmonyRecipeStorage = new EyeOfHarmonyRecipeStorage(); + // The reason we do this is to force the fields inside the class to instantiate at world load so NEI + // displays properly. + eyeOfHarmonyRecipeStorage.recipeLookUp(new ItemStack(ModBlocks.blocks.get("Ow"))); } public static EyeOfHarmonyRecipeStorage eyeOfHarmonyRecipeStorage = null; @@ -240,8 +248,5 @@ public class TecTech { public void onServerAboutToStart(FMLServerAboutToStartEvent aEvent) { chunkDataHandler.clearData(); playerPersistence.clearData(); - - // This must be done after game load otherwise it fails. - eyeOfHarmonyRecipeStorage = new EyeOfHarmonyRecipeStorage(); } } diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 7da6749a8a..db3f209597 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -1,6 +1,8 @@ package com.github.technus.tectech.compatibility.dreamcraft; import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getOrDefault; +import static com.google.common.math.LongMath.pow; +import static gregtech.api.util.GT_ModHandler.getModItem; import com.github.technus.tectech.Reference; import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry; @@ -12,17 +14,14 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviou import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviour_Recycler; import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine; import cpw.mods.fml.common.Loader; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.MaterialsBotania; -import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.*; import gregtech.api.interfaces.IItemContainer; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import java.lang.reflect.Method; import net.minecraft.init.Blocks; @@ -308,8 +307,8 @@ public class DreamCraftRecipeLoader { new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1L}, GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Infinity, 8), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 8), - GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 32, 0) + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 32, 0) }, new FluidStack[] { Materials.DraconiumAwakened.getMolten(576), @@ -329,10 +328,10 @@ public class DreamCraftRecipeLoader { new Object[] { new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1L}, GT_OreDictUnificator.get("wireGt02Hypogen", 8L), - GT_ModHandler.getModItem("miscutils", "itemScrewHypogen", 8, 0), - GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("miscutils", "itemScrewHypogen", 8, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), }, new FluidStack[] { Materials.Infinity.getMolten(576), @@ -352,13 +351,13 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Nano, 1), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SpaceTime, 8), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 8), - GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 1L), - GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), - GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("eternalsingularity", "eternal_singularity", 1L), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 576), @@ -1101,7 +1100,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), - GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 2L, 2) + getModItem("bartworks", "BW_GlasBlocks", 2L, 2) }, Materials.TungstenSteel.getMolten(288), CustomItemList.Machine_BuckConverter_IV.get(1), @@ -1115,7 +1114,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get( OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NiobiumTitanium, 4), - GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 2L, 3) + getModItem("bartworks", "BW_GlasBlocks", 2L, 3) }, new FluidStack(FluidRegistry.getFluid("molten.rhodium-plated palladium"), 288), CustomItemList.Machine_BuckConverter_LuV.get(1), @@ -1128,7 +1127,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), - GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 2L, 4) + getModItem("bartworks", "BW_GlasBlocks", 2L, 4) }, Materials.Iridium.getMolten(288), CustomItemList.Machine_BuckConverter_ZPM.get(1), @@ -1141,7 +1140,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 4), - GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 2L, 5) + getModItem("bartworks", "BW_GlasBlocks", 2L, 5) }, Materials.Osmium.getMolten(288), CustomItemList.Machine_BuckConverter_UV.get(1), @@ -1154,7 +1153,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.ElectrumFlux, 4), - GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 4L, 5) + getModItem("bartworks", "BW_GlasBlocks", 4L, 5) }, Materials.Neutronium.getMolten(288), CustomItemList.Machine_BuckConverter_UHV.get(1), @@ -1168,7 +1167,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get( OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Bedrockium, 4), - GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 8L, 5) + getModItem("bartworks", "BW_GlasBlocks", 8L, 5) }, getOrDefault("Bedrockium", Materials.Neutronium).getMolten(288), CustomItemList.Machine_BuckConverter_UEV.get(1), @@ -1182,7 +1181,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get( OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Draconium, 4), - GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 16L, 5) + getModItem("bartworks", "BW_GlasBlocks", 16L, 5) }, getOrDefault("BlackPlutonium", Materials.Neutronium).getMolten(288), CustomItemList.Machine_BuckConverter_UIV.get(1), @@ -3730,7 +3729,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8L), ItemList.Sensor_UMV.get(16L), ItemList.Emitter_UMV.get(16L), - GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 16L) + getModItem("eternalsingularity", "eternal_singularity", 16L) }, new FluidStack[] { Materials.Neutronium.getMolten(32_768_000L), @@ -3789,15 +3788,15 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.CosmicNeutronium, 64L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 64L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 64L), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedstickLong", 64L, 39), - GT_ModHandler.getModItem("miscutils", "itemRodLongQuantum", 64L), - GT_ModHandler.getModItem("miscutils", "itemRodLongHypogen", 64L), - GT_ModHandler.getModItem("miscutils", "itemRodLongCelestialTungsten", 64L), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedstickLong", 64L, 10106), - GT_ModHandler.getModItem("miscutils", "itemRodLongAstralTitanium", 64L), + getModItem("bartworks", "gt.bwMetaGeneratedstickLong", 64L, 39), + getModItem("miscutils", "itemRodLongQuantum", 64L), + getModItem("miscutils", "itemRodLongHypogen", 64L), + getModItem("miscutils", "itemRodLongCelestialTungsten", 64L), + getModItem("bartworks", "gt.bwMetaGeneratedstickLong", 64L, 10106), + getModItem("miscutils", "itemRodLongAstralTitanium", 64L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SuperconductorUMVBase, 64L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Sunnarium, 64L), - GT_ModHandler.getModItem("miscutils", "itemRodLongAbyssalAlloy", 64L), + getModItem("miscutils", "itemRodLongAbyssalAlloy", 64L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TranscendentMetal, 64L), }, new FluidStack[] { @@ -3824,7 +3823,7 @@ public class DreamCraftRecipeLoader { 1, new Object[] { ItemList.Casing_Dim_Bridge.get(4), - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 16L, 12730), + getModItem("gregtech", "gt.blockmachines", 16L, 12730), getItemContainer("Hatch_Energy_UEV").get(4L), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 6), ItemList.Reactor_Coolant_Sp_6.get(1L), @@ -3833,12 +3832,12 @@ public class DreamCraftRecipeLoader { ItemList.Reactor_Coolant_Sp_6.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Nano, 20), ItemList.Field_Generator_UEV.get(4), - GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 4L), - GT_ModHandler.getModItem("miscutils", "MU-metaitem.01", 1L, 32105), + getModItem("eternalsingularity", "eternal_singularity", 4L), + getModItem("miscutils", "MU-metaitem.01", 1L, 32105), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 64L), ItemList.Electric_Pump_UEV.get(4), ItemList.ZPM3.get(1), - GT_ModHandler.getModItem("IC2", "blockMachine2", 1, 0) + getModItem("IC2", "blockMachine2", 1, 0) }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("oganesson"), 128000), @@ -3861,9 +3860,9 @@ public class DreamCraftRecipeLoader { ItemList.Casing_Dim_Trans.get(1), ItemList.MicroTransmitter_UV.get(1), new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 2L}, - GT_ModHandler.getModItem("Avaritia", "Singularity", 2L, 0), + getModItem("Avaritia", "Singularity", 2L, 0), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 6), - GT_ModHandler.getModItem("dreamcraft", "item.PicoWafer", 2, 0), + getModItem("dreamcraft", "item.PicoWafer", 2, 0), ItemList.Field_Generator_UHV.get(1L) }, new FluidStack[] { @@ -3887,12 +3886,12 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Ledox, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CallistoIce, 1), ItemList.Reactor_Coolant_Sp_6.get(1L), - GT_ModHandler.getModItem("miscutils", "itemScrewLaurenium", 12, 0), + getModItem("miscutils", "itemScrewLaurenium", 12, 0), new Object[] {OrePrefixes.circuit.get(Materials.Elite), 2L}, GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 2), ItemList.Super_Chest_IV.get(1), ItemList.Super_Tank_IV.get(1), - GT_ModHandler.getModItem("dreamcraft", "item.PicoWafer", 1, 0), + getModItem("dreamcraft", "item.PicoWafer", 1, 0), }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("oganesson"), 1000), @@ -3905,14 +3904,14 @@ public class DreamCraftRecipeLoader { // Dimensionally Transcendent Casing. TT_recipeAdder.addResearchableAssemblylineRecipe( - GT_ModHandler.getModItem("Avaritia", "Singularity", 1L, 0), + getModItem("Avaritia", "Singularity", 1L, 0), 2_000_000, 2048, 32_000_000, 1, new Object[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 6), - GT_ModHandler.getModItem("miscutils", "itemScrewLaurenium", 12, 0), + getModItem("miscutils", "itemScrewLaurenium", 12, 0), ItemList.Reactor_Coolant_Sp_6.get(1L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 1), }, @@ -3929,20 +3928,20 @@ public class DreamCraftRecipeLoader { Fluid oganesson = FluidRegistry.getFluid("oganesson"); // Deep Dark Portal TT_recipeAdder.addResearchableAssemblylineRecipe( - GT_ModHandler.getModItem("dreamcraft", "item.HeavyDutyPlateTier8", 1, 0), + getModItem("dreamcraft", "item.HeavyDutyPlateTier8", 1, 0), 16_777_216, 2048, 2_000_000, 64, new Object[] { - GT_ModHandler.getModItem("ExtraUtilities", "cobblestone_compressed", 1, 7), - GT_ModHandler.getModItem("IC2", "blockMachine2", 1, 0), + getModItem("ExtraUtilities", "cobblestone_compressed", 1, 7), + getModItem("IC2", "blockMachine2", 1, 0), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L), new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 1}, new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 1}, new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 1}, new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 1}, - GT_ModHandler.getModItem("dreamcraft", "item.PicoWafer", 32, 0), + getModItem("dreamcraft", "item.PicoWafer", 32, 0), ItemList.Robot_Arm_UMV.get(4), ItemList.Emitter_UMV.get(4), ItemList.Sensor_UMV.get(4), @@ -4124,42 +4123,42 @@ public class DreamCraftRecipeLoader { // Draconic Evolution Fusion Crafter Controller if (Loader.isModLoaded("AWWayofTime") && Loader.isModLoaded("EMT")) { TT_recipeAdder.addResearchableAssemblylineRecipe( - GT_ModHandler.getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 8), + getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 8), 16_777_216, 1024, 2_000_000, 8, new Object[] { - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 10783), - GT_ModHandler.getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 8), + getModItem("gregtech", "gt.blockmachines", 1, 10783), + getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 8), GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsBotania.GaiaSpirit, 1L), ItemList.Casing_Coil_AwakenedDraconium.get(8L), ItemList.Electric_Motor_UHV.get(8L), ItemList.Robot_Arm_UHV.get(4L), new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4}, ItemList.Gravistar.get(4, new Object() {}), - GT_ModHandler.getModItem("Thaumcraft", "ItemEldritchObject", 1, 3), - GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 8, 29), - GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 8, 28), + getModItem("Thaumcraft", "ItemEldritchObject", 1, 3), + getModItem("AWWayofTime", "bloodMagicBaseItems", 8, 29), + getModItem("AWWayofTime", "bloodMagicBaseItems", 8, 28), }, new FluidStack[] { new FluidStack(solderIndalloy, 2880), Materials.Void.getMolten(2880L), Materials.DraconiumAwakened.getMolten(1440), }, - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 5001), + getModItem("gregtech", "gt.blockmachines", 1, 5001), 1500, 8_000_000); if (Loader.isModLoaded("DraconicEvolution")) { // DE Schematics Cores Tier 1 TT_recipeAdder.addResearchableAssemblylineRecipe( - GT_ModHandler.getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 9), + getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 9), 5_000_000, 512, 1_000_000, 4, new Object[] { - GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0), + getModItem("DraconicEvolution", "draconicCore", 1, 0), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1L), new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1}, @@ -4167,19 +4166,19 @@ public class DreamCraftRecipeLoader { new FluidStack[] { Materials.Sunnarium.getMolten(14400L), Materials.Void.getMolten(28800L), }, - GT_ModHandler.getModItem("EMT", "EMTItems", 1, 16), + getModItem("EMT", "EMTItems", 1, 16), 6000, 500_000); // DE Schematics Cores Tier 2 TT_recipeAdder.addResearchableAssemblylineRecipe( - GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0), + getModItem("DraconicEvolution", "draconicCore", 1, 0), 10_000_000, 1024, 4_000_000, 8, new Object[] { - GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 4, 0), + getModItem("DraconicEvolution", "draconicCore", 4, 0), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 1L), new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1}, @@ -4187,19 +4186,19 @@ public class DreamCraftRecipeLoader { new FluidStack[] { Materials.Neutronium.getMolten(14400L), Materials.Void.getMolten(57600L), }, - GT_ModHandler.getModItem("EMT", "EMTItems", 1, 17), + getModItem("EMT", "EMTItems", 1, 17), 12000, 2_000_000); // DE Schematics Cores Tier 3 TT_recipeAdder.addResearchableAssemblylineRecipe( - GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 1, 0), + getModItem("DraconicEvolution", "wyvernCore", 1, 0), 20_000_000, 2048, 16_000_000, 16, new Object[] { - GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 4, 0), + getModItem("DraconicEvolution", "wyvernCore", 4, 0), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 1L), new Object[] {OrePrefixes.circuit.get(Materials.Nano), 1}, @@ -4207,18 +4206,18 @@ public class DreamCraftRecipeLoader { new FluidStack[] { Materials.Infinity.getMolten(14400L), Materials.Void.getMolten(115200L), }, - GT_ModHandler.getModItem("EMT", "EMTItems", 1, 18), + getModItem("EMT", "EMTItems", 1, 18), 24000, 8_000_000); // DE Schematics Cores Tier 4 TT_recipeAdder.addResearchableAssemblylineRecipe( - GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 1, 0), + getModItem("DraconicEvolution", "awakenedCore", 1, 0), 40_000_000, 4096, 64_000_000, 64, new Object[] { - GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 8, 0), + getModItem("DraconicEvolution", "awakenedCore", 8, 0), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 4L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 1L), new Object[] {OrePrefixes.circuit.get(Materials.Piko), 1}, @@ -4226,7 +4225,7 @@ public class DreamCraftRecipeLoader { new FluidStack[] { Materials.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L), }, - GT_ModHandler.getModItem("EMT", "EMTItems", 1, 19), + getModItem("EMT", "EMTItems", 1, 19), 36000, 32_000_000); } @@ -5526,10 +5525,10 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TranscendentMetal, 16L), ItemList.Gravistar.get(32L), new Object[] {OrePrefixes.circuit.get(Materials.Nano), 4L}, - GT_ModHandler.getModItem("miscutils", "itemFoilArceusAlloy2B", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFoilLafiumCompound", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFoilCinobiteA243", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFoilPikyonium64B", 64, 0), + getModItem("miscutils", "itemFoilArceusAlloy2B", 64, 0), + getModItem("miscutils", "itemFoilLafiumCompound", 64, 0), + getModItem("miscutils", "itemFoilCinobiteA243", 64, 0), + getModItem("miscutils", "itemFoilPikyonium64B", 64, 0), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 7L) }, new FluidStack[] {fluid_0, fluid_1}, @@ -5553,10 +5552,10 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 8L), ItemList.Gravistar.get(32), new Object[] {OrePrefixes.circuit.get(Materials.Nano), 4L}, - GT_ModHandler.getModItem("miscutils", "itemFoilArceusAlloy2B", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFoilLafiumCompound", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFoilCinobiteA243", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFoilPikyonium64B", 64, 0), + getModItem("miscutils", "itemFoilArceusAlloy2B", 64, 0), + getModItem("miscutils", "itemFoilLafiumCompound", 64, 0), + getModItem("miscutils", "itemFoilCinobiteA243", 64, 0), + getModItem("miscutils", "itemFoilPikyonium64B", 64, 0), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 7L) }, new FluidStack[] {fluid_0, fluid_1}, @@ -5639,14 +5638,14 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SpaceTime, 16L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.SpaceTime, 8L), GT_OreDictUnificator.get(OrePrefixes.round, Materials.SpaceTime, 32L), - GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 2L) }, new FluidStack[] {fluid_0, fluid_1, fluid_2, fluid_3}, @@ -5769,10 +5768,10 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SpaceTime, 16L), ItemList.Gravistar.get(64), new Object[] {OrePrefixes.circuit.get(Materials.Piko), 4L}, - GT_ModHandler.getModItem("miscutils", "itemFoilCelestialTungsten", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFoilQuantum", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFoilAstralTitanium", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFoilTitansteel", 64, 0), + getModItem("miscutils", "itemFoilCelestialTungsten", 64, 0), + getModItem("miscutils", "itemFoilQuantum", 64, 0), + getModItem("miscutils", "itemFoilAstralTitanium", 64, 0), + getModItem("miscutils", "itemFoilTitansteel", 64, 0), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 7L) }, new FluidStack[] {fluid_0, fluid_1, fluid_2}, @@ -5796,10 +5795,10 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 8L), ItemList.Gravistar.get(64), new Object[] {OrePrefixes.circuit.get(Materials.Piko), 4L}, - GT_ModHandler.getModItem("miscutils", "itemFoilCelestialTungsten", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFoilQuantum", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFoilAstralTitanium", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFoilTitansteel", 64, 0), + getModItem("miscutils", "itemFoilCelestialTungsten", 64, 0), + getModItem("miscutils", "itemFoilQuantum", 64, 0), + getModItem("miscutils", "itemFoilAstralTitanium", 64, 0), + getModItem("miscutils", "itemFoilTitansteel", 64, 0), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 7L) }, new FluidStack[] {fluid_0, fluid_1, fluid_2}, @@ -5823,14 +5822,14 @@ public class DreamCraftRecipeLoader { ItemList.Gravistar.get(32L), ItemList.Emitter_UMV.get(4L), new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 4}, - GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), - GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), + getModItem("miscutils", "itemFineWireHypogen", 64, 0), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8L) }, new FluidStack[] {fluid_0, fluid_1, fluid_2}, @@ -5955,7 +5954,7 @@ public class DreamCraftRecipeLoader { research_amperage, new Object[] { energy_hatches[i], - GT_ModHandler.getModItem("GoodGenerator", "compactFusionCoil", 1), + getModItem("GoodGenerator", "compactFusionCoil", 1), ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1), CustomItemList.eM_Power.get(2), @@ -5982,7 +5981,7 @@ public class DreamCraftRecipeLoader { research_amperage, new Object[] { dynamo_hatches[i], - GT_ModHandler.getModItem("GoodGenerator", "compactFusionCoil", 1), + getModItem("GoodGenerator", "compactFusionCoil", 1), ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1), CustomItemList.eM_Power.get(2), @@ -5996,6 +5995,234 @@ public class DreamCraftRecipeLoader { recipe_duration_ticks, recipe_eu_per_tick); } + + TT_recipeAdder.addResearchableAssemblylineRecipe( + getModItem("bartworks", "gt.bwMetaGeneratedplateDense", 1, 10111), + 256_000_000, // total comp + 16_384, // comp/s + 2_000_000_000, // eu/t + 32, // amperage + new Object[] { + getModItem("bartworks", "gt.bwMetaGeneratedplateDense", 6, 10111), + getModItem("bartworks", "gt.bwMetaGeneratedscrew", 24, 10111), + getModItem("GraviSuite", "itemSimpleItem", 64, 3), // gravi engine + getModItem("bartworks", "gt.bwMetaGeneratedfoil", 64, 10112), + getModItem("miscutils", "itemGearHypogen", 16, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.SpaceTime, 16L), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TranscendentMetal, 16L), // 1234 + getModItem("eternalsingularity", "eternal_singularity", 16L), + getItemContainer("PikoCircuit").get(16L), + getModItem("GoodGenerator", "huiCircuit", 4, 4), + ItemList.ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 16L), + ItemList.EnergisedTesseract.get(4), + getModItem("dreamcraft", "item.ChromaticLens", 4) + }, + new FluidStack[] {Materials.Time.getFluid(1440)}, + CustomItemList.EOH_Temporal_Boundary_Casing.get(1), + 10000, + (int) Tier.RECIPE_UXV); + + { + final ItemStack ME_Singularity = + getModItem("extracells", "storage.physical.advanced.singularity", 1); // ME Digital singularity. + + int set; + int tier; + int absoluteTier; + { + tier = 1; + set = 1; + absoluteTier = (set - 1) + tier; + + TT_recipeAdder.addResearchableAssemblylineRecipe( + getModItem("GoodGenerator", "yottaFluidTankCells", 1, 7), + set * 128_000_000, // total comp + set * 8_192, // comp/s + 2_000_000_000, // eu/t + set * 16, // amperage + new Object[] { + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 1 * set, 10), // Spacetime ripper + ME_Singularity, + getModItem("bartworks", "gt.bwMetaGeneratedplateDense", absoluteTier * 2, 10112), + getModItem("gregtech", "gt.metaitem.01", set, 32429) + }, + new FluidStack[] { + FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier - 1))), + FluidUtils.getFluidStack("molten.shirabon", (int) (1_440 * pow(2L, absoluteTier - 1))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier - 1))), + }, + CustomItemList.SpacetimeCompressionFieldGeneratorTier0.get(1), + set * 16_000 * 20, + (int) Tier.RECIPE_UXV); + + tier++; + absoluteTier = (set - 1) + tier; + TT_recipeAdder.addResearchableAssemblylineRecipe( + CustomItemList.SpacetimeCompressionFieldGeneratorTier0.get(1), + set * 128_000_000, // total comp + set * 8_192, // comp/s + 2_000_000_000, // eu/t + set * 16, // amperage + new Object[] { + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 1 * set, 10), // Spacetime ripper + ME_Singularity, + ME_Singularity, + getModItem("bartworks", "gt.bwMetaGeneratedplateDense", absoluteTier * 2, 10112), + getModItem("gregtech", "gt.metaitem.01", set, 32429) + }, + new FluidStack[] { + FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier - 1))), + FluidUtils.getFluidStack("molten.shirabon", (int) (1_440 * pow(2L, absoluteTier - 1))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier - 1))), + }, + CustomItemList.SpacetimeCompressionFieldGeneratorTier1.get(1), + set * 16_000 * 20, + (int) Tier.RECIPE_UXV); + + tier++; + absoluteTier = (set - 1) + tier; + TT_recipeAdder.addResearchableAssemblylineRecipe( + CustomItemList.SpacetimeCompressionFieldGeneratorTier1.get(1), + set * 128_000_000, // total comp + set * 8_192, // comp/s + 2_000_000_000, // eu/t + set * 16, // amperage + new Object[] { + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 1 * set, 10), // Spacetime ripper + ME_Singularity, + ME_Singularity, + ME_Singularity, + getModItem("bartworks", "gt.bwMetaGeneratedplateDense", absoluteTier * 2, 10112), + getModItem("gregtech", "gt.metaitem.01", set, 32429) + }, + new FluidStack[] { + FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier - 1))), + FluidUtils.getFluidStack("molten.shirabon", (int) (1_440 * pow(2L, absoluteTier - 1))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier - 1))), + }, + CustomItemList.SpacetimeCompressionFieldGeneratorTier2.get(1), + set * 16_000 * 20, + (int) Tier.RECIPE_UXV); + } + + { + tier = 1; + set = 2; + absoluteTier = (set - 1) + tier; + TT_recipeAdder.addResearchableAssemblylineRecipe( + CustomItemList.SpacetimeCompressionFieldGeneratorTier2.get(1), + set * 128_000_000, // total comp + set * 8_192, // comp/s + 2_000_000_000, // eu/t + set * 16, // amperage + new Object[] { + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 1 * set, 10), // Spacetime ripper + ME_Singularity, + ME_Singularity, + ME_Singularity, + ME_Singularity, + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.WhiteDwarfMatter, absoluteTier * 2), + getModItem("gregtech", "gt.metaitem.01", set, 32429) + }, + new FluidStack[] { + FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier - 1))), + Materials.WhiteDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier - 1))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier - 1))), + }, + CustomItemList.SpacetimeCompressionFieldGeneratorTier3.get(1), + set * 16_000 * 20, + (int) Tier.RECIPE_UXV); + + tier++; + absoluteTier = (set - 1) + tier; + TT_recipeAdder.addResearchableAssemblylineRecipe( + CustomItemList.SpacetimeCompressionFieldGeneratorTier3.get(1), + set * 128_000_000, // total comp + set * 8_192, // comp/s + 2_000_000_000, // eu/t + set * 16, // amperage + new Object[] { + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 1 * set, 10), // Spacetime ripper + ME_Singularity, + ME_Singularity, + ME_Singularity, + ME_Singularity, + ME_Singularity, + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.WhiteDwarfMatter, absoluteTier * 2), + getModItem("gregtech", "gt.metaitem.01", set, 32429) + }, + new FluidStack[] { + FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier - 1))), + Materials.WhiteDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier - 1))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier - 1))), + }, + CustomItemList.SpacetimeCompressionFieldGeneratorTier4.get(1), + set * 16_000 * 20, + (int) Tier.RECIPE_UXV); + + tier++; + absoluteTier = (set - 1) + tier; + TT_recipeAdder.addResearchableAssemblylineRecipe( + CustomItemList.SpacetimeCompressionFieldGeneratorTier4.get(1), + set * 128_000_000, // total comp + set * 8_192, // comp/s + 2_000_000_000, // eu/t + set * 16, // amperage + new Object[] { + getModItem("GoodGenerator", "yottaFluidTankCells", tier * 2, (6 + set)), + ItemList.Quantum_Tank_IV.get(pow(2L, set - 1) * 16), // quantum tank V (max tier) + getModItem("avaritiaddons", "InfinityChest", 4 * pow(2, set)), // Inf chest + getModItem("miscutils", "gtplusplus.blockcasings.5", 1 * set, 10), // Spacetime ripper + ME_Singularity, + ME_Singularity, + ME_Singularity, + ME_Singularity, + ME_Singularity, + ME_Singularity, + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.WhiteDwarfMatter, absoluteTier * 2), + getModItem("gregtech", "gt.metaitem.01", set, 32429) + }, + new FluidStack[] { + FluidUtils.getFluidStack("space", (int) (2_880 * pow(2L, absoluteTier - 1))), + Materials.WhiteDwarfMatter.getMolten((int) (1_440 * pow(2L, absoluteTier - 1))), + new FluidStack(solderUEV, (int) (1_440 * pow(2L, absoluteTier - 1))), + }, + CustomItemList.SpacetimeCompressionFieldGeneratorTier5.get(1), + set * 16_000 * 20, + (int) Tier.RECIPE_UXV); + } + } + + // <miscutils:gtplusplus.blockcasings.5:10> // Spacetime ripper block + // <bartworks:gt.bwMetaGeneratedplateDense:10112> // Dense shirabon + // <GoodGenerator:yottaFluidTankCells:9> T10 Fluid cell block + // <GoodGenerator:compactFusionCoil:1> compact 0 + // <GoodGenerator:compactFusionCoil:2> compact 1 + // <GoodGenerator:compactFusionCoil:3> compact 2 + // <gregtech:gt.metaitem.01:32429> black body naquadria supersolid + // <gregtech:gt.blockmachines:11107> ultimate time anomaly + // <eternalsingularity:combined_singularity:15> time singularity + // <extracells:storage.physical.advanced.singularity>.withTag({}) ME singularity cell + // <eternalsingularity:combined_singularity:5> Historic singularity + // <gregtech:gt.blockmachines:12739> Void miner 3 + // <eternalsingularity:combined_singularity:1> Psychotic Singularity + // <avaritiaddons:InfinityChest> Infinity chest } private void register_machine_EM_behaviours() { diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java index a7b3b51b7c..81c6119136 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java @@ -2449,15 +2449,6 @@ public class BloodyRecipeLoader { 300, 2); - // endregion - - // ha trafos - // if(Loader.isModLoaded(Reference.GTPLUSPLUS)){ - // GT_Values.RA.addAssemblerRecipe(CustomItemList.HA) - // } - - // power trafos - // GT_Values.RA.addAssemblerRecipe() register_machine_EM_behaviours(); } diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java index c1e19170cc..b817de7639 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java @@ -29,6 +29,11 @@ public class ThingsLoader implements Runnable { if (Textures.BlockIcons.casingTexturePages[tectechTexturePage1] == null) { Textures.BlockIcons.casingTexturePages[tectechTexturePage1] = new ITexture[128]; } + + if (Textures.BlockIcons.casingTexturePages[7] == null) { + Textures.BlockIcons.casingTexturePages[7] = new ITexture[128]; + } + TecTech.LOGGER.info("Added texture page if was null"); if (!Loader.isModLoaded(Reference.DREAMCRAFT)) { TT_Container_Casings.sBlockCasingsNH = new GT_Block_CasingsNH(); diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java index 65f5a0d4a8..5f5a73c71c 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java @@ -127,7 +127,7 @@ public class EyeOfHarmonyRecipe { // Add a bonus fluid of compressed star matter. // todo replace with Bonus star matter when added to GT5. - fluidStackArrayList.add(Materials.Infinity.getMolten((this.spacetimeCasingTierRequired + 1) * 100_000)); + fluidStackArrayList.add(Materials.RawStarMatter.getFluid((this.spacetimeCasingTierRequired + 1) * 100_000)); outputFluids = fluidStackArrayList; // End fluid processing. diff --git a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java index 41f3199a8d..32e62ce335 100644 --- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java +++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java @@ -307,8 +307,8 @@ public enum CustomItemList implements IItemContainer { tM_TeslaBase, tM_TeslaToroid, - EOH_INNER, - EOH_OUTER, + EOH_Temporal_Boundary_Casing, + EOH_Reinforced_Spacetime_Casing, EOH_INFINITE, tM_TeslaSecondary, tM_TeslaPrimary_0, diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java index 15aeabda4c..8591ca22b4 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java @@ -86,8 +86,8 @@ public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract { CustomItemList.tM_TeslaToroid.set(new ItemStack(this, 1, 7)); CustomItemList.tM_TeslaSecondary.set(new ItemStack(this, 1, 8)); - CustomItemList.EOH_INNER.set(new ItemStack(this, 1, 10)); - CustomItemList.EOH_OUTER.set(new ItemStack(this, 1, 11)); + CustomItemList.EOH_Temporal_Boundary_Casing.set(new ItemStack(this, 1, 10)); + CustomItemList.EOH_Reinforced_Spacetime_Casing.set(new ItemStack(this, 1, 11)); CustomItemList.EOH_INFINITE.set(new ItemStack(this, 1, 12)); } diff --git a/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java index 4cd4209a5b..3dbc4b7477 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java @@ -1,6 +1,5 @@ package com.github.technus.tectech.thing.casing; -import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.util.CommonValues.EOH_TIER_FANCY_NAMES; import static net.minecraft.util.EnumChatFormatting.*; @@ -33,7 +32,7 @@ public class SpacetimeCompressionFieldCasing extends GT_Block_Casings_Abstract { private static IIcon textureTier8; private static final int MAX_BLOCK_TIER = 9; - private static final byte START_INDEX = 48; + private static final byte START_INDEX = 16; public SpacetimeCompressionFieldCasing() { super( @@ -41,8 +40,7 @@ public class SpacetimeCompressionFieldCasing extends GT_Block_Casings_Abstract { "gt.spacetime_compression_field_generator", GT_Material_Casings.INSTANCE); for (byte b = 0; b < 16; b = (byte) (b + 1)) { - Textures.BlockIcons.casingTexturePages[texturePage][b + START_INDEX] = - new GT_CopiedBlockTexture(this, 6, b); + Textures.BlockIcons.casingTexturePages[7][b + START_INDEX] = new GT_CopiedBlockTexture(this, 6, b); } for (int i = 0; i < MAX_BLOCK_TIER; i++) { diff --git a/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java index b6ac7fc9bd..4b5af29857 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java @@ -1,6 +1,5 @@ package com.github.technus.tectech.thing.casing; -import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.util.CommonValues.EOH_TIER_FANCY_NAMES; import static net.minecraft.util.EnumChatFormatting.*; @@ -38,8 +37,7 @@ public class StabilisationFieldCasing extends GT_Block_Casings_Abstract { public StabilisationFieldCasing() { super(GT_Item_Casings_Stabilisation.class, "gt.stabilisation_field_generator", GT_Material_Casings.INSTANCE); for (byte b = 0; b < 16; b = (byte) (b + 1)) { - Textures.BlockIcons.casingTexturePages[texturePage][b + START_INDEX] = - new GT_CopiedBlockTexture(this, 6, b); + Textures.BlockIcons.casingTexturePages[7][b + START_INDEX] = new GT_CopiedBlockTexture(this, 6, b); } for (int i = 0; i < MAX_BLOCK_TIER; i++) { diff --git a/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java index 3141149199..204c9f9ae0 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java @@ -1,6 +1,5 @@ package com.github.technus.tectech.thing.casing; -import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.util.CommonValues.EOH_TIER_FANCY_NAMES; import static net.minecraft.util.EnumChatFormatting.*; @@ -33,7 +32,7 @@ public class TimeAccelerationFieldCasing extends GT_Block_Casings_Abstract { private static IIcon textureTier8; private static final int MAX_BLOCK_TIER = 9; - private static final byte START_INDEX = 64; + private static final byte START_INDEX = 48; public TimeAccelerationFieldCasing() { super( @@ -41,8 +40,7 @@ public class TimeAccelerationFieldCasing extends GT_Block_Casings_Abstract { "gt.time_acceleration_field_generator", GT_Material_Casings.INSTANCE); for (byte b = 0; b < 16; b = (byte) (b + 1)) { - Textures.BlockIcons.casingTexturePages[texturePage][b + START_INDEX] = - new GT_CopiedBlockTexture(this, 6, b); + Textures.BlockIcons.casingTexturePages[7][b + START_INDEX] = new GT_CopiedBlockTexture(this, 6, b); } for (int i = 0; i < MAX_BLOCK_TIER; i++) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index 4dfc0d3e42..cc86aee26c 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -1679,13 +1679,13 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl updateSlots(); - createRenderBlock(); + createRenderBlock(currentRecipe); recipeRunning = true; return true; } - private void createRenderBlock() { + private void createRenderBlock(final EyeOfHarmonyRecipe currentRecipe) { IGregTechTileEntity gregTechTileEntity = this.getBaseMetaTileEntity(); |