Merge branch 'experimental' into GT_Bees_dev

2 files changed, 33 insertions, 1 deletions

diff --git a/src/main/java/gregtech/api/enums/Materials2.java b/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
index 1d343ff0f8..a2c7ced80c 100644
--- a/src/main/java/gregtech/api/enums/Materials2.java
+++ b/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
@@ -1,6 +1,18 @@
 package gregtech.api.enums;
 
-public class Materials2 {
+import gregtech.api.interfaces.IMaterialHandler;
+import static gregtech.GT_Mod.GT_FML_LOGGER;
+
+public class GTNH_ExtraMaterials implements IMaterialHandler {
+
+    public GTNH_ExtraMaterials(){
+        GT_FML_LOGGER.info("Registering GTNH-Materials (post Java 64kb limit)");
+        Materials.add(this);
+    }
+
+    /**
+     * This Class is for adding new Materials since Java has a Limiation of 64kb per Method / Class header
+     */
 
     public static Materials Signalum                = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1|2                       , 255, 255, 255,   0,   "Signalum"                ,   "Signalum"                      ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL          );
     public static Materials Lumium                  = new Materials(  -1, TextureSet.SET_NONE              ,   1.0F,      0,  2, 1|2                       , 255, 255, 255,   0,   "Lumium"                  ,   "Lumium"                        ,    0,       0,         -1,    0, false, false,   3,   1,   1, Dyes._NULL          );
@@ -10,5 +22,20 @@ public class Materials2 {
 
     private static void initSubTags() {
         SubTag.METAL.addTo(Signalum, Lumium, EnrichedCopper, DiamondCopper);
+        SubTag.NO_SMASHING.addTo(TarPitch);
+    }
+
+    @Override
+    public void onMaterialsInit() {
+        initSubTags();
+    }
+
+    @Override
+    public void onComponentInit() {
+    }
+
+    @Override
+    public void onComponentIteration(Materials aMaterial) {
+
     }
 }
\ No newline at end of file
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java
index f36ea881d8..8fefe5b719 100644
--- a/src/main/java/gregtech/api/enums/GT_Values.java
+++ b/src/main/java/gregtech/api/enums/GT_Values.java
@@ -175,4 +175,9 @@ public class GT_Values {
      * This will prevent NEI from crashing but spams the Log.
      */
     public static boolean allow_broken_recipemap = false;
+
+    /**
+     * This will set the percentage how much ReinforcedGlass is Allowed in Cleanroom Walls.
+     */
+    public static float cleanroomGlass = 5.0f;
 }