From 2525ff075586759657e89b9f01969f0596bca2df Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Tue, 10 Dec 2019 11:01:32 +0000
Subject: % Changed name of custom GT++ Programmed Circuit to Programmed Bio
 Circuit. $ Fixed getNumberedBioCircuit() in CI. $ Fixed an issue where
 stripped fields were referenced in server side bytecode. $ Fixed Tooltips not
 working as intended for items giving custom GT++ Multi behaviour. $ Fixed 'No
 Bonus Output Chance' item not registering correctly.

---
 .../core/block/base/BasicTileBlockWithTooltip.java           | 12 +++++++++---
 src/Java/gtPlusPlus/core/recipe/common/CI.java               |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

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

diff --git a/src/Java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/Java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
index 098b670509..6166835f31 100644
--- a/src/Java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
+++ b/src/Java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
@@ -33,13 +33,13 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
 	 * Each mapped object holds the data for the six sides.
 	 */
 	@SideOnly(Side.CLIENT)
-	private AutoMap<CubicObject<SafeTexture>> mSidedTextureArray = new AutoMap<CubicObject<SafeTexture>>();
+	private AutoMap<CubicObject<SafeTexture>> mSidedTextureArray;
 
 	/**
 	 * Holds the data for the six sides, each side holds an array of data for each respective meta.
 	 */
 	@SideOnly(Side.CLIENT)
-	private AutoMap<CubicObject<String>> mSidedTexturePathArray = new AutoMap<CubicObject<String>>();
+	private AutoMap<CubicObject<String>> mSidedTexturePathArray;
 
 	/**
 	 * Does this block have any meta at all?
@@ -157,7 +157,13 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
 	@SideOnly(Side.CLIENT)
 	private final void handleTextures() {
 
-		Logger.INFO("[TeTexture] Building Texture Maps for "+getTileEntityName()+".");
+		Logger.INFO("[TeTexture] Building Texture Maps for "+getTileEntityName()+".");		
+
+		// Init on the Client side only, to prevent Field initialisers existing in the Server side bytecode.
+		mSidedTextureArray = new AutoMap<CubicObject<SafeTexture>>();
+		mSidedTexturePathArray = new AutoMap<CubicObject<String>>();
+		
+		
 		//Store them in forge order
 		//DOWN, UP, NORTH, SOUTH, WEST, EAST	
 
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index ce5587ef33..be1089a72a 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -6,6 +6,7 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
@@ -1240,7 +1241,7 @@ public class CI {
 	}
 
 	public static ItemStack getNumberedBioCircuit(int i) {
-		return GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(i, 0L);
+		return ItemUtils.simpleMetaStack(AgriculturalChem.mBioCircuit, i, 0);
 	}
 
 }
-- 
cgit