From a028cc1467cdeff4d7f47734fb8557fd5239abc7 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sun, 26 Dec 2021 13:23:16 +0000
Subject: Tweak MK4 Fusion.

---
 src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main/java/gtPlusPlus/preloader')

diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java
index 22568e6de7..c93b37e6fb 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java
@@ -8,6 +8,8 @@ import java.util.Map;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.SortingIndex;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.preloader.Preloader_Logger;
@@ -74,6 +76,7 @@ public class Preloader_FMLLoadingPlugin implements IFMLLoadingPlugin  {
         CORE_Preloader.DEV_ENVIRONMENT = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
         CORE_Preloader.DEBUG_MODE = AsmConfig.debugMode;
         Preloader_Logger.INFO("Running on "+gtPlusPlus.preloader.CORE_Preloader.JAVA_VERSION+" | Development Environment: "+CORE_Preloader.DEV_ENVIRONMENT);
+        Preloader_Logger.INFO("Is Client? "+Utils.isClient()+" | Is Server? "+Utils.isServer());
         Locale aDefaultLocale = Locale.getDefault();
         NumberFormat aFormat = NumberFormat.getInstance();
         Locale aDisplayLocale = (Locale) ReflectionUtils.getFieldValue(ReflectionUtils.getField(Locale.class, "defaultDisplayLocale"));
-- 
cgit 


From bfbd1eb3123fefeb5dc66f29eb3b8ae18af6bb88 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 20 Jan 2022 17:17:04 +0000
Subject: Fixed Industrial Forge Hammer structure check. Fixed Creative Energy
 Buffer some more. Fixed Redstone Circuit Block output. Did a little work on
 breaker boxes.

---
 .../transformers/ClassTransformer_GT_Client.java   | 35 +++++++++++-----------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'src/main/java/gtPlusPlus/preloader')

diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Client.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Client.java
index e2d34c38e7..25ec9a8338 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Client.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Client.java
@@ -383,23 +383,24 @@ public class ClassTransformer_GT_Client {
 	 * GT_Client's onPostLoad
 	 */
 	
-    public static void onPostLoad() {
-    	try {
-    		for (int i = 0; i < GregTech_API.METATILEENTITIES.length; i++) {    			
-    			try {    			
-    			if (GregTech_API.METATILEENTITIES[i] != null) {
-    				GregTech_API.METATILEENTITIES[i].getStackForm(1L).getTooltip((EntityPlayer) null, true);
-    			}    			
-    			}
-    			catch (Throwable t) {
-    				GT_Log.err.println("Error in MetaTileEntity with ID of "+i);
-    	    		t.printStackTrace(GT_Log.err);    				
-    			}
-    		}
-    	} catch (Throwable var2) {
-    		var2.printStackTrace();
-    	}
-    }
+	public static void onPostLoad() {
+		try {
+			for (int i = 0; i < GregTech_API.METATILEENTITIES.length; i++) {
+				try {
+					if (GregTech_API.METATILEENTITIES[i] != null) {
+						GregTech_API.METATILEENTITIES[i].getStackForm(1L).getTooltip((EntityPlayer) null, true);
+					}
+				}
+				catch (Throwable t) {
+					GT_Log.err.println("Error in MetaTileEntity with ID of " + i);
+					t.printStackTrace(GT_Log.err);
+				}
+			}
+		}
+		catch (Throwable var2) {
+			var2.printStackTrace();
+		}
+	}
 
 
 
-- 
cgit 


From 8b30aa2f33741a9782cb9a1ef8628c4671723a58 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 20 Jan 2022 20:04:40 +0000
Subject: Add way to make Sunnarium without MT. Fix early init of
 FmlCommonHandler.

---
 src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/gtPlusPlus/preloader')

diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java
index c93b37e6fb..5ff001ea2a 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java
@@ -76,7 +76,7 @@ public class Preloader_FMLLoadingPlugin implements IFMLLoadingPlugin  {
         CORE_Preloader.DEV_ENVIRONMENT = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
         CORE_Preloader.DEBUG_MODE = AsmConfig.debugMode;
         Preloader_Logger.INFO("Running on "+gtPlusPlus.preloader.CORE_Preloader.JAVA_VERSION+" | Development Environment: "+CORE_Preloader.DEV_ENVIRONMENT);
-        Preloader_Logger.INFO("Is Client? "+Utils.isClient()+" | Is Server? "+Utils.isServer());
+        //Preloader_Logger.INFO("Is Client? "+Utils.isClient()+" | Is Server? "+Utils.isServer());
         Locale aDefaultLocale = Locale.getDefault();
         NumberFormat aFormat = NumberFormat.getInstance();
         Locale aDisplayLocale = (Locale) ReflectionUtils.getFieldValue(ReflectionUtils.getField(Locale.class, "defaultDisplayLocale"));
-- 
cgit