Fix flickering GUI

This commit is contained in:
marcin212 committed 2016-10-21 18:06:45 +02:00
1 parent 59e21d05ef
commit 4cca08af79
3 files changed
+62 -57

No files matched your search

@@ -1,11 +1,15 @@
package binnie.craftgui.extratrees.kitchen;
import binnie.craftgui.controls.core.Control;
import binnie.craftgui.core.Attribute;
import binnie.craftgui.core.ITooltip;
import binnie.craftgui.core.IWidget;
import binnie.craftgui.core.Tooltip;
import binnie.craftgui.core.*;
import binnie.craftgui.core.geometry.IPoint;
import binnie.craftgui.minecraft.Window;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.client.FMLClientHandler;
import org.lwjgl.opengl.GL11;
public class ControlFluidDisplay extends Control implements ITooltip {
FluidStack itemStack;
@@ -36,36 +40,36 @@ public class ControlFluidDisplay extends Control implements ITooltip {
@Override
public void onRenderForeground() {
//TODO RENDERING
// if (this.itemStack == null) {
// return;
// }
// final IPoint relativeToWindow = this.getAbsolutePosition().sub(this.getSuperParent().getPosition());
// if (relativeToWindow.x() > Window.get(this).getSize().x() + 100.0f || relativeToWindow.y() > Window.get(this).getSize().y() + 100.0f) {
// return;
// }
// if (this.itemStack != null) {
// final Fluid fluid = this.itemStack.getFluid();
// final int hex = fluid.getColor(this.itemStack);
// final int r = (hex & 0xFF0000) >> 16;
// final int g = (hex & 0xFF00) >> 8;
// final int b = hex & 0xFF;
// final IIcon icon = this.itemStack.getFluid().getIcon(this.itemStack);
// GL11.glColor4f(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f);
// GL11.glEnable(3042);
// GL11.glBlendFunc(770, 771);
// if (this.getSize().x() != 16.0f) {
// GL11.glPushMatrix();
// final float scale = this.getSize().x() / 16.0f;
// GL11.glScalef(scale, scale, 1.0f);
// CraftGUI.Render.iconBlock(IPoint.ZERO, this.itemStack.getFluid().getIcon(this.itemStack));
// GL11.glPopMatrix();
// }
// else {
// CraftGUI.Render.iconBlock(IPoint.ZERO, this.itemStack.getFluid().getIcon(this.itemStack));
// }
// GL11.glDisable(3042);
// }
if (this.itemStack == null) {
return;
}
final IPoint relativeToWindow = this.getAbsolutePosition().sub(this.getSuperParent().getPosition());
if (relativeToWindow.x() > Window.get(this).getSize().x() + 100.0f || relativeToWindow.y() > Window.get(this).getSize().y() + 100.0f) {
return;
}
if (this.itemStack != null) {
final Fluid fluid = this.itemStack.getFluid();
final int hex = fluid.getColor(this.itemStack);
final int r = (hex & 0xFF0000) >> 16;
final int g = (hex & 0xFF00) >> 8;
final int b = hex & 0xFF;
final ResourceLocation iconRL = this.itemStack.getFluid().getStill();
TextureAtlasSprite icon = FMLClientHandler.instance().getClient().getTextureMapBlocks().getAtlasSprite(iconRL.toString());
GL11.glColor4f(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f);
GL11.glEnable(3042);
GL11.glBlendFunc(770, 771);
if (this.getSize().x() != 16.0f) {
GL11.glPushMatrix();
final float scale = this.getSize().x() / 16.0f;
GL11.glScalef(scale, scale, 1.0f);
CraftGUI.Render.iconBlock(IPoint.ZERO, icon);
GL11.glPopMatrix();
}
else {
CraftGUI.Render.iconBlock(IPoint.ZERO, icon);
}
GL11.glDisable(3042);
}
}
public void setItemStack(final FluidStack itemStack) {