From 76c256d18af2cf3387a60e70a4205d70086fdd79 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 4 Jul 2014 12:43:21 +0800 Subject: [PATCH] Fixed some rendering issues. Fixed wireless chargers continuous drain. --- .../enderio/machine/farm/FarmingStationRenderer.java | 1 + .../generator/combustion/TranslatedCubeRenderer.java | 4 ++-- .../crazypants/enderio/machine/power/GuiCapacitorBank.java | 2 +- .../enderio/machine/wireless/TileWirelessCharger.java | 7 +++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java b/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java index 329aa50d..d062cd4c 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java @@ -1,6 +1,7 @@ package crazypants.enderio.machine.farm; import net.minecraft.block.Block; +import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.init.Blocks; diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java b/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java index 9715b67c..9881763a 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java @@ -57,9 +57,9 @@ public class TranslatedCubeRenderer { v.xyz.sub(xyz); xform.apply(v); if(!enableLighting) { - v.brightness = -1; + v.brightness = 15 << 20 | 15 << 4; float col = RenderUtil.getColorMultiplierForFace(face); - v.color = new Vector4f(col,col,col,1); + v.color = new Vector4f(col,col,col,1); v.normal = null; } } diff --git a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java index c2b2fa0c..2a2cfde1 100644 --- a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java @@ -36,7 +36,7 @@ public class GuiCapacitorBank extends GuiContainerBase { protected static final int CONFIG_ID = 377996104; - private static final int POWER_X = 8 + 21; + private static final int POWER_X = 8; private static final int POWER_Y = 9; private static final int POWER_WIDTH = 10; private static final int POWER_HEIGHT = 68; diff --git a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java index 3f5b1cdf..8992f4cf 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java @@ -55,7 +55,7 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower if(stored > 0) { storedEnergy += stored; storedEnergy = Math.min(storedEnergy, MAX_ENERGY_STORED_MJ); - if(stored == MAX_ENERGY_STORED_MJ) { + if(stored > (MAX_ENERGY_STORED_MJ - 2)) { powerHandler.configure(0, 0, 0, 0); } else { powerHandler.configure(0, MAX_ENERGY_IN, 0, MAX_ENERGY_IN); @@ -129,13 +129,12 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower } @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { double maxMj = Math.min(maxReceive / 10, MAX_ENERGY_IN); double canRecieve = Math.min(MAX_ENERGY_STORED_MJ - storedEnergy, maxMj); int canRecieveRF = (int)(canRecieve * 10); if(!simulate) { - storedEnergy += (canRecieveRF / 10); + storedEnergy += (canRecieveRF / 10f); } return canRecieveRF; }