From e9aee5637c9d77ecc21cf95d90292ccf7a654764 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Thu, 5 Sep 2024 22:15:33 +0200 Subject: UEV+ Material Diversity (#3045) --- src/main/java/gregtech/api/enums/Materials.java | 32 ++++++- .../java/gregtech/api/enums/MaterialsUEVplus.java | 90 ++++++++++++++++++++ src/main/java/gregtech/api/enums/OrePrefixes.java | 98 ++++++++++++++++++++++ 3 files changed, 219 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/enums') diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index e29a03bea4..9949a61cfd 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1989,6 +1989,21 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { MaterialsUEVplus.SixPhasedCopper.mChemicalFormula = "\u2722"; MaterialsUEVplus.Mellion.mChemicalFormula = "Tn\u2081\u2081Or\u2088Rb\u2081\u2081?\u2087?\u2081\u2083?\u2081\u2083"; MaterialsUEVplus.Creon.mChemicalFormula = "\u2E0E"; + Tartarite.mChemicalFormula = "Tt"; + MaterialsUEVplus.TranscendentMetal.mChemicalFormula = "TsЖ"; + // I hate this + MaterialsUEVplus.MoltenProtoHalkoniteBase.mChemicalFormula = "(" + + MaterialsUEVplus.TranscendentMetal.mChemicalFormula + + ")\u2082" + + "(W\u2088Nq*\u2087(" + + Materials.Bedrockium.mChemicalFormula + + ")\u2084C\u2084V\u2083SpPu)\u2082" + + Tartarite.mChemicalFormula + + "\u2082" + + "((CW)\u2087Ti\u2083)\u2083???" + + "If*"; + MaterialsUEVplus.HotProtoHalkonite.mChemicalFormula = MaterialsUEVplus.MoltenProtoHalkoniteBase.mChemicalFormula; + MaterialsUEVplus.ProtoHalkonite.mChemicalFormula = MaterialsUEVplus.MoltenProtoHalkoniteBase.mChemicalFormula; } private static void initSubTags() { @@ -1998,6 +2013,15 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { .addTo(Magnetite, VanadiumMagnetite, BasalticMineralSand, GraniticMineralSand); SubTag.NO_RECIPES.addTo(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + SubTag.NO_RECIPES.addTo(MaterialsUEVplus.HotProtoHalkonite); + SubTag.NO_RECIPES.addTo(MaterialsUEVplus.ProtoHalkonite); + MaterialsUEVplus.HotProtoHalkonite.remove(SubTag.SMELTING_TO_FLUID); + MaterialsUEVplus.ProtoHalkonite.remove(SubTag.SMELTING_TO_FLUID); + + SubTag.NO_RECIPES.addTo(MaterialsUEVplus.HotExoHalkonite); + SubTag.NO_RECIPES.addTo(MaterialsUEVplus.ExoHalkonite); + MaterialsUEVplus.HotExoHalkonite.remove(SubTag.SMELTING_TO_FLUID); + MaterialsUEVplus.ExoHalkonite.remove(SubTag.SMELTING_TO_FLUID); SubTag.ELECTROMAGNETIC_SEPERATION_IRON.addTo( YellowLimonite, @@ -2251,7 +2275,11 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { TengamPurified, TengamAttuned, MaterialsUEVplus.Eternity, - MaterialsUEVplus.MagMatter); + MaterialsUEVplus.MagMatter, + MaterialsUEVplus.HotProtoHalkonite, + MaterialsUEVplus.ProtoHalkonite, + MaterialsUEVplus.HotExoHalkonite, + MaterialsUEVplus.ExoHalkonite); SubTag.FOOD.addTo( MeatRaw, @@ -2533,6 +2561,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { MaterialsUEVplus.MagMatter.renderer = new InfinityRenderer(); MaterialsUEVplus.SixPhasedCopper.renderer = new GlitchEffectRenderer(); MaterialsUEVplus.GravitonShard.renderer = new InfinityRenderer(); + MaterialsUEVplus.ExoHalkonite.renderer = new InfinityRenderer(); + MaterialsUEVplus.HotExoHalkonite.renderer = new InfinityRenderer(); } private static void fillGeneratedMaterialsMap() { diff --git a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java index 49ab432c5f..d13fe68a47 100644 --- a/src/main/java/gregtech/api/enums/MaterialsUEVplus.java +++ b/src/main/java/gregtech/api/enums/MaterialsUEVplus.java @@ -750,6 +750,96 @@ public class MaterialsUEVplus { .disableAutoGeneratedBlastFurnaceRecipes() .disableAutoGeneratedVacuumFreezerRecipe(); + public static Materials DimensionallyShiftedSuperfluid = new MaterialBuilder( + 151, + new TextureSet("dimensionallyshiftedsuperfluid", true), + "Dimensionally Shifted Superfluid").addCell() + .addFluid() + .setRGBA(255, 255, 255, 0) + .setTransparent(true) + .setName("dimensionallyshiftedsuperfluid") + .setColor(Dyes._NULL) + .constructMaterial() + .setHasCorrespondingFluid(true); + + public static Materials MoltenProtoHalkoniteBase = new MaterialBuilder( + 152, + new TextureSet("protohalkonitebase", true), + "Molten Proto-Halkonite Steel Base").setName("protohalkonitebase") + .addFluid() + .addCell() + .setLiquidTemperature(10000) + .setRGBA(255, 255, 255, 0) + .setTransparent(true) + .setColor(Dyes._NULL) + .constructMaterial() + .disableAutoGeneratedVacuumFreezerRecipe() + .disableAutoGeneratedBlastFurnaceRecipes() + .disableAutoGeneratedRecycleRecipes(); + public static Materials HotProtoHalkonite = new MaterialBuilder( + 153, + new TextureSet("hotprotohalkonite", true), + "Hot Proto-Halkonite Steel").setName("hotprotohalkonite") + .setTypes(1 | 2 | 64 | 128) + .setOreValue(2) + .setRGBA(255, 255, 255, 0) + .setTransparent(false) + .constructMaterial() + .setProcessingMaterialTierEU(TierEU.RECIPE_UEV) + .disableAutoGeneratedVacuumFreezerRecipe() + .disableAutoGeneratedBlastFurnaceRecipes() + .disableAutoGeneratedRecycleRecipes(); + public static Materials ProtoHalkonite = new MaterialBuilder( + 154, + new TextureSet("protohalkonite", true), + "Proto-Halkonite Steel").setName("protohalkonite") + .setTypes(1 | 2 | 64 | 128) + .setRGBA(255, 255, 255, 0) + .setTransparent(false) + .constructMaterial() + .setProcessingMaterialTierEU(TierEU.RECIPE_UEV) + .disableAutoGeneratedVacuumFreezerRecipe() + .disableAutoGeneratedBlastFurnaceRecipes(); + + public static Materials MoltenExoHalkoniteBase = new MaterialBuilder( + 155, + TextureSet.SET_FLUID, + "Molten Exo-Halkonite Steel Preparation Base").setName("moltenexohalkonitebase") + .addFluid() + .addCell() + .setLiquidTemperature(10000) + .setRGBA(30, 30, 30, 0) + .setTransparent(false) + .constructMaterial() + .disableAutoGeneratedVacuumFreezerRecipe() + .disableAutoGeneratedBlastFurnaceRecipes() + .disableAutoGeneratedRecycleRecipes(); + + public static Materials HotExoHalkonite = new MaterialBuilder( + 156, + new TextureSet("hotexohalkonite", true), + "Hot Exo-Halkonite Steel").setName("hotexohalkonite") + .setTypes(1 | 2 | 64 | 128) + .setOreValue(2) + .setRGBA(255, 255, 255, 0) + .setTransparent(false) + .constructMaterial() + .setProcessingMaterialTierEU(TierEU.RECIPE_UEV) + .disableAutoGeneratedVacuumFreezerRecipe() + .disableAutoGeneratedBlastFurnaceRecipes() + .disableAutoGeneratedRecycleRecipes(); + public static Materials ExoHalkonite = new MaterialBuilder( + 157, + new TextureSet("exohalkonite", true), + "Exo-Halkonite Steel").setName("exohalkonite") + .setTypes(1 | 2 | 64 | 128) + .setRGBA(255, 255, 255, 0) + .setTransparent(false) + .constructMaterial() + .setProcessingMaterialTierEU(TierEU.RECIPE_UEV) + .disableAutoGeneratedVacuumFreezerRecipe() + .disableAutoGeneratedBlastFurnaceRecipes(); + /** * called by Materials. Can be safely called multiple times. exists to allow Materials ensure this class is * initialized diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index f757d34a7b..7af17351b9 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -704,6 +704,80 @@ public enum OrePrefixes { dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); dustTiny.mNotGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + plateTriple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + cell.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + ingotQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + ingotQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + dust.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + dustTiny.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + spring.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + springSmall.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + nugget.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + itemCasing.mNotGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + + plateTriple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + cell.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + ingotQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + ingotQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + dust.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + dustTiny.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + spring.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + springSmall.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + nugget.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + itemCasing.mNotGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + + plateDouble.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + plateTriple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + cell.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + ingotQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + ingotQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + dust.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + dustTiny.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + spring.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + springSmall.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + nugget.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + itemCasing.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + + plateDouble.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + plateTriple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + plateQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + plateQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + cell.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + ingotDouble.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + ingotTriple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + ingotQuadruple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + ingotQuintuple.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + turbineBlade.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + dust.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + dustSmall.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + dustTiny.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + spring.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + springSmall.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + nugget.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + itemCasing.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + + // When Exo-Halkonite is added, remove this. + plateSuperdense.mNotGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + plateSuperdense.mNotGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + cell.disableComponent(MaterialsUEVplus.GravitonShard); // ingot.mNotGeneratedItems.add(Materials.Ichorium); @@ -794,6 +868,30 @@ public enum OrePrefixes { frame.mGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); frameGt.mGeneratedItems.add(MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter); + gear.mGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + ingot.mGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + toolHeadHammer.mGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + frame.mGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + frameGt.mGeneratedItems.add(MaterialsUEVplus.HotProtoHalkonite); + + gear.mGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + ingot.mGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + toolHeadHammer.mGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + frame.mGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + frameGt.mGeneratedItems.add(MaterialsUEVplus.ProtoHalkonite); + + gear.mGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + ingot.mGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + toolHeadHammer.mGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + frame.mGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + frameGt.mGeneratedItems.add(MaterialsUEVplus.HotExoHalkonite); + + gear.mGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + ingot.mGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + toolHeadHammer.mGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + frame.mGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + frameGt.mGeneratedItems.add(MaterialsUEVplus.ExoHalkonite); + gem.mGeneratedItems.add(MaterialsUEVplus.GravitonShard); dust.mGeneratedItems.addAll(dustPure.mGeneratedItems); -- cgit