mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-20 20:22:35 +00:00
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
This commit is contained in:
commit
9ba257dec5
42 files changed
+1389
-922
No files matched your search
@@ -12,9 +12,8 @@ import binnie.craftgui.minecraft.control.ControlProgressBase;
|
||||
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 binnie.extratrees.machines.brewery.BreweryLogic;
|
||||
import binnie.extratrees.machines.brewery.BreweryRecipes;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
@@ -28,28 +27,28 @@ public class ControlBreweryProgress extends ControlProgressBase {
|
||||
@Override
|
||||
public void onRenderBackground() {
|
||||
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) {
|
||||
final BreweryLogic logic = Machine.getInterface(BreweryLogic.class, Window.get(this).getInventory());
|
||||
if (logic == null || logic.currentCrafting == null || logic.currentCrafting.inputFluid == 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)));
|
||||
GL11.glEnable(3089);
|
||||
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);
|
||||
CraftGUI.render.fluid(new IPoint(1.0f, 6.0f), logic.currentCrafting.inputFluid);
|
||||
CraftGUI.render.fluid(new IPoint(17.0f, 6.0f), logic.currentCrafting.inputFluid);
|
||||
CraftGUI.render.fluid(new IPoint(1.0f, 22.0f), logic.currentCrafting.inputFluid);
|
||||
CraftGUI.render.fluid(new IPoint(17.0f, 22.0f), logic.currentCrafting.inputFluid);
|
||||
GL11.glDisable(3089);
|
||||
CraftGUI.render.limitArea(new IArea(new IPoint(1.0f, 38 - fermentedHeight).add(this.getAbsolutePosition()), new IPoint(32.0f, fermentedHeight)));
|
||||
GL11.glEnable(3089);
|
||||
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));
|
||||
CraftGUI.render.fluid(new IPoint(1.0f, 6.0f), BreweryRecipes.getOutput(logic.currentCrafting));
|
||||
CraftGUI.render.fluid(new IPoint(17.0f, 6.0f), BreweryRecipes.getOutput(logic.currentCrafting));
|
||||
CraftGUI.render.fluid(new IPoint(1.0f, 22.0f), BreweryRecipes.getOutput(logic.currentCrafting));
|
||||
CraftGUI.render.fluid(new IPoint(17.0f, 22.0f), BreweryRecipes.getOutput(logic.currentCrafting));
|
||||
GL11.glDisable(3089);
|
||||
final ItemStackSet stacks = new ItemStackSet();
|
||||
Collections.addAll(stacks, logic.currentCrafting.inputs);
|
||||
stacks.add(logic.currentCrafting.ingr);
|
||||
Collections.addAll(stacks, logic.currentCrafting.inputGrains);
|
||||
stacks.add(logic.currentCrafting.ingredient);
|
||||
int x = 1;
|
||||
int y = 6;
|
||||
for (final ItemStack stack : stacks) {
|
||||
|
||||
Reference in new issue
Block a user