From 65e0b3028e016011ade0b254ab611a0dae73fd35 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sat, 6 May 2017 00:41:06 +0200 Subject: [PATCH] remove this material dependencies --- .../java/gregtech/api/enums/Materials.java | 2 +- .../ProcessingModSupport.java | 126 +++++++++--------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 24a3c86f..5e889e2b 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -240,7 +240,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials Drulloy = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|16 , 255, 255, 255, 0, "Drulloy" , "Drulloy" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeRed ); public static Materials Duranium = new Materials( 328, TextureSet.SET_METALLIC , 16.0F, 5120, 5, 1|2 |64 , 255, 255, 255, 0, "Duranium" , "Duranium" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray ); public static Materials Eclogite = new Materials( 860, TextureSet.SET_DULL , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Eclogite" , "Eclogite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL ); - public static Materials ElectrumFlux = new Materials( 320, TextureSet.SET_SHINY , 16.0F, 512, 3, 1|2 |64 , 255, 255, 120, 0, "ElectrumFlux" , "Fluxed Electrum" , 0, 0, 9000,29000, true, false, 1, 1, 1, Dyes.dyeYellow ); + public static Materials ElectrumFlux = new Materials( 320, TextureSet.SET_SHINY , 16.0F, 512, 3, 1|2 |8 |64|128 , 255, 255, 120, 0, "ElectrumFlux" , "Fluxed Electrum" , 0, 0, 9000,29000, true, false, 1, 1, 1, Dyes.dyeYellow ); public static Materials Emery = new Materials( 861, TextureSet.SET_DULL , 1.0F, 0, 2, 1 |8 , 255, 255, 255, 0, "Emery" , "Emery" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL ); //\/public static Materials Enderium = new Materials( 321, TextureSet.SET_DULL , 8.0F, 1500, 3, 1|2 |64|128 , 89, 145, 135, 0, "Enderium" , "Enderium" , 0, 0, 4500,24500, true, false, 1, 1, 1, Dyes.dyeGreen , 1, Arrays.asList(new MaterialStack(EnderiumBase, 2), new MaterialStack(Thaumium, 1), new MaterialStack(EnderPearl, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ALIENIS, 1))); public static Materials EnderiumBase = new Materials( 380, TextureSet.SET_DULL , 16.0F, 768, 4, 1|2 |64|128 , 72, 119, 153, 0, "EnderiumBase" , "Enderium Base" , 0, 0, 3600,23600, true, false, 1, 1, 1, Dyes.dyeGreen , 1, Arrays.asList(new MaterialStack(Tin, 2), new MaterialStack(Silver, 1), new MaterialStack(Platinum, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ALIENIS, 1))); diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index b18b28dc..3b6225d9 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java @@ -25,60 +25,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.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.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; } 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 +94,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.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.Komatiite.mHasParentMod = false; + //Materials.Rhyolite.mHasParentMod = false; } if (!aEnableTwilightMats) { Materials.FierySteel.mHasParentMod = false; @@ -118,11 +118,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;