diff options
Diffstat (limited to 'src/main/java/gregtech/loaders/materialprocessing')
| -rw-r--r-- | src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java | 3 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java | 18 |
2 files changed, 13 insertions, 8 deletions
diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java index 1cb9c8987d..e8e8dea769 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java @@ -12,10 +12,11 @@ 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; - new Materials(-1, TextureSet.SET_METALLIC, 1.0F, 0, 0, 0, 255, 255, 255, 0, GregTech_API.sMaterialProperties.get("materials.custom." + aID, "MaterialName", "CustomOre" + aID).replace(" ", "").replace("-", ""), "CustomMat" + aID, 0, 0, 0, 0, false, false, 1, 1, 1, Dyes._NULL, "custom", true, aID); + new Materials(-1, TextureSet.SET_METALLIC, 1.0F, 0, 0, 0, 255, 255, 255, 0, "CustomMat" + aID, "CustomMat" + aID, 0, 0, 0, 0, false, false, 1, 1, 1, Dyes._NULL, "custom", true, aID); } } diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index 9df8bc056a..3bceca3533 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,23 +30,24 @@ 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; Materials.Rubidium.mHasParentMod = false; Materials.Samarium.mHasParentMod = false; + Materials.SamariumMagnetic.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.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,8 +80,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.Adamantium.mHasParentMod = false; + Materials.Trinium.mHasParentMod = false; } if (!aEnableThaumcraftMats) { Materials.Amber.mHasParentMod = false; @@ -131,6 +132,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"); @@ -151,6 +155,6 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa @Override public void onComponentIteration(Materials aMaterial) { - //NOOP + //NOP } } |