aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/block
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-12-10 11:01:32 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-12-10 11:01:32 +0000
commit2525ff075586759657e89b9f01969f0596bca2df (patch)
treea492c6396f067e2c1e7feb2dd79b01b0c5c3c8df /src/Java/gtPlusPlus/core/block
parent051c46ab36a749954cff3bae1fbd44cea6f1fc99 (diff)
downloadGT5-Unofficial-2525ff075586759657e89b9f01969f0596bca2df.tar.gz
GT5-Unofficial-2525ff075586759657e89b9f01969f0596bca2df.tar.bz2
GT5-Unofficial-2525ff075586759657e89b9f01969f0596bca2df.zip
% 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.
Diffstat (limited to 'src/Java/gtPlusPlus/core/block')
-rw-r--r--src/Java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java12
1 files changed, 9 insertions, 3 deletions
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