Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

Made picture pages not suck

Browse source
This commit is contained in:
Ellpeck 2016-11-17 18:03:37 +01:00
parent 74cd597407
commit 7ae35e05a9
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PagePicture.java
View file

@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.booklet.page;
import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase;
import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.client.config.GuiUtils; import net.minecraftforge.fml.client.config.GuiUtils;
@ -35,7 +36,14 @@ public class PagePicture extends BookletPage{
super.drawScreenPre(gui, startX, startY, mouseX, mouseY, partialTicks); super.drawScreenPre(gui, startX, startY, mouseX, mouseY, partialTicks);
gui.mc.getTextureManager().bindTexture(this.resLoc); gui.mc.getTextureManager().bindTexture(this.resLoc);
GlStateManager.pushMatrix();
GlStateManager.enableBlend();
GlStateManager.disableAlpha();
GuiUtils.drawTexturedModalRect(startX-6, startY-7, 0, 0, 256, 256, 0); GuiUtils.drawTexturedModalRect(startX-6, startY-7, 0, 0, 256, 256, 0);
GlStateManager.disableBlend();
GlStateManager.enableAlpha();
GlStateManager.popMatrix();
PageTextOnly.renderTextToPage(gui, this, startX+6, startY-7+this.yTextOffset); PageTextOnly.renderTextToPage(gui, this, startX+6, startY-7+this.yTextOffset);
} }

2
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java
View file

@ -82,6 +82,7 @@ public class FluidDisplay extends Gui{
if(stack != null && fluid != null && this.resLoc != null){ if(stack != null && fluid != null && this.resLoc != null){
mc.getTextureManager().bindTexture(this.resLoc); mc.getTextureManager().bindTexture(this.resLoc);
GlStateManager.pushMatrix();
GlStateManager.enableBlend(); GlStateManager.enableBlend();
GlStateManager.disableAlpha(); GlStateManager.disableAlpha();
GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
@ -89,6 +90,7 @@ public class FluidDisplay extends Gui{
GuiInputter.drawModalRectWithCustomSizedTexture(barX+1, barY+84-i, 36, 172, 16, i, 16, 512); GuiInputter.drawModalRectWithCustomSizedTexture(barX+1, barY+84-i, 36, 172, 16, i, 16, 512);
GlStateManager.disableBlend(); GlStateManager.disableBlend();
GlStateManager.enableAlpha(); GlStateManager.enableAlpha();
GlStateManager.popMatrix();
} }
if(this.drawTextNextTo){ if(this.drawTextNextTo){