aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
diff options
context:
space:
mode:
authorGDCloud <93287602+GDCloudstrike@users.noreply.github.com>2023-04-21 19:09:47 +0200
committerGitHub <noreply@github.com>2023-04-21 19:09:47 +0200
commit285a75535d07f2037967b1208a5840fb81719514 (patch)
tree4e5fee76309ae7f184479306e452b8ce82491bca /src/main/java/gregtech/api/enums
parent28edf90a21fb9e281ce06c8d77ab4b05a818eaf8 (diff)
downloadGT5-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/java/gregtech/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java46
-rw-r--r--src/main/java/gregtech/api/enums/MaterialsUEVplus.java498
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java64
3 files changed, 543 insertions, 65 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