From a0066b4a261acd9ddcdf60531e9dc72b53a97f4c Mon Sep 17 00:00:00 2001 From: Muramasa Date: Sun, 21 Aug 2016 11:57:36 +0100 Subject: General cleanup & MaterialProcessing --- .../materialprocessing/ProcessingConfig.java | 21 ++++++++++++++++++ .../loaders/materialprocessing/ProcessingTest.java | 25 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java create mode 100644 src/main/java/gregtech/loaders/materialprocessing/ProcessingTest.java (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java new file mode 100644 index 0000000000..96dab0776c --- /dev/null +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java @@ -0,0 +1,21 @@ +package gregtech.loaders.materialprocessing; + +import gregtech.api.GregTech_API; +import gregtech.api.enums.Dyes; +import gregtech.api.enums.Materials; +import gregtech.api.enums.TextureSet; + +public class ProcessingConfig implements gregtech.api.interfaces.IMaterialRegistrator { + public ProcessingConfig() { + Materials.add(this); + } + + @Override + public void onMaterialsInit() { + 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, "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/ProcessingTest.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingTest.java new file mode 100644 index 0000000000..afa95f5f1c --- /dev/null +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingTest.java @@ -0,0 +1,25 @@ +package gregtech.loaders.materialprocessing; + +import gregtech.api.GregTech_API; +import gregtech.api.enums.Dyes; +import gregtech.api.enums.Materials; +import gregtech.api.enums.TextureSet; + +public class ProcessingTest implements gregtech.api.interfaces.IMaterialRegistrator { + public ProcessingTest() { + Materials.add(this); + } + + /** + * Just a test class to fill the empty spaces in sGeneratedMaterials for performance testing. + * This is disabled in GT_Loader_MaterialProcessing, but can be enabled for testing. + */ + @Override + public void onMaterialsInit() { + for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) { + if (!Materials.USED_IDS.contains(i)) { + new Materials(i, TextureSet.SET_NONE, 1.0F, 0, 2, 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, 92, 0, 168, 0, "TestMat" + i, 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL, "testmat"); + } + } + } +} -- cgit From a987228a6a1b4faae950edb5c4ba3a3df620b9e4 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Mon, 22 Aug 2016 11:39:04 +0100 Subject: Small fixes --- src/main/java/gregtech/loaders/materialprocessing/ProcessingTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingTest.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingTest.java index afa95f5f1c..f3ac6d0dcb 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingTest.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingTest.java @@ -17,8 +17,8 @@ public class ProcessingTest implements gregtech.api.interfaces.IMaterialRegistra @Override public void onMaterialsInit() { for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) { - if (!Materials.USED_IDS.contains(i)) { - new Materials(i, TextureSet.SET_NONE, 1.0F, 0, 2, 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, 92, 0, 168, 0, "TestMat" + i, 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL, "testmat"); + if (!Materials.getUsedIds().contains(i)) { + new Materials(i, TextureSet.SET_NONE, 1.0F, 0, 2, 1|2|4|8|16|32|64|128, 92, 0, 168, 0, "TestMat" + i, 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL, "testmat"); } } } -- cgit From 5a94ea039ba265d966aaa7872aecb79a4851769d Mon Sep 17 00:00:00 2001 From: Muramasa Date: Mon, 22 Aug 2016 22:31:19 +0100 Subject: Some cleanup --- .../loaders/materialprocessing/ProcessingTest.java | 25 ---------------------- 1 file changed, 25 deletions(-) delete mode 100644 src/main/java/gregtech/loaders/materialprocessing/ProcessingTest.java (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingTest.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingTest.java deleted file mode 100644 index f3ac6d0dcb..0000000000 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package gregtech.loaders.materialprocessing; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.Dyes; -import gregtech.api.enums.Materials; -import gregtech.api.enums.TextureSet; - -public class ProcessingTest implements gregtech.api.interfaces.IMaterialRegistrator { - public ProcessingTest() { - Materials.add(this); - } - - /** - * Just a test class to fill the empty spaces in sGeneratedMaterials for performance testing. - * This is disabled in GT_Loader_MaterialProcessing, but can be enabled for testing. - */ - @Override - public void onMaterialsInit() { - for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) { - if (!Materials.getUsedIds().contains(i)) { - new Materials(i, TextureSet.SET_NONE, 1.0F, 0, 2, 1|2|4|8|16|32|64|128, 92, 0, 168, 0, "TestMat" + i, 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL, "testmat"); - } - } - } -} -- cgit From c66db54eab5571fa9b9ce3cef0849050138e22a6 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Tue, 23 Aug 2016 16:39:20 +0100 Subject: Fixes & work on #266 --- .../loaders/materialprocessing/ProcessingComponents.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/main/java/gregtech/loaders/materialprocessing/ProcessingComponents.java (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingComponents.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingComponents.java new file mode 100644 index 0000000000..1fef19dd6e --- /dev/null +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingComponents.java @@ -0,0 +1,14 @@ +package gregtech.loaders.materialprocessing; + +import gregtech.api.enums.Materials; + +public class ProcessingComponents implements gregtech.api.interfaces.IComponentRegistrator { + public ProcessingComponents() { + Materials.add(this); + } + + @Override + public void registerComponents(Materials aMaterial) { + //Disable components by default + } +} -- cgit From 415e683a4399584e2ce0ab3f50fb191fd4992945 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Wed, 31 Aug 2016 02:22:51 +0100 Subject: Configurable components & fixes --- .../loaders/materialprocessing/ProcessingComponents.java | 14 -------------- .../loaders/materialprocessing/ProcessingConfig.java | 7 ++++++- 2 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 src/main/java/gregtech/loaders/materialprocessing/ProcessingComponents.java (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingComponents.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingComponents.java deleted file mode 100644 index 1fef19dd6e..0000000000 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingComponents.java +++ /dev/null @@ -1,14 +0,0 @@ -package gregtech.loaders.materialprocessing; - -import gregtech.api.enums.Materials; - -public class ProcessingComponents implements gregtech.api.interfaces.IComponentRegistrator { - public ProcessingComponents() { - Materials.add(this); - } - - @Override - public void registerComponents(Materials aMaterial) { - //Disable components by default - } -} diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java index 96dab0776c..440db2e124 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java @@ -15,7 +15,12 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialRegist 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, "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); } } + + @Override + public void onComponentRegistration(Materials aMaterial) { + //NOOP + } } -- cgit From f53fb2b84b32a9f55b6be8d84a9afc016c21e4d0 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Fri, 9 Sep 2016 14:25:59 +0100 Subject: Bugfixes and now using built in OrePrefixes enabled/disabled lists --- src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java index 440db2e124..77aa27e98f 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java @@ -5,7 +5,7 @@ import gregtech.api.enums.Dyes; import gregtech.api.enums.Materials; import gregtech.api.enums.TextureSet; -public class ProcessingConfig implements gregtech.api.interfaces.IMaterialRegistrator { +public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandler { public ProcessingConfig() { Materials.add(this); } -- cgit From 23546a5c2c2a6edc75eb32d8c179e63dc8df3930 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Fri, 16 Sep 2016 15:01:37 +0100 Subject: Stop disabled component recipe gen, more separation and fixes --- .../java/gregtech/loaders/materialprocessing/ProcessingConfig.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java index 77aa27e98f..51f54b3753 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 { @@ -21,6 +22,10 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandle @Override public void onComponentRegistration(Materials aMaterial) { - //NOOP + switch (aMaterial.mName) { + case "Cobalt": + OrePrefixes.spring.mGeneratedItems.add(aMaterial); + break; + } } } -- cgit From 291839871e1233ba0c72e48cf16847246a1ccc7c Mon Sep 17 00:00:00 2001 From: Muramasa Date: Fri, 23 Sep 2016 02:28:29 +0100 Subject: Reduce disabled component creation & GT_Proxy postInit -> Processors --- .../gregtech/loaders/materialprocessing/ProcessingConfig.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java index 51f54b3753..4f9d3484ec 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java @@ -24,7 +24,16 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandle public void onComponentRegistration(Materials aMaterial) { switch (aMaterial.mName) { case "Cobalt": - OrePrefixes.spring.mGeneratedItems.add(aMaterial); + OrePrefixes.spring.mDisabledMaterials.remove(aMaterial); + OrePrefixes.ingotDouble.mDisabledMaterials.remove(aMaterial); + OrePrefixes.ingotTriple.mDisabledMaterials.remove(aMaterial); + OrePrefixes.ingotQuadruple.mDisabledMaterials.remove(aMaterial); + OrePrefixes.ingotQuintuple.mDisabledMaterials.remove(aMaterial); + OrePrefixes.plateDouble.mDisabledMaterials.remove(aMaterial); + OrePrefixes.plateTriple.mDisabledMaterials.remove(aMaterial); + OrePrefixes.plateQuadruple.mDisabledMaterials.remove(aMaterial); + OrePrefixes.plateQuintuple.mDisabledMaterials.remove(aMaterial); + OrePrefixes.plateDense.mDisabledMaterials.remove(aMaterial); break; } } -- cgit From 3ee18ca5551f4bde620e79082b9854bfbf76ab83 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Sun, 25 Sep 2016 00:25:15 +0100 Subject: Cleanup, disable auto TE recipes with config and fixes --- .../materialprocessing/ProcessingConfig.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java index 4f9d3484ec..84cbbb0d1b 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java @@ -3,7 +3,6 @@ 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 { @@ -22,19 +21,20 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandle @Override public void onComponentRegistration(Materials aMaterial) { + /** This is just left here as an example of how to add components. switch (aMaterial.mName) { case "Cobalt": - OrePrefixes.spring.mDisabledMaterials.remove(aMaterial); - OrePrefixes.ingotDouble.mDisabledMaterials.remove(aMaterial); - OrePrefixes.ingotTriple.mDisabledMaterials.remove(aMaterial); - OrePrefixes.ingotQuadruple.mDisabledMaterials.remove(aMaterial); - OrePrefixes.ingotQuintuple.mDisabledMaterials.remove(aMaterial); - OrePrefixes.plateDouble.mDisabledMaterials.remove(aMaterial); - OrePrefixes.plateTriple.mDisabledMaterials.remove(aMaterial); - OrePrefixes.plateQuadruple.mDisabledMaterials.remove(aMaterial); - OrePrefixes.plateQuintuple.mDisabledMaterials.remove(aMaterial); - OrePrefixes.plateDense.mDisabledMaterials.remove(aMaterial); + OrePrefixes.spring.mDisabledItems.remove(aMaterial); + OrePrefixes.ingotDouble.mDisabledItems.remove(aMaterial); + OrePrefixes.ingotTriple.mDisabledItems.remove(aMaterial); + OrePrefixes.ingotQuadruple.mDisabledItems.remove(aMaterial); + OrePrefixes.ingotQuintuple.mDisabledItems.remove(aMaterial); + OrePrefixes.plateDouble.mDisabledItems.remove(aMaterial); + OrePrefixes.plateTriple.mDisabledItems.remove(aMaterial); + OrePrefixes.plateQuadruple.mDisabledItems.remove(aMaterial); + OrePrefixes.plateQuintuple.mDisabledItems.remove(aMaterial); + OrePrefixes.plateDense.mDisabledItems.remove(aMaterial); break; - } + }**/ } } -- cgit From c0f1fce8597a1fddab378c0e090b153b70cdc895 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Thu, 29 Sep 2016 07:36:45 +0100 Subject: Small fixes & Stop storage blocks and fluids for disabled materials --- .../materialprocessing/ProcessingConfig.java | 33 ++++++++++++---------- 1 file changed, 18 insertions(+), 15 deletions(-) (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java index 84cbbb0d1b..89c7c18eee 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java @@ -21,20 +21,23 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandle @Override public void onComponentRegistration(Materials aMaterial) { - /** This is just left here as an example of how to add components. - switch (aMaterial.mName) { - case "Cobalt": - OrePrefixes.spring.mDisabledItems.remove(aMaterial); - OrePrefixes.ingotDouble.mDisabledItems.remove(aMaterial); - OrePrefixes.ingotTriple.mDisabledItems.remove(aMaterial); - OrePrefixes.ingotQuadruple.mDisabledItems.remove(aMaterial); - OrePrefixes.ingotQuintuple.mDisabledItems.remove(aMaterial); - OrePrefixes.plateDouble.mDisabledItems.remove(aMaterial); - OrePrefixes.plateTriple.mDisabledItems.remove(aMaterial); - OrePrefixes.plateQuadruple.mDisabledItems.remove(aMaterial); - OrePrefixes.plateQuintuple.mDisabledItems.remove(aMaterial); - OrePrefixes.plateDense.mDisabledItems.remove(aMaterial); - break; - }**/ + /** This is just left here as an example of how to add components. **/ + + /*Enabling/Disabling components depending on the current Materials values: + if ((aMaterial.mTypes & 0x40) != 0) { //This material can be made into tool heads + OrePrefixes.plateQuadruple.mDisabledItems.remove(aMaterial); + } */ + + /* Enabling specific components: + OrePrefixes.spring.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.ingotDouble.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.ingotTriple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.ingotQuadruple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.ingotQuintuple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.plateDouble.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.plateTriple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.plateQuadruple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.plateQuintuple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.plateDense.mDisabledItems.remove(Materials.Cobalt); */ } } -- cgit From 173700a611a36a0f0b30c2a0e2b72ebd739e158a Mon Sep 17 00:00:00 2001 From: Muramasa Date: Tue, 4 Oct 2016 04:12:40 +0100 Subject: Computronics support & Improved mod dependant Materials --- .../materialprocessing/ProcessingConfig.java | 29 ++-- .../materialprocessing/ProcessingModSupport.java | 149 +++++++++++++++++++++ 2 files changed, 165 insertions(+), 13 deletions(-) create mode 100644 src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java index 89c7c18eee..1baf79e6d9 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java @@ -20,24 +20,27 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandle } @Override - public void onComponentRegistration(Materials aMaterial) { + public void onComponentInit() { /** This is just left here as an example of how to add components. **/ + /* Enabling specific components: + OrePrefixes.spring.enableComponent(Materials.Cobalt); + OrePrefixes.ingotDouble.enableComponent(Materials.Cobalt); + OrePrefixes.ingotTriple.enableComponent(Materials.Cobalt); + OrePrefixes.ingotQuadruple.enableComponent(Materials.Cobalt); + OrePrefixes.ingotQuintuple.enableComponent(Materials.Cobalt); + OrePrefixes.plateDouble.enableComponent(Materials.Cobalt); + OrePrefixes.plateTriple.enableComponent(Materials.Cobalt); + OrePrefixes.plateQuadruple.enableComponent(Materials.Cobalt); + OrePrefixes.plateQuintuple.enableComponent(Materials.Cobalt); + OrePrefixes.plateDense.enableComponent(Materials.Cobalt); */ + } + @Override + public void onComponentIteration(Materials aMaterial) { + /** This is just left here as an example of how to add components. **/ /*Enabling/Disabling components depending on the current Materials values: if ((aMaterial.mTypes & 0x40) != 0) { //This material can be made into tool heads OrePrefixes.plateQuadruple.mDisabledItems.remove(aMaterial); } */ - - /* Enabling specific components: - OrePrefixes.spring.mDisabledItems.remove(Materials.Cobalt); - OrePrefixes.ingotDouble.mDisabledItems.remove(Materials.Cobalt); - OrePrefixes.ingotTriple.mDisabledItems.remove(Materials.Cobalt); - OrePrefixes.ingotQuadruple.mDisabledItems.remove(Materials.Cobalt); - OrePrefixes.ingotQuintuple.mDisabledItems.remove(Materials.Cobalt); - OrePrefixes.plateDouble.mDisabledItems.remove(Materials.Cobalt); - OrePrefixes.plateTriple.mDisabledItems.remove(Materials.Cobalt); - OrePrefixes.plateQuadruple.mDisabledItems.remove(Materials.Cobalt); - OrePrefixes.plateQuintuple.mDisabledItems.remove(Materials.Cobalt); - OrePrefixes.plateDense.mDisabledItems.remove(Materials.Cobalt); */ } } diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java new file mode 100644 index 0000000000..07ad46c3f0 --- /dev/null +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java @@ -0,0 +1,149 @@ +package gregtech.loaders.materialprocessing; + +import cpw.mods.fml.common.Loader; +import gregtech.api.enums.GT_Values; +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 aEnableUBCMats = Loader.isModLoaded("UndergroundBiomes") || aTGregSupport; + public static boolean aEnableThaumcraftMats = Loader.isModLoaded("Thaumcraft") || aTGregSupport; + public static boolean aEnableRotaryCraftMats = Loader.isModLoaded("RotaryCraft") || aTGregSupport; + public static boolean aEnableThermalFoundationMats = Loader.isModLoaded("ThermalFoundation") || aTGregSupport; + public static boolean aEnableEnderIOMats = Loader.isModLoaded("EnderIO") || aTGregSupport; + public static boolean aEnableRailcraftMats = Loader.isModLoaded(GT_Values.MOD_ID_RC) || aTGregSupport; + 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 ProcessingModSupport() { + Materials.add(this); + } + + @Override + public void onMaterialsInit() { + 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.Endium.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.Midasium.mHasParentMod = false; + } + if (!aEnableThaumcraftMats) { + Materials.Amber.mHasParentMod = false; + Materials.Thaumium.mHasParentMod = false; + Materials.InfusedGold.mHasParentMod = false; + Materials.InfusedAir.mHasParentMod = false; + Materials.InfusedFire.mHasParentMod = false; + Materials.InfusedEarth.mHasParentMod = false; + Materials.InfusedWater.mHasParentMod = false; + Materials.InfusedEntropy.mHasParentMod = false; + Materials.InfusedOrder.mHasParentMod = false; + Materials.InfusedVis.mHasParentMod = false; + 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; + } + if (!aEnableTwilightMats) { + Materials.FierySteel.mHasParentMod = false; + Materials.LiveRoot.mHasParentMod = false; + Materials.IronWood.mHasParentMod = false; + Materials.Steeleaf.mHasParentMod = false; + Materials.Knightmetal.mHasParentMod = false; + } + if (!aEnableGCMarsMats) { + Materials.Desh.mHasParentMod = false; + Materials.MeteoricIron.mHasParentMod = false; + Materials.MeteoricSteel.mHasParentMod = false; + } + if (!aEnableThermalFoundationMats) { + Materials.Blizz.mHasParentMod = false; + Materials.Enderium.mHasParentMod = false; + } + if (!aEnableRotaryCraftMats) { + Materials.HSLA.mHasParentMod = false; + } + if (!aEnableEnderIOMats) { + Materials.DarkSteel.mHasParentMod = false; + } + if (!aEnableRailcraftMats) { + Materials.Firestone.mHasParentMod = false; + } + } + + @Override + public void onComponentInit() { + if (Loader.isModLoaded("computronics")) { + OrePrefixes.ring.enableComponent(Materials.RedAlloy); + OrePrefixes.ring.enableComponent(Materials.NiobiumTitanium); + OrePrefixes.foil.enableComponent(Materials.StainlessSteel); + OrePrefixes.foil.enableComponent(Materials.ChromiumDioxide); + OrePrefixes.plate.enableComponent(Materials.ChromiumDioxide); + } + } + + @Override + public void onComponentIteration(Materials aMaterial) { + //NOOP + } +} -- cgit From d2efd7ae5478d65b2b95c5d22f8fb2200e4b9e80 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Tue, 4 Oct 2016 04:32:51 +0100 Subject: Small fixes --- .../gregtech/loaders/materialprocessing/ProcessingModSupport.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index 07ad46c3f0..b10a87c2f9 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java @@ -23,6 +23,7 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa @Override public void onMaterialsInit() { + //Disable Materials if Parent Mod is not loaded if (!aTGregSupport) { Materials.Dysprosium.mHasParentMod = false; Materials.Erbium.mHasParentMod = false; @@ -129,6 +130,9 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa if (!aEnableRailcraftMats) { Materials.Firestone.mHasParentMod = false; } + + //Enable Materials is correct mod is Loaded + Materials.ChromiumDioxide.mHasParentMod = Loader.isModLoaded("computronics"); } @Override -- cgit From 2fb0ba6770f161e9c83842df61ec8dbaaf44fecf Mon Sep 17 00:00:00 2001 From: Muramasa Date: Fri, 7 Oct 2016 13:50:38 +0100 Subject: Fix nugget recipes --- .../java/gregtech/loaders/materialprocessing/ProcessingModSupport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index b10a87c2f9..3aa2d4abc5 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java @@ -131,7 +131,7 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa Materials.Firestone.mHasParentMod = false; } - //Enable Materials is correct mod is Loaded + //Enable Materials if correct mod is Loaded Materials.ChromiumDioxide.mHasParentMod = Loader.isModLoaded("computronics"); } -- cgit From c69a768640eb947b3050119e6fa0aa2e264ff32a Mon Sep 17 00:00:00 2001 From: Muramasa- Date: Tue, 27 Dec 2016 22:42:02 +0000 Subject: Fix missing Computronics components --- .../java/gregtech/loaders/materialprocessing/ProcessingModSupport.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index 3aa2d4abc5..442ad4d726 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java @@ -142,7 +142,9 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa OrePrefixes.ring.enableComponent(Materials.NiobiumTitanium); OrePrefixes.foil.enableComponent(Materials.StainlessSteel); OrePrefixes.foil.enableComponent(Materials.ChromiumDioxide); + OrePrefixes.foil.enableComponent(Materials.Iron); OrePrefixes.plate.enableComponent(Materials.ChromiumDioxide); + OrePrefixes.screw.enableComponent(Materials.Copper); } } -- cgit From b2157c63206fb11e9c5568d0ca07933d565c8128 Mon Sep 17 00:00:00 2001 From: Techlone Date: Fri, 17 Feb 2017 23:45:56 +0500 Subject: Add new semiconductors and indium recipe --- .../java/gregtech/loaders/materialprocessing/ProcessingModSupport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index 442ad4d726..68ee13322c 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java @@ -29,7 +29,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; -- cgit From 244ef3810efd241766601327a28ea3053d1b2744 Mon Sep 17 00:00:00 2001 From: Technus Date: Thu, 27 Apr 2017 19:03:07 +0200 Subject: Buildable --- .../gregtech/loaders/materialprocessing/ProcessingModSupport.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index 68ee13322c..b18b28dc73 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java @@ -41,7 +41,7 @@ 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; @@ -78,7 +78,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; @@ -101,7 +101,7 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa Materials.Gabbro.mHasParentMod = false; Materials.Gneiss.mHasParentMod = false; Materials.Greenschist.mHasParentMod = false; - Materials.Greywacke.mHasParentMod = false; + //Materials.Greywacke.mHasParentMod = false; Materials.Komatiite.mHasParentMod = false; Materials.Rhyolite.mHasParentMod = false; } -- cgit From 65e0b3028e016011ade0b254ab611a0dae73fd35 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sat, 6 May 2017 00:41:06 +0200 Subject: remove this material dependencies --- .../materialprocessing/ProcessingModSupport.java | 126 ++++++++++----------- 1 file changed, 63 insertions(+), 63 deletions(-) (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index b18b28dc73..3b6225d921 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; -- cgit From 22a76ced74a1e16ed9b6454f7d3d97246e582479 Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 6 May 2017 09:38:14 +0200 Subject: Enable materials if coremod is loaded --- .../gregtech/loaders/materialprocessing/ProcessingModSupport.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/loaders/materialprocessing') diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index 3b6225d921..cf5e7ffa79 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; @@ -150,6 +150,6 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa @Override public void onComponentIteration(Materials aMaterial) { - //NOOP + //NOP } } -- cgit From 4026e87c3f7cb9e535655f0963fb13523a00866c Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 6 May 2017 09:53:19 +0200 Subject: Revert Dream's doings, re enable materials --- .../materialprocessing/ProcessingModSupport.java | 132 +++++++++++---------- 1 file changed, 68 insertions(+), 64 deletions(-) (limited to 'src/main/java/gregtech/loaders/materialprocessing') 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"); -- cgit From 08cd5fe48560f7b8db2252733afe59d160eaf426 Mon Sep 17 00:00:00 2001 From: Technus Date: Thu, 18 May 2017 10:50:21 +0200 Subject: Make the save/load the same as in bloodasp --- src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/java/gregtech/loaders/materialprocessing') 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; -- cgit