diff options
Diffstat (limited to 'src/main/java/gregtech/loaders/materialprocessing')
-rw-r--r-- | src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java | 2 | ||||
-rw-r--r-- | src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java index 1baf79e6d9..abf63abe29 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java @@ -3,6 +3,7 @@ package gregtech.loaders.materialprocessing; import gregtech.api.GregTech_API; import gregtech.api.enums.Dyes; import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TextureSet; public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandler { @@ -12,6 +13,7 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandle @Override public void onMaterialsInit() { + /** This is just left here as an example of how to add new materials. **/ int i = 0; for (int j = GregTech_API.sMaterialProperties.get("general", "AmountOfCustomMaterialSlots", 16); i < j; i++) { String aID = (i < 10 ? "0" : "") + i; diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index 68ee13322c..7ef9b42ef9 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java @@ -6,7 +6,7 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHandler { - public static boolean aTGregSupport = Loader.isModLoaded("TGregworks"); + public static boolean aTGregSupport = Loader.isModLoaded("TGregworks") || Loader.isModLoaded("dreamcraft"); public static boolean aEnableUBCMats = Loader.isModLoaded("UndergroundBiomes") || aTGregSupport; public static boolean aEnableThaumcraftMats = Loader.isModLoaded("Thaumcraft") || aTGregSupport; public static boolean aEnableRotaryCraftMats = Loader.isModLoaded("RotaryCraft") || aTGregSupport; @@ -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); @@ -29,7 +30,7 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa Materials.Erbium.mHasParentMod = false; Materials.Gadolinium.mHasParentMod = false; Materials.Holmium.mHasParentMod = false; - //Materials.Indium.mHasParentMod = false; + Materials.Indium.mHasParentMod = false; Materials.Lanthanum.mHasParentMod = false; Materials.Praseodymium.mHasParentMod = false; Materials.Promethium.mHasParentMod = false; @@ -41,11 +42,11 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa Materials.Terbium.mHasParentMod = false; Materials.Thulium.mHasParentMod = false; Materials.Ytterbium.mHasParentMod = false; - Materials.Endium.mHasParentMod = false; + Materials.HeeEndium.mHasParentMod = false; Materials.DarkIron.mHasParentMod = false; Materials.ElectrumFlux.mHasParentMod = false; Materials.Force.mHasParentMod = false; - Materials.Nikolite.mHasParentMod = false; + //Materials.Nikolite.mHasParentMod = false; Materials.Sunnarium.mHasParentMod = false; Materials.BlueAlloy.mHasParentMod = false; Materials.Vinteum.mHasParentMod = false; @@ -78,7 +79,7 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa Materials.ShadowIron.mHasParentMod = false; Materials.ShadowSteel.mHasParentMod = false; Materials.AstralSilver.mHasParentMod = false; - Materials.Midasium.mHasParentMod = false; + Materials.Trinium.mHasParentMod = false; } if (!aEnableThaumcraftMats) { Materials.Amber.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"); @@ -150,6 +154,6 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa @Override public void onComponentIteration(Materials aMaterial) { - //NOOP + //NOP } } |