From d9f473283fa606662f57bbafdd49be37728b0eb0 Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Wed, 25 Jan 2023 05:22:14 +0000 Subject: EOH materials + Allow materials to pick their processing tier (#1671) * Begin addition of tiered material manipulation * Dwarf matter * Add hardcoded EU tiers for wider usage. * New material images etc * Nugget processing tiers * Move iron nugget to wrought iron smelting to the correct place * Add white dwarf shapes * Add white dwarf shapes * Additional retiering options for EU consumption on material part generation * White dwarf matter complete * Tier neutronium processing at ZPM * Spotless * More adjustments * Renaming files * Add new overlays for magneto material and more name adjustments * Add no recipes subtag * Spotless + name adjustment * Undo isCustom to maintain potential public variable references in addons. * Undo isCustom to maintain potential public variable references in addons. * Fix fluid registry corruption. * Add rotor EU override * Add rotor EU override * Make neutronium mass more reasonable * Add proper time adjustments to rotor (probably an old oversight) * Adjust enums to use VP rather than recalculate * Fix typos on EU usage * spotlessApply (#1672) Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Change setProcessingMaterialTierEU to accept long. * Small fix * Add space and time materials * Add new forge hammer support * Update tooltip * Expand laser engraver slots. * spotlessApply (#1673) Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Reserve texture page. * Modernise GT circuit usage * Add oversight in assembler frame recipe * Add missing MHDCSM overlay textures * Remove small and tiny MHDCSM dusts * Fix error in ingot texture * Fix NO_RECIPES not applying to frame boxes * Restore missing ingot * Add rod handles for materials * Fix frame box auto generating with NO_RECIPEs tag * recipe * Spotless * Add MOD_ID_GTPP as modid * spotlessApply (#1675) Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Remove smelting spacetime from furnace (why does this exist?) * Recipes + new storage blocks for materials * Bedrockium LuV -> EV * SpaceTime UMV -> UIV * TranscendentMetal UIV -> UEV * MagnetoThingy and dward mats UXV -> UMV * update buildscript * yeet magic number that could be * spotlessApply * Make the nanite tier 3, colen request * Up nanite tier * Comment * Change name * Change name Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: adam riondy Co-authored-by: boubou19 --- .../preload/GT_Loader_Item_Block_And_Fluid.java | 30 +++++++++++++++++++++- .../preload/GT_Loader_MetaTileEntities.java | 1 - .../java/gregtech/loaders/preload/GT_PreLoad.java | 3 ++- 3 files changed, 31 insertions(+), 3 deletions(-) (limited to 'src/main/java/gregtech/loaders/preload') diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 7acdfc6935..37640192b1 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -724,7 +724,9 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { MaterialsKevlar.NickelAluminide, Materials.SpaceTime, Materials.TranscendentMetal, - Materials.Oriharukon + Materials.Oriharukon, + Materials.WhiteDwarfMatter, + Materials.BlackDwarfMatter }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS12); @@ -1255,6 +1257,31 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTEC, 1L), ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder(Materials.RawStarMatter.mName) + .withLocalizedName(Materials.RawStarMatter.mLocalizedName) + .withStateAndTemperature(LIQUID, 10_000_000) + .buildAndRegister() + .configureMaterials(Materials.RawStarMatter) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.RawStarMatter, 1L), + ItemList.Cell_Empty.get(1L)); + + GT_FluidFactory.builder(Materials.Space.mName) + .withLocalizedName(Materials.Space.mLocalizedName) + .withStateAndTemperature(MOLTEN, 0) + .buildAndRegister() + .configureMaterials(Materials.Space) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Space, 1L), ItemList.Cell_Empty.get(1L)); + + GT_FluidFactory.builder(Materials.Time.mName) + .withLocalizedName(Materials.Time.mLocalizedName) + .withStateAndTemperature(MOLTEN, 0) + .buildAndRegister() + .configureMaterials(Materials.Time) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Time, 1L), ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("fieryblood") .withLocalizedName("Fiery Blood") .withStateAndTemperature(LIQUID, 6400) @@ -1263,6 +1290,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { .registerBContainers( GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FierySteel, 1L), ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("holywater") .withLocalizedName("Holy Water") .withStateAndTemperature(LIQUID, 295) diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 50976ab037..0af16057bd 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -1267,7 +1267,6 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 'P', ItemList.Electric_Pump_MV }); - // 1234 ItemList.Hatch_Energy_ULV.set( new GT_MetaTileEntity_Hatch_Energy(40, "hatch.energy.tier.00", "ULV Energy Hatch", 0).getStackForm(1L)); diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java index 0056a5b866..4b9b5d1493 100644 --- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java @@ -2,6 +2,7 @@ package gregtech.loaders.preload; import static gregtech.GT_Mod.GT_FML_LOGGER; import static gregtech.api.enums.GT_Values.MOD_ID_AE; +import static gregtech.api.enums.GT_Values.MOD_ID_GTPP; import cpw.mods.fml.common.LoadController; import cpw.mods.fml.common.Loader; @@ -117,7 +118,7 @@ public class GT_PreLoad { public static void initCompat() { GregTech_API.mIC2Classic = Loader.isModLoaded("IC2-Classic-Spmod"); - GregTech_API.mGTPlusPlus = Loader.isModLoaded("miscutils"); + GregTech_API.mGTPlusPlus = Loader.isModLoaded(MOD_ID_GTPP); GregTech_API.mTranslocator = Loader.isModLoaded("Translocator"); GregTech_API.mTConstruct = Loader.isModLoaded("TConstruct"); GregTech_API.mGalacticraft = Loader.isModLoaded("GalacticraftCore"); -- cgit