Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 08:48:34 +01:00
Code Issues Projects Releases Wiki Activity

Fixed a nasty bug with obfuscation causing some booklet pages to break horribly

Browse source
This commit is contained in:
Ellpeck 2016-01-06 05:17:54 +01:00
parent 18bb252dcf
commit f16f1e0496
8 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/de/ellpeck/actuallyadditions/api/internal/IBookletGui.java
View file

@ -41,7 +41,7 @@ public interface IBookletGui{
int getGuiTop(); int getGuiTop();
void drawTexturedModalRect(int startX, int startY, int u, int v, int xSize, int ySize); void drawRect(int startX, int startY, int u, int v, int xSize, int ySize);
EntrySet getCurrentEntrySet(); EntrySet getCurrentEntrySet();
} }

5
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java
View file

@ -456,6 +456,11 @@ public class GuiBooklet extends GuiScreen implements IBookletGui{
return this.guiTop; return this.guiTop;
} }
@Override
public void drawRect(int startX, int startY, int u, int v, int xSize, int ySize){
this.drawTexturedModalRect(startX, startY, u, v, xSize, ySize);
}
@Override @Override
public EntrySet getCurrentEntrySet(){ public EntrySet getCurrentEntrySet(){
return this.currentEntrySet; return this.currentEntrySet;

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java
View file

@ -38,7 +38,7 @@ public class PageCoffeeRecipe extends BookletPageAA{
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){ public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
Minecraft.getMinecraft().getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc); Minecraft.getMinecraft().getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
gui.drawTexturedModalRect(gui.getGuiLeft()+19, gui.getGuiTop()+20, 146, 94, 99, 60); gui.drawRect(gui.getGuiLeft()+19, gui.getGuiTop()+20, 146, 94, 99, 60);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java
View file

@ -76,7 +76,7 @@ public class PageCrafting extends BookletPageAA{
public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){ public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
if(this.recipes[this.recipePos] != null){ if(this.recipes[this.recipePos] != null){
Minecraft.getMinecraft().getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc); Minecraft.getMinecraft().getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
gui.drawTexturedModalRect(gui.getGuiLeft()+27, gui.getGuiTop()+20, 146, 20, 99, 60); gui.drawRect(gui.getGuiLeft()+27, gui.getGuiTop()+20, 146, 20, 99, 60);
} }
} }

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java
View file

@ -49,7 +49,7 @@ public class PageCrusherRecipe extends BookletPageAA{
public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){ public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
if(recipe != null){ if(recipe != null){
Minecraft.getMinecraft().getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc); Minecraft.getMinecraft().getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
gui.drawTexturedModalRect(gui.getGuiLeft()+37, gui.getGuiTop()+20, 60, 180, 60, 60); gui.drawRect(gui.getGuiLeft()+37, gui.getGuiTop()+20, 60, 180, 60, 60);
} }
} }

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java
View file

@ -52,7 +52,7 @@ public class PageFurnace extends BookletPageAA{
public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){ public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
if(this.input != null || this.getInputForOutput(this.result) != null){ if(this.input != null || this.getInputForOutput(this.result) != null){
Minecraft.getMinecraft().getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc); Minecraft.getMinecraft().getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
gui.drawTexturedModalRect(gui.getGuiLeft()+37, gui.getGuiTop()+20, 0, 180, 60, 60); gui.drawRect(gui.getGuiLeft()+37, gui.getGuiTop()+20, 0, 180, 60, 60);
} }
} }

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

@ -33,7 +33,7 @@ public class PagePicture extends PageTextOnly{
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){ public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
Minecraft.getMinecraft().getTextureManager().bindTexture(this.resLoc); Minecraft.getMinecraft().getTextureManager().bindTexture(this.resLoc);
gui.drawTexturedModalRect(gui.getGuiLeft(), gui.getGuiTop(), 0, 0, gui.getXSize(), gui.getYSize()); gui.drawRect(gui.getGuiLeft(), gui.getGuiTop(), 0, 0, gui.getXSize(), gui.getYSize());
String text = gui.getCurrentEntrySet().page.getText(); String text = gui.getCurrentEntrySet().page.getText();
if(text != null && !text.isEmpty()){ if(text != null && !text.isEmpty()){

2
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java
View file

@ -62,7 +62,7 @@ public class PageReconstructor extends BookletPageAA{
public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){ public void renderPre(IBookletGui gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
if(this.recipes[this.recipePos] != null){ if(this.recipes[this.recipePos] != null){
Minecraft.getMinecraft().getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc); Minecraft.getMinecraft().getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
gui.drawTexturedModalRect(gui.getGuiLeft()+37, gui.getGuiTop()+20, 188, 154, 60, 60); gui.drawRect(gui.getGuiLeft()+37, gui.getGuiTop()+20, 188, 154, 60, 60);
} }
} }