Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #2271 and gate slot rcolor rendering bug

Browse source
This commit is contained in:
asiekierka 2014-12-09 18:17:05 +01:00
parent 63b1703e4e
commit b498bff9bd
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/buildcraft/core/gui/AdvancedSlot.java
View file

@ -8,6 +8,8 @@
*/ */
package buildcraft.core.gui; package buildcraft.core.gui;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -88,7 +90,16 @@ public abstract class AdvancedSlot {
} else if (getIcon() != null) { } else if (getIcon() != null) {
mc.renderEngine.bindTexture(getTexture()); mc.renderEngine.bindTexture(getTexture());
//System.out.printf("Drawing advanced sprite %s (%d,%d) at %d %d\n", getIcon().getIconName(), getIcon().getOriginX(),getIcon().getOriginY(),cornerX + x, cornerY + y); //System.out.printf("Drawing advanced sprite %s (%d,%d) at %d %d\n", getIcon().getIconName(), getIcon().getOriginX(),getIcon().getOriginY(),cornerX + x, cornerY + y);
GL11.glDisable(GL11.GL_LIGHTING); // Make sure that render states are reset, an ItemStack can derp them up.
GL11.glEnable(GL11.GL_ALPHA_TEST);
GL11.glEnable(GL11.GL_BLEND);
gui.drawTexturedModelRectFromIcon(cornerX + x, cornerY + y, getIcon(), 16, 16); gui.drawTexturedModelRectFromIcon(cornerX + x, cornerY + y, getIcon(), 16, 16);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_ALPHA_TEST);
GL11.glDisable(GL11.GL_BLEND);
} }
} }

3
common/buildcraft/energy/TileEngineIron.java
View file

@ -194,6 +194,9 @@ public class TileEngineIron extends TileEngineWithInventory implements IFluidHan
@Override @Override
public void updateHeat() { public void updateHeat() {
if (energyStage == EnergyStage.OVERHEAT && heat > MIN_HEAT) {
heat -= COOLDOWN_RATE;
}
} }
@Override @Override