mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-20 20:22:35 +00:00
Improve fluid rendering
This commit is contained in:
1 parent
f0d8d6b89d
commit
87cf7386c6
83 files changed
+351
-306
No files matched your search
@@ -13,6 +13,8 @@ import binnie.craftgui.resource.Texture;
|
||||
import binnie.craftgui.resource.minecraft.StandardTexture;
|
||||
import binnie.extratrees.core.ExtraTreeTexture;
|
||||
import binnie.extratrees.machines.Brewery;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
@@ -25,25 +27,25 @@ public class ControlBreweryProgress extends ControlProgressBase {
|
||||
|
||||
@Override
|
||||
public void onRenderBackground() {
|
||||
CraftGUI.Render.texture(ControlBreweryProgress.Brewery, new IPoint(0.0f, 0.0f));
|
||||
CraftGUI.render.texture(ControlBreweryProgress.Brewery, new IPoint(0.0f, 0.0f));
|
||||
final Brewery.ComponentBreweryLogic logic = Machine.getInterface(Brewery.ComponentBreweryLogic.class, Window.get(this).getInventory());
|
||||
if (logic == null || logic.currentCrafting == null || logic.currentCrafting.currentInput == null) {
|
||||
return;
|
||||
}
|
||||
final int fermentedHeight = (int) (32.0f * logic.getProgress() / 100.0f);
|
||||
CraftGUI.Render.limitArea(new IArea(new IPoint(1.0f, 6.0f).add(this.getAbsolutePosition()), new IPoint(32.0f, 32 - fermentedHeight)));
|
||||
CraftGUI.render.limitArea(new IArea(new IPoint(1.0f, 6.0f).add(this.getAbsolutePosition()), new IPoint(32.0f, 32 - fermentedHeight)));
|
||||
GL11.glEnable(3089);
|
||||
this.renderFluid(logic.currentCrafting.currentInput, new IPoint(1.0f, 6.0f));
|
||||
this.renderFluid(logic.currentCrafting.currentInput, new IPoint(17.0f, 6.0f));
|
||||
this.renderFluid(logic.currentCrafting.currentInput, new IPoint(1.0f, 22.0f));
|
||||
this.renderFluid(logic.currentCrafting.currentInput, new IPoint(17.0f, 22.0f));
|
||||
CraftGUI.render.fluid(new IPoint(1.0f, 6.0f), logic.currentCrafting.currentInput);
|
||||
CraftGUI.render.fluid(new IPoint(17.0f, 6.0f), logic.currentCrafting.currentInput);
|
||||
CraftGUI.render.fluid(new IPoint(1.0f, 22.0f), logic.currentCrafting.currentInput);
|
||||
CraftGUI.render.fluid(new IPoint(17.0f, 22.0f), logic.currentCrafting.currentInput);
|
||||
GL11.glDisable(3089);
|
||||
CraftGUI.Render.limitArea(new IArea(new IPoint(1.0f, 38 - fermentedHeight).add(this.getAbsolutePosition()), new IPoint(32.0f, fermentedHeight)));
|
||||
CraftGUI.render.limitArea(new IArea(new IPoint(1.0f, 38 - fermentedHeight).add(this.getAbsolutePosition()), new IPoint(32.0f, fermentedHeight)));
|
||||
GL11.glEnable(3089);
|
||||
this.renderFluid(binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting), new IPoint(1.0f, 6.0f));
|
||||
this.renderFluid(binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting), new IPoint(17.0f, 6.0f));
|
||||
this.renderFluid(binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting), new IPoint(1.0f, 22.0f));
|
||||
this.renderFluid(binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting), new IPoint(17.0f, 22.0f));
|
||||
CraftGUI.render.fluid(new IPoint(1.0f, 6.0f), binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting));
|
||||
CraftGUI.render.fluid(new IPoint(17.0f, 6.0f), binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting));
|
||||
CraftGUI.render.fluid(new IPoint(1.0f, 22.0f), binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting));
|
||||
CraftGUI.render.fluid(new IPoint(17.0f, 22.0f), binnie.extratrees.machines.Brewery.getOutput(logic.currentCrafting));
|
||||
GL11.glDisable(3089);
|
||||
final ItemStackSet stacks = new ItemStackSet();
|
||||
Collections.addAll(stacks, logic.currentCrafting.inputs);
|
||||
@@ -51,7 +53,7 @@ public class ControlBreweryProgress extends ControlProgressBase {
|
||||
int x = 1;
|
||||
int y = 6;
|
||||
for (final ItemStack stack : stacks) {
|
||||
CraftGUI.Render.item(new IPoint(x, y), stack);
|
||||
CraftGUI.render.item(new IPoint(x, y), stack);
|
||||
x += 16;
|
||||
if (x > 18) {
|
||||
x = 1;
|
||||
@@ -69,17 +71,4 @@ public class ControlBreweryProgress extends ControlProgressBase {
|
||||
this.addAttribute(Attribute.MouseOver);
|
||||
}
|
||||
|
||||
public void renderFluid(final FluidStack fluid, final IPoint pos) {
|
||||
// final int hex = fluid.getFluid().getColor(fluid);
|
||||
// final int r = (hex & 0xFF0000) >> 16;
|
||||
// final int g = (hex & 0xFF00) >> 8;
|
||||
// final int b = hex & 0xFF;
|
||||
// final IIcon icon = fluid.getFluid().getIcon();
|
||||
// GL11.glColor4f(r / 255.0f, g / 255.0f, b / 255.0f, 1.0f);
|
||||
// GL11.glEnable(3042);
|
||||
// GL11.glBlendFunc(770, 771);
|
||||
// CraftGUI.Render.iconBlock(pos, fluid.getFluid().getIcon());
|
||||
// GL11.glDisable(3042);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user