From f39e8134fcef5da8bd04503c5233b2b6de249b3a Mon Sep 17 00:00:00 2001
From: Alkalus <Draknyte1@hotmail.com>
Date: Sat, 28 Mar 2020 02:09:24 +0000
Subject: + Added more 'Special Behaviour' items for my multiblocks as
 Examples. + Added '/gtpp hand' command. + Added TungstenSteel & Neutronium
 tool variants to NEI while in dev. + Added Large Semifluid Generator and a
 crafting recipe for it. + Added Placeholder for Adv. Assembly Line. + Added
 Distillus Upgrade Chip and a crafting recipe for it. % Updated build.gradle.
 % Reworked a few recipes. $ Fixed ULV Overflow Covers using 0L Water in
 assembler. (https://github.com/GTNewHorizons/NewHorizons/issues/5700) $ Fixed
 Integral Encasement I using 0L Steel in assembler.
 (https://github.com/GTNewHorizons/NewHorizons/issues/5617) $ Fixed Thaumcraft
 based FakePlayer's triggering Fluorite drops.
 (https://github.com/GTNewHorizons/NewHorizons/issues/5744) $ Fixed bad
 handling of hatch textures on a few multiblocks. $ Semi-Fixed Distillus. $
 Fixed Semifluid Generator recipes. $ Fixed Semifluid Generators crashing the
 game when mined. $ Fixed bad handling of calls to ItemList.java. $ Began work
 fixing all ASM to be more compatible with ProGuard. $ Fixed compiler
 complaining about varargs. ^ Bumped version to 1.7.05.x.

---
 src/Java/gtPlusPlus/core/common/CommonProxy.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/common')

diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 71a7b37cfc..0398b1619f 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -110,7 +110,7 @@ public class CommonProxy {
 		Logger.INFO("[Proxy] Calling Render registrator.");
 		registerRenderThings();
 
-		if (!mFluidsGenerated && ItemList.valueOf("Cell_Empty").hasBeenSet()) {
+		if (!mFluidsGenerated && ItemList.Cell_Empty.hasBeenSet()) {
 			Material.generateQueuedFluids();
 			mFluidsGenerated = true;
 		}
@@ -126,7 +126,7 @@ public class CommonProxy {
 		registerCustomItemsForMaterials();
 		ModBlocks.blockCustomMobSpawner = new BlockGenericSpawner();
 
-		if (!mFluidsGenerated && ItemList.valueOf("Cell_Empty").hasBeenSet()) {
+		if (!mFluidsGenerated && ItemList.Cell_Empty.hasBeenSet()) {
 			Material.generateQueuedFluids();
 			mFluidsGenerated = true;
 		} else {
-- 
cgit 


From 75ea33600537047847091b55a46f5b88c3c75dbb Mon Sep 17 00:00:00 2001
From: Alkalus <Draknyte1@hotmail.com>
Date: Tue, 31 Mar 2020 01:25:58 +0100
Subject: + Added Custom NEI Handler for IsaMIll. + Added Death by IsaMIll. %
 Moved debug mode switch to AsmConfig. $ Fixed handling of custom OrePrefixes.
 $ Fixed OreDict registration of MetaFoodItems. $ Improved handling of Core
 Classes being static initialised too early. $ Fixed client-side bug in
 Distillus which would cause an infinite loop. $ Fixed bug in ForgeEnumHelper.
 $ Fixed bug in setField methods from ReflectionUtils.

---
 src/Java/gtPlusPlus/core/common/CommonProxy.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/common')

diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 0398b1619f..0aeff5ae16 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.core.common;
 
-import static gtPlusPlus.core.lib.CORE.DEBUG;
-
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
@@ -49,8 +47,10 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.player.PlayerCache;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.plugin.villagers.block.BlockGenericSpawner;
+import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.xmod.eio.handler.HandlerTooltip_EIO;
 import gtPlusPlus.xmod.galacticraft.handler.HandlerTooltip_GC;
+import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler;
 import net.minecraft.enchantment.Enchantment;
@@ -80,15 +80,19 @@ public class CommonProxy {
 		LoadedMods.checkLoaded();
 		Logger.INFO("Making sure we're ready to party!");
 
-		if (!DEBUG) {
+		if (!CORE_Preloader.DEBUG_MODE) {
 			Logger.WARNING("Development mode not enabled.");
-		} else if (DEBUG) {
+		} else if (CORE_Preloader.DEBUG_MODE) {
 			Logger.INFO("Development mode enabled.");
 		} else {
 			Logger.WARNING("Development mode not set.");
 		}
 
 		AddToCreativeTab.initialiseTabs();
+		
+		if (LoadedMods.Gregtech) {
+			HANDLER_GT.addNewOrePrefixes();
+		}
 
 		// Moved from Init after Debug Loading.
 		// 29/01/18 - Alkalus
@@ -119,7 +123,7 @@ public class CommonProxy {
 
 	public void init(final FMLInitializationEvent e) {
 		// Debug Loading
-		if (CORE.DEBUG) {
+		if (CORE_Preloader.DEBUG_MODE) {
 			DEBUG_INIT.registerHandlers();
 		}
 
-- 
cgit