$ Fixed reverse cell colouring when using GT Textures.

$ Fixed Hot Ingots having no texture when using GT textures.

2 files changed, 27 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
index 43e170810b..c9340badda 100644
--- a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
+++ b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
@@ -46,7 +46,10 @@ public class BaseItemCell extends BaseItemComponent{
 
 	@Override
 	public int getColorFromItemStack(final ItemStack stack, final int renderPass) {
-		if (renderPass == 0){
+		if (renderPass == 0 && !CORE.configSwitches.useGregtechTextures){
+			return Utils.rgbtoHexValue(230, 230, 230);
+		}
+		if (renderPass == 1 && CORE.configSwitches.useGregtechTextures){
 			return Utils.rgbtoHexValue(230, 230, 230);
 		}
 		return this.componentColour;
diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
index dc2e86197d..cd30fdd165 100644
--- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.item.base.ingots;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.GT_Values;
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.lib.CORE;
@@ -19,7 +21,7 @@ public class BaseItemIngotHot extends BaseItemIngot{
 	private int tickCounter = 0;
 	private final int tickCounterMax = 200;
 	private final int mTier;
-	
+
 	private IIcon base;
 	private IIcon overlay;
 
@@ -60,7 +62,17 @@ public class BaseItemIngotHot extends BaseItemIngot{
 		super.onUpdate(iStack, world, entityHolding, p_77663_4_, p_77663_5_);
 	}
 
-	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public boolean requiresMultipleRenderPasses(){
+		if (CORE.configSwitches.useGregtechTextures){
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
+
 	@Override
 	public void registerIcons(final IIconRegister i) {
 
@@ -74,14 +86,19 @@ public class BaseItemIngotHot extends BaseItemIngot{
 		}
 		//this.overlay = cellMaterial.getFluid(1000).getFluid().get
 	}	
-	
+
 	@Override
 	public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
-		if(pass == 0 || !CORE.configSwitches.useGregtechTextures) {
+		if(pass == 0 && CORE.configSwitches.useGregtechTextures) {
 			return this.base;
 		}
-		return this.overlay;
+		else if(pass == 1 && CORE.configSwitches.useGregtechTextures) {
+			return this.overlay;
+		}
+		else {
+			return this.overlay;
+		}
 	}
-	
+
 
 }