Various fixes

+Added GT-FML-Log
+Added an Exception if a Nq reactor without recipe map is created
+Added the ability to add ReinforcedGlass in the CleanroomWalls (https://github.com/GTNewHorizons/NewHorizons/issues/3584)
+Added a config option for changing the ReinforcedGlass percentage
+Renamed Materials2 -> GTNH_ExtraMaterials and fixed it

2 files changed, 7 insertions, 6 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
index 157a38962a..e1c11e05df 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
@@ -41,6 +41,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import java.util.ArrayList;

 import java.util.List;

 

+import static gregtech.GT_Mod.GT_FML_LOGGER;

 import static gregtech.api.objects.XSTR.XSTR_INSTANCE;

 

 public class GT_Block_Machines

@@ -267,14 +268,14 @@ public class GT_Block_Machines
                 e.printStackTrace(GT_Log.err);

             }

             GT_Log.out.println("GT_Mod: Starting Block Icon Load Phase");

-            System.out.println("GT_Mod: Starting Block Icon Load Phase");

+            GT_FML_LOGGER.info("GT_Mod: Starting Block Icon Load Phase");

             try {

                 for (Runnable tRunnable : GregTech_API.sGTBlockIconload) {

                     tRunnable.run();

                 }

             } catch (Throwable e) {e.printStackTrace(GT_Log.err);}

             GT_Log.out.println("GT_Mod: Finished Block Icon Load Phase");

-            System.out.println("GT_Mod: Finished Block Icon Load Phase");

+            GT_FML_LOGGER.info("GT_Mod: Finished Block Icon Load Phase");

         }

     }

 

diff --git a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
index 0115d554c0..a76120150c 100644
--- a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
+++ b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
@@ -83,24 +83,24 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit
                 if (GregTech_API.sBlockOresUb1 != null) {
                     tOreBlock = GregTech_API.sBlockOresUb1;
                     aMetaData += (BlockMeta * 1000);
-                    //System.out.println("Block changed to UB1");
+                    //GT_FML_LOGGER.info("Block changed to UB1");
                 }
             } else if (BlockName.equals("tile.metamorphicStone")) {
                 if (GregTech_API.sBlockOresUb2 != null) {
                     tOreBlock = GregTech_API.sBlockOresUb2;
                     aMetaData += (BlockMeta * 1000);
-                    //System.out.println("Block changed to UB2");
+                    //GT_FML_LOGGER.info("Block changed to UB2");
                 }
             } else if (BlockName.equals("tile.sedimentaryStone")) {
                 if (GregTech_API.sBlockOresUb3 != null) {
                     tOreBlock = GregTech_API.sBlockOresUb3;
                     aMetaData += (BlockMeta * 1000);
-                    //System.out.println("Block changed to UB3");
+                    //GT_FML_LOGGER.info("Block changed to UB3");
                 }
             } else {
                 return false;
             }
-            //System.out.println(tOreBlock);
+            //GT_FML_LOGGER.info(tOreBlock);
             aWorld.setBlock(aX, aY, aZ, tOreBlock, getHarvestData((short) aMetaData, ((GT_Block_Ores_Abstract) tOreBlock).getBaseBlockHarvestLevel(aMetaData % 16000 / 1000)), 0);
             TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
             if ((tTileEntity instanceof GT_TileEntity_Ores)) {