Skip to content

Commit 2477fa1

Browse files
committed
Fix crash.
1 parent a8c53db commit 2477fa1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

fluids/src/main/java/sunsetsatellite/catalyst/fluids/impl/GuiFluid.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,13 @@ protected void drawFluidSlotInventory(SlotFluid slot1) {
135135
int waterColor = BlockColorDispatcher.getInstance().getDispatch(Block.fluidWaterFlowing).getWorldColor(this.mc.theWorld, (int) this.mc.thePlayer.x, (int) this.mc.thePlayer.y, (int) this.mc.thePlayer.z);
136136
Color c = new Color().setARGB(waterColor);
137137
c.setRGBA(c.getRed(),c.getGreen(),c.getBlue(),0x40);
138-
((IColorOverride)itemModel).overrideColor(c.getRed(),c.getGreen(),c.getBlue(),c.getAlpha());
138+
139139
((IColorOverride)blockModel).overrideColor(c.getRed(),c.getGreen(),c.getBlue(),c.getAlpha());
140140
itemModel.renderItemIntoGui(Tessellator.instance,this.fontRenderer, this.mc.renderEngine, itemStack4, i2, i3,1.0F);
141141
} else {
142142
itemModel.renderItemIntoGui(Tessellator.instance,this.fontRenderer, this.mc.renderEngine, itemStack4, i2, i3,1.0F);
143143
}
144-
((IColorOverride)itemModel).overrideColor(1,1,1,1);
144+
145145
((IColorOverride)blockModel).overrideColor(1,1,1,1);
146146
itemModel.renderItemOverlayIntoGUI(Tessellator.instance,this.fontRenderer, this.mc.renderEngine, itemStack4, i2, i3,1.0F);
147147
}

fluids/src/main/java/sunsetsatellite/catalyst/fluids/impl/GuiItemFluid.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ protected void drawFluidSlotInventory(SlotFluid slot1) {
134134
int waterColor = BlockColorDispatcher.getInstance().getDispatch(Block.fluidWaterFlowing).getWorldColor(this.mc.theWorld, (int) this.mc.thePlayer.x, (int) this.mc.thePlayer.y, (int) this.mc.thePlayer.z);
135135
Color c = new Color().setARGB(waterColor);
136136
c.setRGBA(c.getRed(),c.getGreen(),c.getBlue(),0x40);
137-
((IColorOverride)itemModel).overrideColor(c.getRed(),c.getGreen(),c.getBlue(),c.getAlpha());
137+
138138
((IColorOverride)blockModel).overrideColor(c.getRed(),c.getGreen(),c.getBlue(),c.getAlpha());
139139
itemModel.renderItemIntoGui(Tessellator.instance,this.fontRenderer, this.mc.renderEngine, itemStack4, i2, i3,1.0F);
140140
} else {
141141
itemModel.renderItemIntoGui(Tessellator.instance,this.fontRenderer, this.mc.renderEngine, itemStack4, i2, i3,1.0F);
142142
}
143-
((IColorOverride)itemModel).overrideColor(1,1,1,1);
143+
144144
((IColorOverride)blockModel).overrideColor(1,1,1,1);
145145
itemModel.renderItemOverlayIntoGUI(Tessellator.instance,this.fontRenderer, this.mc.renderEngine, itemStack4, i2, i3,1.0F);
146146
}

0 commit comments

Comments
 (0)