aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java2
-rw-r--r--src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java132
2 files changed, 69 insertions, 65 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 5e889e2b8d..5f4d334607 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -261,7 +261,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
public static Materials Graphene = new Materials( 819, TextureSet.SET_DULL , 6.0F, 32, 1, 1 |64 , 128, 128, 128, 0, "Graphene" , "Graphene" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeGray , Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 2), new TC_AspectStack(TC_Aspects.ELECTRUM, 1)));
public static Materials Greenschist = new Materials( 866, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Greenschist" , "Green Schist" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeGreen );
public static Materials Greenstone = new Materials( 867, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Greenstone" , "Greenstone" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeGreen );
-////public static Materials Greywacke = new Materials( 868, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Greywacke" , "Greywacke" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeGray );
+ public static Materials Greywacke = new Materials( 897, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Greywacke" , "Greywacke" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeGray );
public static Materials Haderoth = new Materials( 963, TextureSet.SET_METALLIC , 10.0F, 3200, 3, 1|2 |8 |64 , 119, 52, 30, 0, "Haderoth" , "Haderoth" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL );
public static Materials Hematite = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 |8 , 255, 255, 255, 0, "Hematite" , "Hematite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL );
public static Materials Hepatizon = new Materials( 957, TextureSet.SET_METALLIC , 12.0F, 128, 2, 1|2 |8 |64 , 117, 94, 117, 0, "Hepatizon" , "Hepatizon" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL );
diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
index cf5e7ffa79..7ef9b42ef9 100644
--- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
+++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java
@@ -16,6 +16,7 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa
public static boolean aEnableGCMarsMats = Loader.isModLoaded("GalacticraftMars") || aTGregSupport;
public static boolean aEnableTwilightMats = Loader.isModLoaded(GT_Values.MOD_ID_TF) || aTGregSupport;
public static boolean aEnableMetallurgyMats = Loader.isModLoaded("Metallurgy") || aTGregSupport;
+ public static boolean aEnableProjectRedMats = Loader.isModLoaded("ProjRed|Core") || aTGregSupport;
public ProcessingModSupport() {
Materials.add(this);
@@ -25,60 +26,60 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa
public void onMaterialsInit() {
//Disable Materials if Parent Mod is not loaded
if (!aTGregSupport) {
- //Materials.Dysprosium.mHasParentMod = false;
- //Materials.Erbium.mHasParentMod = false;
- //Materials.Gadolinium.mHasParentMod = false;
- //Materials.Holmium.mHasParentMod = false;
- //Materials.Indium.mHasParentMod = false;
- //Materials.Lanthanum.mHasParentMod = false;
- //Materials.Praseodymium.mHasParentMod = false;
- //Materials.Promethium.mHasParentMod = false;
- //Materials.Rubidium.mHasParentMod = false;
- //Materials.Samarium.mHasParentMod = false;
- //Materials.Scandium.mHasParentMod = false;
- //Materials.Strontium.mHasParentMod = false;
- //Materials.Tellurium.mHasParentMod = false;
- //Materials.Terbium.mHasParentMod = false;
- //Materials.Thulium.mHasParentMod = false;
- //Materials.Ytterbium.mHasParentMod = false;
- //Materials.HeeEndium.mHasParentMod = false;
- //Materials.DarkIron.mHasParentMod = false;
- //Materials.ElectrumFlux.mHasParentMod = false;
- //Materials.Force.mHasParentMod = false;
+ Materials.Dysprosium.mHasParentMod = false;
+ Materials.Erbium.mHasParentMod = false;
+ Materials.Gadolinium.mHasParentMod = false;
+ Materials.Holmium.mHasParentMod = false;
+ Materials.Indium.mHasParentMod = false;
+ Materials.Lanthanum.mHasParentMod = false;
+ Materials.Praseodymium.mHasParentMod = false;
+ Materials.Promethium.mHasParentMod = false;
+ Materials.Rubidium.mHasParentMod = false;
+ Materials.Samarium.mHasParentMod = false;
+ Materials.Scandium.mHasParentMod = false;
+ Materials.Strontium.mHasParentMod = false;
+ Materials.Tellurium.mHasParentMod = false;
+ Materials.Terbium.mHasParentMod = false;
+ Materials.Thulium.mHasParentMod = false;
+ Materials.Ytterbium.mHasParentMod = false;
+ Materials.HeeEndium.mHasParentMod = false;
+ Materials.DarkIron.mHasParentMod = false;
+ Materials.ElectrumFlux.mHasParentMod = false;
+ Materials.Force.mHasParentMod = false;
//Materials.Nikolite.mHasParentMod = false;
- //Materials.Sunnarium.mHasParentMod = false;
- //Materials.BlueAlloy.mHasParentMod = false;
- //Materials.Vinteum.mHasParentMod = false;
- //Materials.ChromiumDioxide.mHasParentMod = false;
+ Materials.Sunnarium.mHasParentMod = false;
+ Materials.BlueAlloy.mHasParentMod = false;
+ Materials.Vinteum.mHasParentMod = false;
+ Materials.ChromiumDioxide.mHasParentMod = false;
}
if (!aEnableMetallurgyMats) {
- //Materials.Angmallen.mHasParentMod = false;
- //Materials.Atlarus.mHasParentMod = false;
- //Materials.Carmot.mHasParentMod = false;
- //Materials.Celenegil.mHasParentMod = false;
- //Materials.Ceruclase.mHasParentMod = false;
- //Materials.Eximite.mHasParentMod = false;
- //Materials.Haderoth.mHasParentMod = false;
- //Materials.Hepatizon.mHasParentMod = false;
- //Materials.Ignatius.mHasParentMod = false;
- //Materials.Infuscolium.mHasParentMod = false;
- //Materials.Inolashite.mHasParentMod = false;
- //Materials.Kalendrite.mHasParentMod = false;
- //Materials.Lemurite.mHasParentMod = false;
- //Materials.Meutoite.mHasParentMod = false;
- //Materials.Orichalcum.mHasParentMod = false;
- //Materials.Oureclase.mHasParentMod = false;
- //Materials.Prometheum.mHasParentMod = false;
- //Materials.Rubracium.mHasParentMod = false;
- //Materials.Sanguinite.mHasParentMod = false;
- //Materials.Tartarite.mHasParentMod = false;
- //Materials.Vulcanite.mHasParentMod = false;
- //Materials.Vyroxeres.mHasParentMod = false;
- //Materials.DeepIron.mHasParentMod = false;
- //Materials.ShadowIron.mHasParentMod = false;
- //Materials.ShadowSteel.mHasParentMod = false;
- //Materials.AstralSilver.mHasParentMod = false;
- //Materials.Trinium.mHasParentMod = false;
+ Materials.Angmallen.mHasParentMod = false;
+ Materials.Atlarus.mHasParentMod = false;
+ Materials.Carmot.mHasParentMod = false;
+ Materials.Celenegil.mHasParentMod = false;
+ Materials.Ceruclase.mHasParentMod = false;
+ Materials.Eximite.mHasParentMod = false;
+ Materials.Haderoth.mHasParentMod = false;
+ Materials.Hepatizon.mHasParentMod = false;
+ Materials.Ignatius.mHasParentMod = false;
+ Materials.Infuscolium.mHasParentMod = false;
+ Materials.Inolashite.mHasParentMod = false;
+ Materials.Kalendrite.mHasParentMod = false;
+ Materials.Lemurite.mHasParentMod = false;
+ Materials.Meutoite.mHasParentMod = false;
+ Materials.Orichalcum.mHasParentMod = false;
+ Materials.Oureclase.mHasParentMod = false;
+ Materials.Prometheum.mHasParentMod = false;
+ Materials.Rubracium.mHasParentMod = false;
+ Materials.Sanguinite.mHasParentMod = false;
+ Materials.Tartarite.mHasParentMod = false;
+ Materials.Vulcanite.mHasParentMod = false;
+ Materials.Vyroxeres.mHasParentMod = false;
+ Materials.DeepIron.mHasParentMod = false;
+ Materials.ShadowIron.mHasParentMod = false;
+ Materials.ShadowSteel.mHasParentMod = false;
+ Materials.AstralSilver.mHasParentMod = false;
+ Materials.Trinium.mHasParentMod = false;
}
if (!aEnableThaumcraftMats) {
Materials.Amber.mHasParentMod = false;
@@ -94,16 +95,16 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa
Materials.InfusedDull.mHasParentMod = false;
}
if (!aEnableUBCMats) {
- //Materials.Blueschist.mHasParentMod = false;
- //Materials.Chert.mHasParentMod = false;
- //Materials.Dacite.mHasParentMod = false;
- //Materials.Eclogite.mHasParentMod = false;
- //Materials.Gabbro.mHasParentMod = false;
- //Materials.Gneiss.mHasParentMod = false;
- //Materials.Greenschist.mHasParentMod = false;
- //Materials.Greywacke.mHasParentMod = false;
- //Materials.Komatiite.mHasParentMod = false;
- //Materials.Rhyolite.mHasParentMod = false;
+ Materials.Blueschist.mHasParentMod = false;
+ Materials.Chert.mHasParentMod = false;
+ Materials.Dacite.mHasParentMod = false;
+ Materials.Eclogite.mHasParentMod = false;
+ Materials.Gabbro.mHasParentMod = false;
+ Materials.Gneiss.mHasParentMod = false;
+ Materials.Greenschist.mHasParentMod = false;
+ Materials.Greywacke.mHasParentMod = false;
+ Materials.Komatiite.mHasParentMod = false;
+ Materials.Rhyolite.mHasParentMod = false;
}
if (!aEnableTwilightMats) {
Materials.FierySteel.mHasParentMod = false;
@@ -118,11 +119,11 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa
Materials.MeteoricSteel.mHasParentMod = false;
}
if (!aEnableThermalFoundationMats) {
- //Materials.Blizz.mHasParentMod = false;
- //Materials.Enderium.mHasParentMod = false;
+ Materials.Blizz.mHasParentMod = false;
+ Materials.Enderium.mHasParentMod = false;
}
if (!aEnableRotaryCraftMats) {
- //Materials.HSLA.mHasParentMod = false;
+ Materials.HSLA.mHasParentMod = false;
}
if (!aEnableEnderIOMats) {
Materials.DarkSteel.mHasParentMod = false;
@@ -130,6 +131,9 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa
if (!aEnableRailcraftMats) {
Materials.Firestone.mHasParentMod = false;
}
+ if(!aEnableProjectRedMats){
+ Materials.Electrotine.mHasParentMod = false;
+ }
//Enable Materials if correct mod is Loaded
Materials.ChromiumDioxide.mHasParentMod = Loader.isModLoaded("computronics");
generated by cgit (git 2.46.0) at 2025-03-06 19:58:07 +0000