aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/Element.java9
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java7
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java34
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java5
4 files changed, 38 insertions, 17 deletions
diff --git a/src/main/java/gregtech/api/enums/Element.java b/src/main/java/gregtech/api/enums/Element.java
index 72b2adfab8..5eadd70960 100644
--- a/src/main/java/gregtech/api/enums/Element.java
+++ b/src/main/java/gregtech/api/enums/Element.java
@@ -135,9 +135,10 @@ public enum Element {
Tn(125, 198, 0, -1, null, "Tritanium", false),
SpFe(26, 42, 0, -1, null, "Meteoric Iron", false),
- De(22, 27, 0, -1, null, "Desh", false),
+ De(22, 27, 0, -1, null, "Desh", false),
Oh(76, 125, 0, -1, null, "Oriharukon", false),
-
+ Di(500, 500, 0, -1, null, "Dimensionally Transcendent Matter", false),
+
Ma(0, 0, 100, -1, null, "Magic", false),
Nq(130, 200, 0, -1, null, "Naquadah", false),
Nt(0, 1000, 0, -1, null, "Neutronium", false),
@@ -266,9 +267,9 @@ public enum Element {
$Ts(-117, -177, 0, -1, null, "Anti-Tenness", false),
$Og(-118, -176, 0, -1, null, "Anti-Oganesson", false),
$Tn(-125, -198, 0, -1, null, "Anti-Tritanium", false),
-
+
$SpFe(-26, -42, 0, -1, null, "Anti-Meteoric Iron", true),
- $De(-22, -27, 0, -1, null, "Anti-Desh", true),
+ $De(-22, -27, 0, -1, null, "Anti-Desh", true),
$Oh(-76, -125, 0, -1, null, "Anti-Oriharukon", true),
$Ma(0, 0, -100, -1, null, "Anti-Magic", false),
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 2c1aacf3b1..46f18a4999 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -795,9 +795,9 @@ public enum ItemList implements IItemContainer {
Casing_MAX,
Casing_BronzePlatedBricks,
Casing_HeatProof,
- Casing_Coil_Cupronickel_Deprecated,
- Casing_Coil_Kanthal_Deprecated,
- Casing_Coil_Nichrome_Deprecated,
+ Casing_Dim_Trans,
+ Casing_Dim_Injector,
+ Casing_Dim_Bridge,
Casing_Coil_Superconductor,
Casing_SolidSteel,
@@ -1083,6 +1083,7 @@ public enum ItemList implements IItemContainer {
Machine_Multi_LargeBoiler_Titanium,
Machine_Multi_LargeBoiler_TungstenSteel,
Machine_Multi_BlastFurnace,
+ Machine_Multi_PlasmaForge,
Machine_Multi_ImplosionCompressor,
Machine_Multi_VacuumFreezer,
Machine_Multi_Furnace,
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 2dc29af7ab..4a66779a58 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -363,7 +363,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
public static Materials Ethanol = new Materials( 706, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 128, 0, 0, "Ethanol" , "Ethanol" , 0, 192, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , 1, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.VENENUM, 1), new TC_AspectStack(TC_Aspects.AQUA, 1)));
public static Materials FishOil = new Materials( 711, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 196, 0, 0, "FishOil" , "Fish Oil" , 3, 2, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow , Arrays.asList(new TC_AspectStack(TC_Aspects.CORPUS, 2)));
public static Materials FermentedBiomass = new MaterialBuilder(691, TextureSet.SET_FLUID , "Fermented Biomass").addCell().addFluid().setRGB(68, 85, 0).setColor(Dyes.dyeBrown).constructMaterial();
- public static Materials Fuel = new Materials( 708, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Fuel" , "Diesel" , 0, 480, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow );
+ public static Materials Fuel = new Materials( 708, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Fuel" , "Diesel" , 0, 480, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow );
public static Materials Glue = new Materials( 726, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 200, 196, 0, 0, "Glue" , "Refined Glue" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , Arrays.asList(new TC_AspectStack(TC_Aspects.LIMUS, 2)));
public static Materials Gunpowder = new Materials( 800, TextureSet.SET_DULL , 1.0F, 0, 0, 1 , 128, 128, 128, 0, "Gunpowder" , "Gunpowder" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeGray , Arrays.asList(new TC_AspectStack(TC_Aspects.PERDITIO, 3), new TC_AspectStack(TC_Aspects.IGNIS, 4)));
public static Materials FryingOilHot = new Materials( 727, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 200, 196, 0, 0, "FryingOilHot" , "Hot Frying Oil" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , Arrays.asList(new TC_AspectStack(TC_Aspects.AQUA, 1), new TC_AspectStack(TC_Aspects.IGNIS, 1)));
@@ -846,6 +846,20 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
public static Materials SuperCoolant = new MaterialBuilder( -1, TextureSet.SET_DULL,"Super Coolant").setRGB(2, 91, 111).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, 100000000, 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, 100000000, 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, 100000000, 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, 100000000, 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, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 0, 0, 255, 240, "SpaceTime" , "SpaceTime" , -1, -1, 14, 0, false, true, 2, 1, 1, Dyes.dyeBlue , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1)));
+
/**
* Materials which are renamed automatically
*/
@@ -964,10 +978,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
mEnchantmentArmorsLevel = 0,
mToolQuality = 0;
public short
- mMeltingPoint = 0,
- mBlastFurnaceTemp = 0,
- mGasTemp = 0;
+ mBlastFurnaceTemp = 0;
public int
+ mMeltingPoint = 0,
+ mGasTemp = 0,
mMetaItemSubID,
mTypes = 0,
mDurability = 16,
@@ -1082,7 +1096,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
*/
public Materials(int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aDurability, int aToolQuality, int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType, int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent, int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, String aConfigSection, boolean aCustomOre, String aCustomID) {
this(aMetaItemSubID, aIconSet, aToolSpeed, aDurability, aToolQuality, true, aName, aDefaultLocalName, aConfigSection, aCustomOre, aCustomID);
- mMeltingPoint = (short) aMeltingPoint;
+ mMeltingPoint = aMeltingPoint;
mBlastFurnaceRequired = aBlastFurnaceRequired;
mBlastFurnaceTemp = (short) aBlastFurnaceTemp;
mTransparent = aTransparent;
@@ -1603,6 +1617,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
//Pentacadmiummagneiumhexaoxid.mChemicalFormula="Cd5MgO6";
CosmicNeutronium.mChemicalFormula = "SpNt";
Aluminiumhydroxide.mChemicalFormula = "Al\u0028OH\u0029\u2083";
+
+ SpaceTime.mChemicalFormula = "Reality itself distilled into liquid form";
}
private static void initSubTags() {
@@ -2182,10 +2198,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
}
private static void addTemperatureValues(Materials aMaterial, String aConfigPath) {
- aMaterial.mMeltingPoint = (short) GregTech_API.sMaterialProperties.get(aConfigPath, "MeltingPoint", aMaterial.mMeltingPoint);
+ aMaterial.mMeltingPoint = GregTech_API.sMaterialProperties.get(aConfigPath, "MeltingPoint", aMaterial.mMeltingPoint);
aMaterial.mBlastFurnaceRequired = GregTech_API.sMaterialProperties.get(aConfigPath, "BlastFurnaceRequired", aMaterial.mBlastFurnaceRequired);
aMaterial.mBlastFurnaceTemp = (short) GregTech_API.sMaterialProperties.get(aConfigPath, "BlastFurnaceTemp", aMaterial.mBlastFurnaceTemp);
- aMaterial.mGasTemp = (short) GregTech_API.sMaterialProperties.get(aConfigPath, "GasTemp", aMaterial.mGasTemp);
+ aMaterial.mGasTemp = GregTech_API.sMaterialProperties.get(aConfigPath, "GasTemp", aMaterial.mGasTemp);
aMaterial.setHeatDamage((float) GregTech_API.sMaterialProperties.get(aConfigPath, "HeatDamage", aMaterial.mHeatDamage));
}
@@ -2761,7 +2777,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
}
public Materials setLiquidTemperature(int liquidTemperature) {
- this.mMeltingPoint = (short) liquidTemperature;
+ this.mMeltingPoint = liquidTemperature;
return this;
}
@@ -2770,7 +2786,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
}
public Materials setGasTemperature(int gasTemperature) {
- this.mGasTemp = (short) gasTemperature;
+ this.mGasTemp = gasTemperature;
return this;
}
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index 960a6b6a07..7e917b7db4 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -235,6 +235,9 @@ public class Textures {
MACHINE_MAX_BOTTOM,
MACHINE_BRONZEPLATEDBRICKS,
MACHINE_HEATPROOFCASING,
+ MACHINE_DIM_TRANS_CASING,
+ MACHINE_DIM_INJECTOR,
+ MACHINE_DIM_BRIDGE,
MACHINE_COIL_SUPERCONDUCTOR,
MACHINE_BRONZEBLASTFURNACE,
@@ -308,7 +311,7 @@ public class Textures {
MACHINE_CASING_FIREBOX_STEEL,
MACHINE_CASING_FIREBOX_TUNGSTENSTEEL,
MACHINE_CASING_ENGINE_INTAKE,
- MACHINE_CASING_EXTREME_ENGINE_INTAKE,//changed color in a terrible way
+ MACHINE_CASING_EXTREME_ENGINE_INTAKE, //changed color in a terrible way
MACHINE_CASING_CHEMICALLY_INERT,
MACHINE_COIL_CUPRONICKEL,
generated by cgit (git 2.46.0) at 2025-06-01 06:13:07 +0000