Configurable components & fixes

7 files changed, 9 insertions, 21 deletions

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
+    }
 }
diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
index d2b92af91b..47c3d63b69 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
@@ -216,7 +216,6 @@ public class GT_Achievements {
         if (!GT_Mod.gregtechproxy.mAchievements) {
             return null;
         }
-        ;
         Achievement achievement = new Achievement(textId, textId, this.adjX + x, this.adjY + y, icon, requirement);
         if (special) {
             achievement.setSpecial();
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
index aee8a5048f..fe4a68c8ab 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
@@ -109,7 +109,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
         }
 
         switch (aMaterial.mName) {
-            case "_NULL":
+            case "NULL":
                 break;
             case "Glass":
                 GT_ModHandler.addSmeltingRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), new ItemStack(net.minecraft.init.Blocks.glass));
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
index 882495bc81..d6e9bd14a4 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
@@ -41,7 +41,7 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
         gregtech.api.util.GT_RecipeRegistrator.registerUsagesForMaterials(GT_Utility.copyAmount(1L, new Object[]{aStack}), OrePrefixes.plate.get(aMaterial).toString(), !aMaterial.contains(SubTag.NO_SMASHING));
 
         switch (aMaterial.mName) {
-            case "_NULL":
+            case "NULL":
                 break;
             case "Coal":
             case "Charcoal":
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java
index 5197028605..2384e160a0 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java
@@ -22,7 +22,7 @@ public class ProcessingStone
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
         Block aBlock = GT_Utility.getBlockFromStack(aStack);
         switch (aMaterial.mName) {
-            case "_NULL":
+            case "NULL":
                 GT_Values.RA.addAssemblerRecipe(GT_Utility.copyAmount(3L, new Object[]{aStack}), new ItemStack(Blocks.redstone_torch, 2), Materials.Redstone.getMolten(144L), new ItemStack(Items.repeater, 1), 100, 4);
                 break;
             case "Sand":
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MaterialProcessing.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MaterialProcessing.java
index ff901bcc4c..d7ec2365e1 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MaterialProcessing.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MaterialProcessing.java
@@ -1,13 +1,11 @@
 package gregtech.loaders.preload;
 
 import gregtech.api.util.GT_Log;
-import gregtech.loaders.materialprocessing.ProcessingComponents;
 import gregtech.loaders.materialprocessing.ProcessingConfig;
 
 public class GT_Loader_MaterialProcessing implements Runnable {
     public void run() {
         GT_Log.out.println("GT_Mod: Register Material processing.");
         new ProcessingConfig();
-        new ProcessingComponents();
     }
 }