diff options
| author | GDCloud <93287602+GDCloudstrike@users.noreply.github.com> | 2023-04-21 19:09:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-21 19:09:47 +0200 |
| commit | 285a75535d07f2037967b1208a5840fb81719514 (patch) | |
| tree | 4e5fee76309ae7f184479306e452b8ce82491bca /src/main | |
| parent | 28edf90a21fb9e281ce06c8d77ab4b05a818eaf8 (diff) | |
| download | GT5-Unofficial-285a75535d07f2037967b1208a5840fb81719514.tar.gz GT5-Unofficial-285a75535d07f2037967b1208a5840fb81719514.tar.bz2 GT5-Unofficial-285a75535d07f2037967b1208a5840fb81719514.zip | |
Stellar catalyst + catalyst fixes + new materials class (#1893)
* add catalyst
* pu plasma recipe
* increase plasma mixer input slots
* noOptimize + mixer recipe + voltage fix
* noOptimize + PLE recipe
* TPM recipe
* spotlessApply (#1894)
Co-authored-by: GitHub GTNH Actions <>
* add two more plasma recipes
* replace neptunium & fermium plasma
* spotless
* fix stellar plasma amount
* new materials class
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main')
26 files changed, 797 insertions, 224 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 84de010e3f..60bcb7a867 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -889,32 +889,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials SuperCoolant = new MaterialBuilder( 140, TextureSet.SET_DULL,"Super Coolant").setRGB(2, 91, 111).addCell().addFluid().constructMaterial().setLiquidTemperature(1); - public static Materials DimensionallyTranscendentCrudeCatalyst = new Materials( 748, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 10, 20, 20, 1, "DimensionallyTranscendentCrudeCatalyst" , "Dimensionally Transcendent Crude Catalyst" , 0, 0, 25_000_000, 1, false, true, 1, 1, 1, Dyes.dyeCyan).setHasCorrespondingFluid(true); - public static Materials DimensionallyTranscendentProsaicCatalyst = new Materials( 747, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 10, 20, 20, 1, "DimensionallyTranscendentProsaicCatalyst" , "Dimensionally Transcendent Prosaic Catalyst" , 0, 0, 50_000_000, 1, false, true, 1, 1, 1, Dyes.dyeGreen).setHasCorrespondingFluid(true); - public static Materials DimensionallyTranscendentResplendentCatalyst = new Materials( 746, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 10, 20, 20, 1, "DimensionallyTranscendentResplendentCatalyst" , "Dimensionally Transcendent Resplendent Catalyst" , 0, 0, 75_000_000, 1, false, true, 1, 1, 1, Dyes.dyeLime).setHasCorrespondingFluid(true); - public static Materials DimensionallyTranscendentExoticCatalyst = new Materials( 745, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 10, 20, 20, 1, "DimensionallyTranscendentExoticCatalyst" , "Dimensionally Transcendent Exotic Catalyst" , 0, 0, 100_000_000, 1, false, true, 1, 1, 1, Dyes.dyeMagenta).setHasCorrespondingFluid(true); - - public static Materials ExcitedDTCC = new Materials( 109, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 10, 20, 20, 1, "ExcitedDTCC" , "Excited Dimensionally Transcendent Crude Catalyst" , -1, -1, 500000000, 1, false, true, 1, 1, 1, Dyes.dyeCyan); - public static Materials ExcitedDTPC = new Materials( 113, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 35, 59, 41, 1, "ExcitedDTPC" , "Excited Dimensionally Transcendent Prosaic Catalyst" , -1, -1, 500000000, 1, false, true, 1, 1, 1, Dyes.dyeGreen); - public static Materials ExcitedDTRC = new Materials( 121, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 38, 20, 56, 1, "ExcitedDTRC" , "Excited Dimensionally Transcendent Resplendent Catalyst" , -1, -1, 500000000, 1, false, true, 1, 1, 1, Dyes.dyeLime); - public static Materials ExcitedDTEC = new Materials( 126, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 240, 240, 41, 1, "ExcitedDTEC" , "Excited Dimensionally Transcendent Exotic Catalyst" , -1, -1, 500000000, 1, false, true, 1, 1, 1, Dyes.dyeMagenta); - - public static Materials DimensionallyTranscendentResidue = new Materials( 589, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 0, 0, 0, 1, "DimensionallyTranscendentResidue" , "Dimensionally Transcendent Residue" , -1, -1, 25, 1, false, true, 1, 1, 1, Dyes.dyeBlack); - - public static Materials SpaceTime = new Materials(588, new TextureSet("spacetime", true) , 320.0F, 4*2621440, 25, 1|2|64|128, 255, 255, 255, 0, "SpaceTime" , "SpaceTime" , -1, -1, 0, 0, false, true, 2, 1, 1, Dyes._NULL , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setProcessingMaterialTierEU(TierEU.RECIPE_UEV).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); - public static Materials TranscendentMetal = new Materials(581, TextureSet.SET_METALLIC , 290.0F, 3*2621440, 22, 1|2|64|128, 50, 50, 50,0, "TranscendentMetal" , "Transcendent Metal" , -1, -1, 0, 3000, true, true, 200, 1000, 1000, Dyes.dyeBlack , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe().setProcessingMaterialTierEU(TierEU.RECIPE_UHV); public static Materials EnrichedHolmium = new Materials(582, TextureSet.SET_METALLIC, 1.0F, 0, 2, 18, 100, 1|2|4|16, 255, 255, "EnrichedHolmium", "Enriched Holmium", -1, -1, 0, 3000, true, false, 200, 1, 1, Dyes.dyePurple); - public static Materials MagnetohydrodynamicallyConstrainedStarMatter = new Materials(583, new TextureSet("MagnetohydrodynamicallyConstrainedStarMatter", true) , 320.0F, 4*2621440, 25, 1|2|64|128, 255, 255, 255, 0, "MagnetohydrodynamicallyConstrainedStarMatter" , "Magnetohydrodynamically Constrained Star Matter" , -1, -1, 0, 0, false, true, 2, 1, 1, Dyes._NULL , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setProcessingMaterialTierEU(TierEU.RECIPE_UIV); - public static Materials RawStarMatter = new Materials(584, TextureSet.SET_FLUID, 1.0F, 0, 2, 16|32, 100, 1, 255, 255, "RawStarMatter", "Condensed Raw Stellar Plasma Mixture", -1, -1, 0, 0, false, false, 200, 1, 1, Dyes.dyePurple); - public static Materials WhiteDwarfMatter = new Materials(585, new TextureSet("WhiteDwarfMatter", true), 1.0F, 0, 2, 1|2|64|128, 255, 255, 255, 0, "WhiteDwarfMatter", "White Dwarf Matter", -1, -1, 0, 0, false, false, 200, 1, 1, Dyes.dyePurple).setHasCorrespondingFluid(true).setProcessingMaterialTierEU(TierEU.RECIPE_UEV).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); - public static Materials BlackDwarfMatter = new Materials(586, TextureSet.SET_METALLIC, 1.0F, 0, 2, 1|2|64|128, 0, 0, 0, 255, "BlackDwarfMatter", "Black Dwarf Matter", -1, -1, 0, 0, false, false, 200, 1, 1, Dyes.dyePurple).setHasCorrespondingFluid(true).setProcessingMaterialTierEU(TierEU.RECIPE_UEV).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe(); - - public static Materials Time = new Materials(587, TextureSet.SET_FLUID, 1.0F, 0, 2, 16|32, 100, 1, 255, 255, "temporalFluid", "Tachyon Rich Temporal Fluid", -1, -1, 0, 0, false, false, 200, 1, 1, Dyes.dyePurple); - public static Materials Space = new Materials(106, TextureSet.SET_FLUID, 1.0F, 0, 2, 16|32, 100, 1, 255, 255, "spatialFluid", "Spatially Enlarged Fluid", -1, -1, 0, 0, false, false, 200, 1, 1, Dyes.dyePurple); - - public static Materials Universium = new Materials(139, new TextureSet("universium", true), 1.0F,4*2621440, 25, 1|2|64|128, 38, 49, 69, 255, "Universium" , "Universium", -1, -1, 0, 0, false, true, 2, 1, 1, Dyes._NULL , Collections.singletonList(new TC_AspectStack(TC_Aspects.AQUA, 1))).setProcessingMaterialTierEU(TierEU.RECIPE_UMV); - // spotless:on static { @@ -929,6 +905,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { MaterialsOreAlum.init(); } + static { + MaterialsUEVplus.init(); + } + /** * Superconductor re-routed for mod compatibility. Circuits are re-routed into SuperconductorUHV as well. * <p> @@ -1887,8 +1867,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { NetherQuartz.mChemicalFormula = "SiO\u2082"; Quartzite.mChemicalFormula = "SiO\u2082"; CertusQuartz.mChemicalFormula = "SiO\u2082"; - SpaceTime.mChemicalFormula = "Reality itself distilled into physical form"; - Universium.mChemicalFormula = "A tear into the space beyond space"; + MaterialsUEVplus.SpaceTime.mChemicalFormula = "Reality itself distilled into physical form"; + MaterialsUEVplus.Universium.mChemicalFormula = "A tear into the space beyond space"; Longasssuperconductornameforuvwire.mChemicalFormula = "Nq*\u2084(Ir\u2083Os)\u2083EuSm"; Longasssuperconductornameforuhvwire.mChemicalFormula = "D\u2086(SpNt)\u2087Tn\u2085Am\u2086"; SuperconductorUEVBase.mChemicalFormula = "D*\u2085If*\u2085(✦◆✦)(⚷⚙⚷ Ni4Ti6)"; @@ -1912,7 +1892,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { SubTag.ELECTROMAGNETIC_SEPERATION_GOLD .addTo(Magnetite, VanadiumMagnetite, BasalticMineralSand, GraniticMineralSand); - SubTag.NO_RECIPES.addTo(MagnetohydrodynamicallyConstrainedStarMatter); + SubTag.NO_RECIPES.addTo(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); SubTag.ELECTROMAGNETIC_SEPERATION_IRON.addTo( YellowLimonite, @@ -2052,8 +2032,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Mercassium, MeteoricIron, BloodInfusedIron, - Universium, - MagnetohydrodynamicallyConstrainedStarMatter, + MaterialsUEVplus.Universium, + MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, MeteoricSteel, Naquadah, NaquadahAlloy, @@ -2423,11 +2403,11 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { * Init rendering properties. Will be called at pre init by GT client proxy. */ public static void initClient() { - TranscendentMetal.renderer = new TranscendentMetalRenderer(); + MaterialsUEVplus.TranscendentMetal.renderer = new TranscendentMetalRenderer(); MaterialsBotania.GaiaSpirit.renderer = new GaiaSpiritRenderer(); Infinity.renderer = new InfinityRenderer(); CosmicNeutronium.renderer = new CosmicNeutroniumRenderer(); - Universium.renderer = new UniversiumRenderer(); + MaterialsUEVplus.Universium.renderer = new UniversiumRenderer(); } private static void fillGeneratedMaterialsMap() { @@ -2514,11 +2494,11 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { : aMaterial.getMass() > Element.Tc.getMass() * 2 ? TungstenSteel : aMaterial.getMass() > Element.Tc.getMass() ? Steel : Wood); - if (aMaterial == Materials.SpaceTime) { + if (aMaterial == MaterialsUEVplus.SpaceTime) { aMaterial.mHandleMaterial = Materials.Infinity; } - if (aMaterial == Materials.TranscendentMetal) { + if (aMaterial == MaterialsUEVplus.TranscendentMetal) { aMaterial.mHandleMaterial = Materials.DraconiumAwakened; } } diff --git a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java new file mode 100644 index 0000000000..2546349369 --- /dev/null +++ b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java @@ -0,0 +1,498 @@ +package gregtech.api.enums; + +import java.util.Collections; + +public class MaterialsUEVplus { + + public static Materials DimensionallyTranscendentCrudeCatalyst = new Materials( + 748, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16, + 10, + 20, + 20, + 1, + "DimensionallyTranscendentCrudeCatalyst", + "Dimensionally Transcendent Crude Catalyst", + 0, + 0, + 25_000_000, + 1, + false, + true, + 1, + 1, + 1, + Dyes.dyeCyan).setHasCorrespondingFluid(true); + public static Materials DimensionallyTranscendentProsaicCatalyst = new Materials( + 747, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16, + 10, + 20, + 20, + 1, + "DimensionallyTranscendentProsaicCatalyst", + "Dimensionally Transcendent Prosaic Catalyst", + 0, + 0, + 50_000_000, + 1, + false, + true, + 1, + 1, + 1, + Dyes.dyeGreen).setHasCorrespondingFluid(true); + public static Materials DimensionallyTranscendentResplendentCatalyst = new Materials( + 746, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16, + 10, + 20, + 20, + 1, + "DimensionallyTranscendentResplendentCatalyst", + "Dimensionally Transcendent Resplendent Catalyst", + 0, + 0, + 75_000_000, + 1, + false, + true, + 1, + 1, + 1, + Dyes.dyeLime).setHasCorrespondingFluid(true); + public static Materials DimensionallyTranscendentExoticCatalyst = new Materials( + 745, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16, + 10, + 20, + 20, + 1, + "DimensionallyTranscendentExoticCatalyst", + "Dimensionally Transcendent Exotic Catalyst", + 0, + 0, + 100_000_000, + 1, + false, + true, + 1, + 1, + 1, + Dyes.dyeMagenta).setHasCorrespondingFluid(true); + public static Materials DimensionallyTranscendentStellarCatalyst = new Materials( + 130, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16, + 10, + 20, + 20, + 1, + "DimensionallyTranscendentStellarCatalyst", + "Dimensionally Transcendent Stellar Catalyst", + 0, + 0, + 100_000_000, + 1, + false, + true, + 1, + 1, + 1, + Dyes.dyeOrange).setHasCorrespondingFluid(true); + + public static Materials ExcitedDTCC = new Materials( + 109, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16, + 10, + 20, + 20, + 1, + "ExcitedDTCC", + "Excited Dimensionally Transcendent Crude Catalyst", + -1, + -1, + 500000000, + 1, + false, + true, + 1, + 1, + 1, + Dyes.dyeCyan); + public static Materials ExcitedDTPC = new Materials( + 113, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16, + 35, + 59, + 41, + 1, + "ExcitedDTPC", + "Excited Dimensionally Transcendent Prosaic Catalyst", + -1, + -1, + 500000000, + 1, + false, + true, + 1, + 1, + 1, + Dyes.dyeGreen); + public static Materials ExcitedDTRC = new Materials( + 121, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16, + 38, + 20, + 56, + 1, + "ExcitedDTRC", + "Excited Dimensionally Transcendent Resplendent Catalyst", + -1, + -1, + 500000000, + 1, + false, + true, + 1, + 1, + 1, + Dyes.dyeLime); + public static Materials ExcitedDTEC = new Materials( + 126, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16, + 240, + 240, + 41, + 1, + "ExcitedDTEC", + "Excited Dimensionally Transcendent Exotic Catalyst", + -1, + -1, + 500000000, + 1, + false, + true, + 1, + 1, + 1, + Dyes.dyeMagenta); + public static Materials ExcitedDTSC = new Materials( + 127, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16, + 126, + 75, + 11, + 1, + "ExcitedDTSC", + "Excited Dimensionally Transcendent Stellar Catalyst", + -1, + -1, + 500000000, + 1, + false, + true, + 1, + 1, + 1, + Dyes.dyeOrange); + + public static Materials DimensionallyTranscendentResidue = new Materials( + 589, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16, + 0, + 0, + 0, + 1, + "DimensionallyTranscendentResidue", + "Dimensionally Transcendent Residue", + -1, + -1, + 25, + 1, + false, + true, + 1, + 1, + 1, + Dyes.dyeBlack); + + public static Materials SpaceTime = new Materials( + 588, + new TextureSet("spacetime", true), + 320.0F, + 4 * 2621440, + 25, + 1 | 2 | 64 | 128, + 255, + 255, + 255, + 0, + "SpaceTime", + "SpaceTime", + -1, + -1, + 0, + 0, + false, + true, + 2, + 1, + 1, + Dyes._NULL, + Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))) + .setProcessingMaterialTierEU(TierEU.RECIPE_UEV) + .disableAutoGeneratedBlastFurnaceRecipes() + .disableAutoGeneratedVacuumFreezerRecipe(); + public static Materials TranscendentMetal = new Materials( + 581, + TextureSet.SET_METALLIC, + 290.0F, + 3 * 2621440, + 22, + 1 | 2 | 64 | 128, + 50, + 50, + 50, + 0, + "TranscendentMetal", + "Transcendent Metal", + -1, + -1, + 0, + 3000, + true, + true, + 200, + 1000, + 1000, + Dyes.dyeBlack, + Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))) + .disableAutoGeneratedBlastFurnaceRecipes() + .disableAutoGeneratedVacuumFreezerRecipe() + .setProcessingMaterialTierEU(TierEU.RECIPE_UHV); + public static Materials MagnetohydrodynamicallyConstrainedStarMatter = new Materials( + 583, + new TextureSet("MagnetohydrodynamicallyConstrainedStarMatter", true), + 320.0F, + 4 * 2621440, + 25, + 1 | 2 | 64 | 128, + 255, + 255, + 255, + 0, + "MagnetohydrodynamicallyConstrainedStarMatter", + "Magnetohydrodynamically Constrained Star Matter", + -1, + -1, + 0, + 0, + false, + true, + 2, + 1, + 1, + Dyes._NULL, + Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))) + .setProcessingMaterialTierEU(TierEU.RECIPE_UIV); + public static Materials RawStarMatter = new Materials( + 584, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16 | 32, + 100, + 1, + 255, + 255, + "RawStarMatter", + "Condensed Raw Stellar Plasma Mixture", + -1, + -1, + 0, + 0, + false, + false, + 200, + 1, + 1, + Dyes.dyePurple); + public static Materials WhiteDwarfMatter = new Materials( + 585, + new TextureSet("WhiteDwarfMatter", true), + 1.0F, + 0, + 2, + 1 | 2 | 64 | 128, + 255, + 255, + 255, + 0, + "WhiteDwarfMatter", + "White Dwarf Matter", + -1, + -1, + 0, + 0, + false, + false, + 200, + 1, + 1, + Dyes.dyePurple).setHasCorrespondingFluid(true) + .setProcessingMaterialTierEU(TierEU.RECIPE_UEV) + .disableAutoGeneratedBlastFurnaceRecipes() + .disableAutoGeneratedVacuumFreezerRecipe(); + public static Materials BlackDwarfMatter = new Materials( + 586, + TextureSet.SET_METALLIC, + 1.0F, + 0, + 2, + 1 | 2 | 64 | 128, + 0, + 0, + 0, + 255, + "BlackDwarfMatter", + "Black Dwarf Matter", + -1, + -1, + 0, + 0, + false, + false, + 200, + 1, + 1, + Dyes.dyePurple).setHasCorrespondingFluid(true) + .setProcessingMaterialTierEU(TierEU.RECIPE_UEV) + .disableAutoGeneratedBlastFurnaceRecipes() + .disableAutoGeneratedVacuumFreezerRecipe(); + + public static Materials Time = new Materials( + 587, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16 | 32, + 100, + 1, + 255, + 255, + "temporalFluid", + "Tachyon Rich Temporal Fluid", + -1, + -1, + 0, + 0, + false, + false, + 200, + 1, + 1, + Dyes.dyePurple); + public static Materials Space = new Materials( + 106, + TextureSet.SET_FLUID, + 1.0F, + 0, + 2, + 16 | 32, + 100, + 1, + 255, + 255, + "spatialFluid", + "Spatially Enlarged Fluid", + -1, + -1, + 0, + 0, + false, + false, + 200, + 1, + 1, + Dyes.dyePurple); + + public static Materials Universium = new Materials( + 139, + new TextureSet("universium", true), + 1.0F, + 4 * 2621440, + 25, + 1 | 2 | 64 | 128, + 38, + 49, + 69, + 255, + "Universium", + "Universium", + -1, + -1, + 0, + 0, + false, + true, + 2, + 1, + 1, + Dyes._NULL, + Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1))) + .setProcessingMaterialTierEU(TierEU.RECIPE_UMV); + + /** + * called by Materials. Can be safely called multiple times. exists to allow Materials ensure this class is + * initialized + */ + public static void init() { + // no-op. all work is done by <clinit> + } +} diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 3e5f694d2a..ac518f4bd0 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -744,22 +744,22 @@ public enum OrePrefixes { ingot.mNotGeneratedItems.add(Materials.WoodSealed); ingot.mNotGeneratedItems.add(Materials.Wood); - frame.mNotGeneratedItems.add(Materials.Universium); - frameGt.mNotGeneratedItems.add(Materials.Universium); - - plateDouble.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - plateTriple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - plateQuadruple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - plateQuintuple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - cell.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - ingotDouble.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - ingotTriple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - ingotQuadruple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - ingotQuintuple.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - turbineBlade.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - dust.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - dustSmall.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - dustTiny.mNotGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + frame.mNotGeneratedItems.add(MaterialsUEVplus.Universium); + frameGt.mNotGeneratedItems.add(MaterialsUEVplus.Universium); + + plateDouble.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + plateTriple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + cell.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + ingotQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + ingotQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + dust.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + dustTiny.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); // ingot.mNotGeneratedItems.add(Materials.Ichorium); nugget.mNotGeneratedItems.add(Materials.Gold); @@ -789,10 +789,10 @@ public enum OrePrefixes { block.mNotGeneratedItems.add(Materials.Diamond); block.mNotGeneratedItems.add(Materials.Coal); toolHeadArrow.mNotGeneratedItems.add(Materials.Glass); - toolHeadArrow.mNotGeneratedItems.add(Materials.TranscendentMetal); - arrowGtPlastic.mNotGeneratedItems.add(Materials.TranscendentMetal); - arrow.mNotGeneratedItems.add(Materials.TranscendentMetal); - arrowGtWood.mNotGeneratedItems.add(Materials.TranscendentMetal); + toolHeadArrow.mNotGeneratedItems.add(MaterialsUEVplus.TranscendentMetal); + arrowGtPlastic.mNotGeneratedItems.add(MaterialsUEVplus.TranscendentMetal); + arrow.mNotGeneratedItems.add(MaterialsUEVplus.TranscendentMetal); + arrowGtWood.mNotGeneratedItems.add(MaterialsUEVplus.TranscendentMetal); // ----- @@ -817,7 +817,7 @@ public enum OrePrefixes { plate.mGeneratedItems.add(Materials.Electrotine); plate.mGeneratedItems.add(Materials.Obsidian); - ingotHot.mGeneratedItems.add(Materials.TranscendentMetal); + ingotHot.mGeneratedItems.add(MaterialsUEVplus.TranscendentMetal); plate.mGeneratedItems.add(Materials.Paper); plateDouble.mGeneratedItems.add(Materials.Paper); @@ -836,19 +836,19 @@ public enum OrePrefixes { nanite.mGeneratedItems.add(Materials.Iron); nanite.mGeneratedItems.add(Materials.Copper); nanite.mGeneratedItems.add(Materials.Silver); - nanite.mGeneratedItems.add(Materials.TranscendentMetal); + nanite.mGeneratedItems.add(MaterialsUEVplus.TranscendentMetal); nanite.mGeneratedItems.add(Materials.Neutronium); - nanite.mGeneratedItems.add(Materials.Universium); - nanite.mGeneratedItems.add(Materials.WhiteDwarfMatter); - nanite.mGeneratedItems.add(Materials.BlackDwarfMatter); + nanite.mGeneratedItems.add(MaterialsUEVplus.Universium); + nanite.mGeneratedItems.add(MaterialsUEVplus.WhiteDwarfMatter); + nanite.mGeneratedItems.add(MaterialsUEVplus.BlackDwarfMatter); nanite.mGeneratedItems.add(Materials.Glowstone); // ----- - gear.mGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - ingot.mGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - toolHeadHammer.mGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - frame.mGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); - frameGt.mGeneratedItems.add(Materials.MagnetohydrodynamicallyConstrainedStarMatter); + gear.mGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + ingot.mGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + toolHeadHammer.mGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + frame.mGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + frameGt.mGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); dust.mGeneratedItems.addAll(dustPure.mGeneratedItems); dust.mGeneratedItems.addAll(dustImpure.mGeneratedItems); @@ -1351,8 +1351,8 @@ public enum OrePrefixes { || aMaterial == Materials.NiobiumTitanium || aMaterial == Materials.YttriumBariumCuprate || aMaterial == Materials.BloodInfusedIron - || aMaterial == Materials.Universium - || aMaterial == Materials.MagnetohydrodynamicallyConstrainedStarMatter)) + || aMaterial == MaterialsUEVplus.Universium + || aMaterial == MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter)) wireFine.mDisabledItems.add(aMaterial); // Gears if (!enableUnusedGears && !(aMaterial == Materials.Aluminium || aMaterial == Materials.Titanium diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index aa8956c504..5686657168 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -2068,11 +2068,11 @@ public class GT_Recipe implements Comparable<GT_Recipe> { aShowVoltageAmperageInNEI, aNEIAllowed); useModularUI(true); - setUsualFluidInputCount(16); + setUsualFluidInputCount(20); setUsualFluidOutputCount(1); setProgressBarPos(86, 44); setLogoPos(87, 81); - setNEIBackgroundSize(172, 100); + setNEIBackgroundSize(172, 125); } @Override @@ -2082,7 +2082,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { @Override public List<Pos2d> getFluidInputPositions(int fluidInputCount) { - return UIHelper.getGridPositions(fluidInputCount, 6, 26, 4); + return UIHelper.getGridPositions(fluidInputCount, 6, 26, 4, 5); } @Override @@ -2096,7 +2096,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { // the EU/t. drawNEIText( recipeInfo, - GT_Utility.trans("152", "Total: ") + formatNumbers(1000L * recipeInfo.recipe.mEUt) + " EU"); + GT_Utility.trans("152", "Total: ") + + formatNumbers(1000L * recipeInfo.recipe.mDuration / 100L * recipeInfo.recipe.mEUt) + + " EU"); // 1000 / (20 ticks * 5 seconds) = 10L/t. 10L/t * x EU/L = 10 * x EU/t. drawNEIText(recipeInfo, "Average: " + formatNumbers(10L * recipeInfo.recipe.mEUt) + " EU/t"); } diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index 2fb25828a7..d419747c8a 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -19,13 +19,7 @@ import net.minecraft.potion.Potion; import net.minecraft.world.World; import gregtech.api.GregTech_API; -import gregtech.api.enums.Dyes; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; -import gregtech.api.enums.TC_Aspects; +import gregtech.api.enums.*; import gregtech.api.items.GT_MetaGenerated_Item_X32; import gregtech.api.objects.ItemData; import gregtech.api.render.TextureFactory; @@ -2700,7 +2694,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { false); GT_ModHandler.addPulverisationRecipe( ItemList.Tesseract.get(1), - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TranscendentMetal, 8L) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.TranscendentMetal, 8L) }, new int[] { 10000 }, 32_000_000, 100); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java index 9d8912f0c5..61ce017d5a 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java @@ -33,6 +33,7 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.Textures.BlockIcons; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -306,7 +307,8 @@ public class GT_MetaTileEntity_NanoForge extends mSpecialTier = 2; } - if (aStack.isItemEqual(Materials.TranscendentMetal.getNanite(1)) && checkPiece(STRUCTURE_PIECE_MAIN, 4, 37, 1) + if (aStack.isItemEqual(MaterialsUEVplus.TranscendentMetal.getNanite(1)) + && checkPiece(STRUCTURE_PIECE_MAIN, 4, 37, 1) && checkPiece(STRUCTURE_PIECE_TIER2, -7, 14, 4) && checkPiece(STRUCTURE_PIECE_TIER3, 14, 26, 4)) { mSpecialTier = 3; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java index 5f32ec190d..30368a12f0 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java @@ -29,7 +29,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; import gregtech.api.enums.HeatingCoilLevel; -import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -51,8 +51,9 @@ public class GT_MetaTileEntity_PlasmaForge extends GT_MetaTileEntity_AbstractMul private static final double maximum_discount = 0.5d; // Valid fuels which the discount will get applied to. - private static final FluidStack[] valid_fuels = { Materials.ExcitedDTEC.getFluid(1L), - Materials.ExcitedDTRC.getFluid(1L), Materials.ExcitedDTPC.getFluid(1L), Materials.ExcitedDTCC.getFluid(1L), }; + private static final FluidStack[] valid_fuels = { MaterialsUEVplus.ExcitedDTEC.getFluid(1L), + MaterialsUEVplus.ExcitedDTRC.getFluid(1L), MaterialsUEVplus.ExcitedDTPC.getFluid(1L), + MaterialsUEVplus.ExcitedDTCC.getFluid(1L), MaterialsUEVplus.ExcitedDTSC.getFluid(1L) }; // Saves recomputing this every recipe check for overclocking. private static final double log4 = log(4); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index ab17077c16..e7f2f52de0 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -5,11 +5,7 @@ import java.util.ArrayList; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; +import gregtech.api.enums.*; import gregtech.api.objects.MaterialStack; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -97,7 +93,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr && (aMaterial != Materials.Obsidian) && (aMaterial != Materials.Glowstone) && (aMaterial != Materials.Paper) - && (aMaterial != Materials.TranscendentMetal) + && (aMaterial != MaterialsUEVplus.TranscendentMetal) && (aMaterial != Materials.Clay)) { GT_ModHandler.addCompressionRecipe( GT_Utility.copyAmount(1L, aStack), diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java index 8413fc672f..b3ff9af45e 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java @@ -11,10 +11,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.*; import gregtech.api.util.GT_OreDictUnificator; public class GT_NaniteChain { @@ -131,11 +128,11 @@ public class GT_NaniteChain { // Transcendent Metal Nanites - Used to upgrade the Nano Forge to Tier 3 GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { aUIVTierLens, Materials.TranscendentMetal.getBlocks(8), + new ItemStack[] { aUIVTierLens, MaterialsUEVplus.TranscendentMetal.getBlocks(8), ItemList.Circuit_Chip_SoC2.get(64), ItemList.Circuit_Chip_SoC2.get(64), ItemList.Circuit_Chip_SoC2.get(64) }, new FluidStack[] { Materials.UUMatter.getFluid(2000000) }, - new ItemStack[] { Materials.TranscendentMetal.getNanite(1) }, + new ItemStack[] { MaterialsUEVplus.TranscendentMetal.getNanite(1) }, null, null, 750 * 20, @@ -148,12 +145,12 @@ public class GT_NaniteChain { // lens getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any // better naming - Materials.WhiteDwarfMatter.getBlocks(8), getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), + MaterialsUEVplus.WhiteDwarfMatter.getBlocks(8), getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit }, - new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000), - Materials.Space.getMolten(720), }, - new ItemStack[] { Materials.WhiteDwarfMatter.getNanite(4) }, + new FluidStack[] { Materials.UUMatter.getFluid(500_000), MaterialsUEVplus.RawStarMatter.getFluid(50_000), + MaterialsUEVplus.Space.getMolten(720), }, + new ItemStack[] { MaterialsUEVplus.WhiteDwarfMatter.getNanite(4) }, null, null, 750 * 20, @@ -166,12 +163,12 @@ public class GT_NaniteChain { // lens getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any // better naming - Materials.BlackDwarfMatter.getBlocks(8), getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), + MaterialsUEVplus.BlackDwarfMatter.getBlocks(8), getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit }, - new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000), - Materials.Time.getMolten(720), }, - new ItemStack[] { Materials.BlackDwarfMatter.getNanite(4) }, + new FluidStack[] { Materials.UUMatter.getFluid(500_000), MaterialsUEVplus.RawStarMatter.getFluid(50_000), + MaterialsUEVplus.Time.getMolten(720), }, + new ItemStack[] { MaterialsUEVplus.BlackDwarfMatter.getNanite(4) }, null, null, 750 * 20, @@ -182,14 +179,14 @@ public class GT_NaniteChain { GT_Values.RA.addNanoForgeRecipe( new ItemStack[] { aUMVTierLens, // Quantum Anomaly, couldn't find any better naming. - getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), Materials.Universium.getBlocks(8), + getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), MaterialsUEVplus.Universium.getBlocks(8), ItemList.Optically_Perfected_CPU.get(16), ItemList.Optically_Compatible_Memory.get(16), getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit }, - new FluidStack[] { Materials.SpaceTime.getMolten(144), Materials.Infinity.getMolten(576), + new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(144), Materials.Infinity.getMolten(576), Materials.UUMatter.getFluid(1_000_000), }, - new ItemStack[] { Materials.Universium.getNanite(2) }, + new ItemStack[] { MaterialsUEVplus.Universium.getNanite(2) }, null, null, 750 * 20, diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java index 432ee6d0bb..7a1d74466a 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -11,10 +11,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_PCBFactoryManager; @@ -70,7 +67,7 @@ public class GT_PCBFactoryRecipes { GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtHypogen", 1), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2), Materials.Thulium.getPlates(6) }, - Materials.SpaceTime.getMolten(144 * 8), + MaterialsUEVplus.SpaceTime.getMolten(144 * 8), ItemList.InfinityCooledCasing.get(1), 10 * 20, (int) GT_Values.VP[12]); diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index ab3b5b299b..437f4f51da 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -7568,7 +7568,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMVBase, 33), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.SpaceTime, 22), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, MaterialsUEVplus.SpaceTime, 22), ItemList.Electric_Pump_UMV.get(1), GT_Utility.getIntegratedCircuit(9)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 33)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java index ce935cf5ec..336c45f5ec 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java @@ -644,8 +644,8 @@ public class BlastFurnaceRecipes implements Runnable { if (GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs(Materials.TranscendentMetal.getDust(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.TranscendentMetal, 1)) + .itemInputs(MaterialsUEVplus.TranscendentMetal.getDust(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.TranscendentMetal, 1)) .fluidInputs(Materials.Tungsten.getMolten(144)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 72)) .duration(3 * MINUTES) diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java index d5cac5c6ea..12133467e4 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java @@ -361,7 +361,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Bottle.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Bottle.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -370,7 +370,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Plate.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Plate.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -379,7 +379,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Cell.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Cell.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -388,7 +388,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Ring.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Ring.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -397,7 +397,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Rod.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Rod.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -406,7 +406,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Bolt.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Bolt.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -415,7 +415,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Ingot.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Ingot.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -424,7 +424,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Wire.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Wire.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -433,7 +433,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Casing.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Casing.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -442,7 +442,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Pipe_Tiny.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Tiny.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -451,7 +451,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Pipe_Small.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Small.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -460,7 +460,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Pipe_Medium.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Medium.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -469,7 +469,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Pipe_Large.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Large.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -478,7 +478,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Pipe_Huge.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Huge.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -487,7 +487,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Block.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Block.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -496,7 +496,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Sword.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Sword.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -505,7 +505,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Pickaxe.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pickaxe.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -514,7 +514,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Shovel.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Shovel.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -523,7 +523,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Axe.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Axe.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -532,7 +532,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Hoe.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Hoe.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -541,7 +541,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Hammer.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Hammer.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -550,7 +550,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_File.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_File.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -559,7 +559,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Saw.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Saw.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -568,7 +568,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Gear.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Gear.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -577,7 +577,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Rotor.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Rotor.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -586,7 +586,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Turbine_Blade.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Turbine_Blade.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -595,7 +595,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_Small_Gear.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Small_Gear.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) @@ -604,7 +604,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Extruder_ToolHeadDrill.get(1)) .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_ToolHeadDrill.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) .noFluidOutputs() .duration(whiteDwarfShapeSolidifierTime) .eut(TierEU.RECIPE_UMV) diff --git a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java index 0d61dc8b17..24cc69bd67 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java @@ -167,8 +167,8 @@ public class ForgeHammerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Tesseract.get(1L), getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1, 32105)) .noItemOutputs() - .fluidInputs(Materials.SpaceTime.getMolten(2880L)) - .fluidOutputs(Materials.Space.getMolten(1440L), Materials.Time.getMolten(1440L)) + .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(2880L)) + .fluidOutputs(MaterialsUEVplus.Space.getMolten(1440L), MaterialsUEVplus.Time.getMolten(1440L)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_UXV) .addTo(sHammerRecipes); diff --git a/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java index 8243265759..26a46cfc8c 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java @@ -330,5 +330,35 @@ public class FusionReactorRecipes implements Runnable { .eut(98304) .metadata(FUSION_THRESHOLD, 500000000) .addTo(sFusionRecipes); // FT3 + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Lutetium.getMolten(144), Materials.Vanadium.getMolten(144)) + .fluidOutputs(Materials.Plutonium241.getPlasma(144)) + .duration(8 * TICKS) + .eut(TierEU.RECIPE_UEV / 2) + .metadata(FUSION_THRESHOLD, 1_000_000_000) + .addTo(sFusionRecipes); // FT5 because of UEV voltage + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Tellurium.getMolten(144), Materials.Zinc.getMolten(144)) + .fluidOutputs(Materials.Lead.getPlasma(144)) + .duration(8 * TICKS) + .eut(TierEU.RECIPE_UEV / 2) + .metadata(FUSION_THRESHOLD, 1_000_000_000) + .addTo(sFusionRecipes); // FT5 because of UEV voltage + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Osmium.getMolten(144), Materials.Silicon.getMolten(144)) + .fluidOutputs(Materials.Thorium.getPlasma(144)) + .duration(8 * TICKS) + .eut(TierEU.RECIPE_UEV / 2) + .metadata(FUSION_THRESHOLD, 1_000_000_000) + .addTo(sFusionRecipes); // FT5 because of UEV voltage } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java index 7808656a90..9793ab2fbd 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java @@ -5,7 +5,7 @@ import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.TierEU; public class LaserEngraverRecipes implements Runnable { @@ -16,41 +16,56 @@ public class LaserEngraverRecipes implements Runnable { GT_Values.RA.stdBuilder() .noItemInputs() .noItemOutputs() - .fluidInputs(Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000)) - .fluidOutputs(Materials.ExcitedDTCC.getFluid(1000)) + .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentCrudeCatalyst.getFluid(1000)) + .fluidOutputs(MaterialsUEVplus.ExcitedDTCC.getFluid(1000)) .requiresCleanRoom() .duration(41 * MINUTES + 40 * SECONDS) .eut((int) TierEU.RECIPE_ZPM) + .noOptimize() .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() .noItemInputs() .noItemOutputs() - .fluidInputs(Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000)) - .fluidOutputs(Materials.ExcitedDTPC.getFluid(1000)) + .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentProsaicCatalyst.getFluid(1000)) + .fluidOutputs(MaterialsUEVplus.ExcitedDTPC.getFluid(1000)) .requiresCleanRoom() .duration(41 * MINUTES + 40 * SECONDS) .eut((int) TierEU.RECIPE_UV) + .noOptimize() .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() .noItemInputs() .noItemOutputs() - .fluidInputs(Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000)) - .fluidOutputs(Materials.ExcitedDTRC.getFluid(1000)) + .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentResplendentCatalyst.getFluid(1000)) + .fluidOutputs(MaterialsUEVplus.ExcitedDTRC.getFluid(1000)) .requiresCleanRoom() .duration(41 * MINUTES + 40 * SECONDS) .eut((int) TierEU.RECIPE_UHV) + .noOptimize() .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() .noItemInputs() .noItemOutputs() - .fluidInputs(Materials.DimensionallyTranscendentExoticCatalyst.getFluid(1000)) - .fluidOutputs(Materials.ExcitedDTEC.getFluid(1000)) + .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentExoticCatalyst.getFluid(1000)) + .fluidOutputs(MaterialsUEVplus.ExcitedDTEC.getFluid(1000)) .requiresCleanRoom() .duration(41 * MINUTES + 40 * SECONDS) .eut((int) TierEU.RECIPE_UEV) + .noOptimize() + .addTo(sLaserEngraverRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentStellarCatalyst.getFluid(1000)) + .fluidOutputs(MaterialsUEVplus.ExcitedDTSC.getFluid(1000)) + .requiresCleanRoom() + .duration(41 * MINUTES + 40 * SECONDS) + .eut((int) TierEU.RECIPE_UIV) + .noOptimize() .addTo(sLaserEngraverRecipes); } diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java index 50d370c8ca..bb6abe7c20 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java @@ -2,13 +2,7 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.GT_Values.NF; import static gregtech.api.enums.GT_Values.NI; -import static gregtech.api.enums.Mods.AppliedEnergistics2; -import static gregtech.api.enums.Mods.BiomesOPlenty; -import static gregtech.api.enums.Mods.Forestry; -import static gregtech.api.enums.Mods.Natura; -import static gregtech.api.enums.Mods.PamsHarvestCraft; -import static gregtech.api.enums.Mods.Railcraft; -import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -24,13 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.MaterialsKevlar; -import gregtech.api.enums.MaterialsOreAlum; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.TierEU; +import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; @@ -1746,51 +1734,70 @@ public class MixerRecipes implements Runnable { Materials.Iron.getPlasma(1000L), Materials.Calcium.getPlasma(1000L), Materials.Niobium.getPlasma(1000L)) - .fluidOutputs(Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L)) + .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L)) .duration(41 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_ZPM) + .noOptimize() .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(10)) .noItemOutputs() .fluidInputs( - Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L), + MaterialsUEVplus.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L), Materials.Radon.getPlasma(1000L), Materials.Nickel.getPlasma(1000L), Materials.Boron.getPlasma(1000L), Materials.Sulfur.getPlasma(1000L)) - .fluidOutputs(Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L)) + .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L)) .duration(41 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_ZPM) + .eut(TierEU.RECIPE_UV) + .noOptimize() .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(11)) .noItemOutputs() .fluidInputs( - Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L), + MaterialsUEVplus.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L), Materials.Nitrogen.getPlasma(1000L), Materials.Zinc.getPlasma(1000L), Materials.Silver.getPlasma(1000L), Materials.Titanium.getPlasma(1000L)) - .fluidOutputs(Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L)) + .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L)) .duration(41 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_ZPM) + .eut(TierEU.RECIPE_UHV) + .noOptimize() .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(12)) .noItemOutputs() .fluidInputs( - Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L), + MaterialsUEVplus.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L), Materials.Americium.getPlasma(1000L), Materials.Bismuth.getPlasma(1000L), Materials.Oxygen.getPlasma(1000L), Materials.Tin.getPlasma(1000L)) - .fluidOutputs(Materials.DimensionallyTranscendentExoticCatalyst.getFluid(1000L)) + .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentExoticCatalyst.getFluid(1000L)) .duration(41 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_ZPM) + .eut(TierEU.RECIPE_UEV) + .noOptimize() + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(13)) + .noItemOutputs() + .fluidInputs( + MaterialsUEVplus.DimensionallyTranscendentExoticCatalyst.getFluid(1000L), + Materials.Lead.getPlasma(1000), + Materials.Thorium.getPlasma(1000), + Materials.Plutonium241.getPlasma(1000L), + MaterialsUEVplus.RawStarMatter.getFluid(25L)) + .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentStellarCatalyst.getFluid(1000L)) + .duration(41 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_UIV) + .noOptimize() .addTo(sMixerRecipes); } diff --git a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java index 5546dadc86..df6f37f299 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java @@ -18,7 +18,9 @@ public class PlasmaForgeRecipes implements Runnable { ItemList.Field_Generator_UEV.get(64), ItemList.Field_Generator_UIV.get(64), ItemList.Field_Generator_UMV.get(64)) - .fluidInputs(Materials.ExcitedDTEC.getFluid(100_000_000), Materials.SpaceTime.getMolten(64 * 2 * 9 * 144)) + .fluidInputs( + MaterialsUEVplus.ExcitedDTEC.getFluid(100_000_000), + MaterialsUEVplus.SpaceTime.getMolten(64 * 2 * 9 * 144)) .itemOutputs(ItemList.GigaChad.get(1)) .noFluidOutputs() .duration(86400 * 20 * 2) @@ -32,7 +34,7 @@ public class PlasmaForgeRecipes implements Runnable { getModItem(GTPlusPlus.ID, "particleBase", 1, 24), getModItem(NewHorizonsCoreMod.ID, "item.ChromaticLens", 0), getModItem(GoodGenerator.ID, "huiCircuit", 0, 4)) - .fluidInputs(Materials.ExcitedDTRC.getFluid(92), Materials.Duranium.getMolten(144)) + .fluidInputs(MaterialsUEVplus.ExcitedDTRC.getFluid(92), Materials.Duranium.getMolten(144)) .itemOutputs(getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1, 32105)) .noFluidOutputs() .duration(60 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java index 53cb4524b5..3c53b565ce 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java @@ -7,6 +7,7 @@ import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.util.GT_Utility; public class TranscendentPlasmaMixerRecipes implements Runnable { @@ -15,6 +16,7 @@ public class TranscendentPlasmaMixerRecipes implements Runnable { private static final int PROSAIC_EU_PER_L = 66_768_460; private static final int RESPLENDENT_EU_PER_L = 269_326_451; private static final int EXOTIC_EU_PER_L = 1_073_007_393; + private static final int STELLAR_EU_PER_HALF_L = 2_138_383_760; @Deprecated private static void addTranscendentPlasmaMixerRecipe(final FluidStack fluidOutput, final int circuitNumber, @@ -42,7 +44,7 @@ public class TranscendentPlasmaMixerRecipes implements Runnable { Materials.Iron.getPlasma(1000), Materials.Calcium.getPlasma(1000), Materials.Niobium.getPlasma(1000)) - .fluidOutputs(Materials.ExcitedDTCC.getFluid(1000L)) + .fluidOutputs(MaterialsUEVplus.ExcitedDTCC.getFluid(1000L)) .duration(100) .eut(CRUDE_EU_PER_L) .noOptimize() @@ -60,7 +62,7 @@ public class TranscendentPlasmaMixerRecipes implements Runnable { Materials.Nickel.getPlasma(1000), Materials.Boron.getPlasma(1000), Materials.Sulfur.getPlasma(1000)) - .fluidOutputs(Materials.ExcitedDTPC.getFluid(1000L)) + .fluidOutputs(MaterialsUEVplus.ExcitedDTPC.getFluid(1000L)) .duration(100) .eut(PROSAIC_EU_PER_L) .noOptimize() @@ -82,7 +84,7 @@ public class TranscendentPlasmaMixerRecipes implements Runnable { Materials.Zinc.getPlasma(1000), Materials.Silver.getPlasma(1000), Materials.Titanium.getPlasma(1000)) - .fluidOutputs(Materials.ExcitedDTRC.getFluid(1000L)) + .fluidOutputs(MaterialsUEVplus.ExcitedDTRC.getFluid(1000L)) .duration(100) .eut(RESPLENDENT_EU_PER_L) .noOptimize() @@ -108,11 +110,41 @@ public class TranscendentPlasmaMixerRecipes implements Runnable { Materials.Bismuth.getPlasma(1000), Materials.Oxygen.getPlasma(1000), Materials.Tin.getPlasma(1000)) - .fluidOutputs(Materials.ExcitedDTEC.getFluid(1000L)) + .fluidOutputs(MaterialsUEVplus.ExcitedDTEC.getFluid(1000L)) .duration(100) .eut(EXOTIC_EU_PER_L) .noOptimize() .addTo(sTranscendentPlasmaMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(5)) + .noItemOutputs() + .fluidInputs( + Materials.Helium.getPlasma(1000), + Materials.Iron.getPlasma(1000), + Materials.Calcium.getPlasma(1000), + Materials.Niobium.getPlasma(1000), + Materials.Radon.getPlasma(1000), + Materials.Nickel.getPlasma(1000), + Materials.Boron.getPlasma(1000), + Materials.Sulfur.getPlasma(1000), + Materials.Nitrogen.getPlasma(1000), + Materials.Zinc.getPlasma(1000), + Materials.Silver.getPlasma(1000), + Materials.Titanium.getPlasma(1000), + Materials.Americium.getPlasma(1000), + Materials.Bismuth.getPlasma(1000), + Materials.Oxygen.getPlasma(1000), + Materials.Tin.getPlasma(1000), + Materials.Lead.getPlasma(1000), + Materials.Thorium.getPlasma(1000), + Materials.Plutonium241.getPlasma(1000L), + MaterialsUEVplus.RawStarMatter.getFluid(25L)) + .fluidOutputs(MaterialsUEVplus.ExcitedDTSC.getFluid(1000L)) + .duration(200) + .eut(STELLAR_EU_PER_HALF_L) + .noOptimize() + .addTo(sTranscendentPlasmaMixerRecipes); + } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java index cb71eaf766..e60a2bd6b6 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java @@ -492,8 +492,8 @@ public class VacuumFreezerRecipes implements Runnable { if (GTPlusPlus.isModLoaded()) { // hot transcendent metal ingot cooling GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.TranscendentMetal, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TranscendentMetal, 1L)) + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.TranscendentMetal, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, MaterialsUEVplus.TranscendentMetal, 1L)) .fluidInputs( new FluidStack(FluidRegistry.getFluid("molten.titansteel"), 144), Materials.SuperCoolant.getFluid(1000)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java index 37161f3e28..e162c932ec 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java @@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack; import gregtech.GT_Mod; 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.*; @@ -189,7 +190,7 @@ public class WiremillRecipes implements Runnable { registerWiremillRecipes(Materials.Graphene, 20 * SECONDS, 2, OrePrefixes.dust, OrePrefixes.stick, 1); - registerWiremillRecipes(Materials.SpaceTime, 20 * SECONDS, 32_000); + registerWiremillRecipes(MaterialsUEVplus.SpaceTime, 20 * SECONDS, 32_000); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Polycaprolactam, 1L)) 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 4180ad6e12..817b1c5d0b 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 @@ -26,14 +26,7 @@ import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.GT_Mod; import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; -import gregtech.api.enums.Dyes; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.MaterialsKevlar; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; +import gregtech.api.enums.*; import gregtech.api.fluid.GT_FluidFactory; import gregtech.api.items.GT_Block_LongDistancePipe; import gregtech.api.items.GT_BreederCell_Item; @@ -606,8 +599,8 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GregTech_API.sBlockMetal9 = new GT_Block_Metal( "gt.blockmetal9", new Materials[] { Materials.Cryolite, Materials.SiliconSG, MaterialsKevlar.NickelAluminide, - Materials.SpaceTime, Materials.TranscendentMetal, Materials.Oriharukon, Materials.WhiteDwarfMatter, - Materials.BlackDwarfMatter, Materials.Universium }, + MaterialsUEVplus.SpaceTime, MaterialsUEVplus.TranscendentMetal, Materials.Oriharukon, + MaterialsUEVplus.WhiteDwarfMatter, MaterialsUEVplus.BlackDwarfMatter, MaterialsUEVplus.Universium }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS12); @@ -1121,68 +1114,76 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { .withLocalizedName("Dimensionally Transcendent Residue") .withStateAndTemperature(LIQUID, 2000000000) .buildAndRegister() - .configureMaterials(Materials.DimensionallyTranscendentResidue) + .configureMaterials(MaterialsUEVplus.DimensionallyTranscendentResidue) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.DimensionallyTranscendentResidue, 1L), + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.DimensionallyTranscendentResidue, 1L), ItemList.Cell_Empty.get(1L)); GT_FluidFactory.builder("ExcitedDTCC") .withLocalizedName("Excited Dimensionally Transcendent Crude Catalyst") .withStateAndTemperature(LIQUID, 500000000) .buildAndRegister() - .configureMaterials(Materials.ExcitedDTCC) + .configureMaterials(MaterialsUEVplus.ExcitedDTCC) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTCC, 1L), + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTCC, 1L), ItemList.Cell_Empty.get(1L)); GT_FluidFactory.builder("ExcitedDTPC") .withLocalizedName("Excited Dimensionally Transcendent Prosaic Catalyst") .withStateAndTemperature(LIQUID, 500000000) .buildAndRegister() - .configureMaterials(Materials.ExcitedDTPC) + .configureMaterials(MaterialsUEVplus.ExcitedDTPC) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTPC, 1L), + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTPC, 1L), ItemList.Cell_Empty.get(1L)); GT_FluidFactory.builder("ExcitedDTRC") .withLocalizedName("Excited Dimensionally Transcendent Resplendent Catalyst") .withStateAndTemperature(LIQUID, 500000000) .buildAndRegister() - .configureMaterials(Materials.ExcitedDTRC) + .configureMaterials(MaterialsUEVplus.ExcitedDTRC) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTRC, 1L), + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTRC, 1L), ItemList.Cell_Empty.get(1L)); GT_FluidFactory.builder("ExcitedDTEC") .withLocalizedName("Excited Dimensionally Transcendent Exotic Catalyst") .withStateAndTemperature(LIQUID, 500000000) .buildAndRegister() - .configureMaterials(Materials.ExcitedDTEC) + .configureMaterials(MaterialsUEVplus.ExcitedDTEC) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTEC, 1L), + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTEC, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("ExcitedDTSC") + .withLocalizedName("Excited Dimensionally Transcendent Stellar Catalyst") + .withStateAndTemperature(LIQUID, 500000000) + .buildAndRegister() + .configureMaterials(MaterialsUEVplus.ExcitedDTSC) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTSC, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder(Materials.RawStarMatter.mName) - .withLocalizedName(Materials.RawStarMatter.mLocalizedName) + GT_FluidFactory.builder(MaterialsUEVplus.RawStarMatter.mName) + .withLocalizedName(MaterialsUEVplus.RawStarMatter.mLocalizedName) .withStateAndTemperature(LIQUID, 10_000_000) .buildAndRegister() - .configureMaterials(Materials.RawStarMatter) + .configureMaterials(MaterialsUEVplus.RawStarMatter) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.RawStarMatter, 1L), + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.RawStarMatter, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder(Materials.Space.mName) - .withLocalizedName(Materials.Space.mLocalizedName) + GT_FluidFactory.builder(MaterialsUEVplus.Space.mName) + .withLocalizedName(MaterialsUEVplus.Space.mLocalizedName) .withStateAndTemperature(MOLTEN, 0) .buildAndRegister() - .configureMaterials(Materials.Space) + .configureMaterials(MaterialsUEVplus.Space) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Space, 1L), + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.Space, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder(Materials.Time.mName) - .withLocalizedName(Materials.Time.mLocalizedName) + GT_FluidFactory.builder(MaterialsUEVplus.Time.mName) + .withLocalizedName(MaterialsUEVplus.Time.mLocalizedName) .withStateAndTemperature(MOLTEN, 0) .buildAndRegister() - .configureMaterials(Materials.Time) + .configureMaterials(MaterialsUEVplus.Time) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Time, 1L), + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.Time, 1L), ItemList.Cell_Empty.get(1L)); GT_FluidFactory.builder("fieryblood") 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 86069b8327..f30347e94b 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -9549,7 +9549,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC makeWires(Materials.SuperconductorUMV, 2089, 0L, 0L, 64L, gregtech.api.enums.GT_Values.V[12], false, true); makeWires(Materials.Ichorium, 2600, 2L, 2L, 12L, GT_Values.V[9], false, true); - makeWires(Materials.SpaceTime, 2606, 0L, 0L, 1_000_000L, GT_Values.V[14], false, true); + makeWires(MaterialsUEVplus.SpaceTime, 2606, 0L, 0L, 1_000_000L, GT_Values.V[14], false, true); if (!GT_Mod.gregtechproxy.mDisableIC2Cables) { GT_ModHandler.addCraftingRecipe( @@ -9676,18 +9676,30 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 480, 600, true); - generateFluidPipes(Materials.SpaceTime, Materials.SpaceTime.mName, 5300, 250000, 2147483647, true); - generateFluidMultiPipes(Materials.SpaceTime, Materials.SpaceTime.mName, 5305, 250000, 2147483647, true); generateFluidPipes( - Materials.TranscendentMetal, - Materials.TranscendentMetal.mName, + MaterialsUEVplus.SpaceTime, + MaterialsUEVplus.SpaceTime.mName, + 5300, + 250000, + 2147483647, + true); + generateFluidMultiPipes( + MaterialsUEVplus.SpaceTime, + MaterialsUEVplus.SpaceTime.mName, + 5305, + 250000, + 2147483647, + true); + generateFluidPipes( + MaterialsUEVplus.TranscendentMetal, + MaterialsUEVplus.TranscendentMetal.mName, 5310, 220000, 2147483647, true); generateFluidMultiPipes( - Materials.TranscendentMetal, - Materials.TranscendentMetal.mName, + MaterialsUEVplus.TranscendentMetal, + MaterialsUEVplus.TranscendentMetal.mName, 5315, 220000, 2147483647, diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java index a43cb8f89d..9bb65b2230 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java @@ -7,6 +7,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.multitileentity.MultiTileEntityBlock; import gregtech.api.multitileentity.MultiTileEntityRegistry; import gregtech.api.multitileentity.multiblock.base.WallShareablePart; @@ -74,7 +75,7 @@ public class GT_Loader_MultiTileEntities implements Runnable { .name("Inventory Upgrade LV") .category("MultiBlock Special Casing") .setBlock(casing) - .material(Materials.SpaceTime) + .material(MaterialsUEVplus.SpaceTime) .texture("metalwall") .upgradeInventorySize(16) .tier(1) diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.exciteddtsc.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.exciteddtsc.png Binary files differnew file mode 100644 index 0000000000..5b14154959 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.exciteddtsc.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.exciteddtsc.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.exciteddtsc.png.mcmeta new file mode 100644 index 0000000000..24f9c2fae3 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.exciteddtsc.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} |
