diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/CraftingPage.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/CraftingPage.java index de1aa5c0..626ca556 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/CraftingPage.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/CraftingPage.java @@ -59,7 +59,7 @@ public class CraftingPage extends TitledPage { GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); drawTexturedModalRect(offsetX + 70, offsetY + 15, 198, 202, 54, 54); GL11.glPopMatrix(); - drawString(fontRendererObj, "No Recipe", offsetX + 149, offsetY + 60, 0xff0000); + drawString(fontRendererObj, "No Crafting Recipe", offsetX + 129, offsetY + 60, 0xff0000); } } GL11.glPopMatrix(); @@ -73,6 +73,7 @@ public class CraftingPage extends TitledPage { int gridOffsetX = isSmelting ? 88 : 71; int gridOffsetY = 16; int itemBoxSize = 18; + addDescription(minecraft, offsetX, offsetY); ItemStack tooltip = null; int i = 0; @@ -100,8 +101,6 @@ public class CraftingPage extends TitledPage { if (tooltip != null) { drawItemStackTooltip(tooltip, relativeMouseX, relativeMouseY); } - - addDescription(minecraft, offsetX, offsetY); } public void addDescription(Minecraft minecraft, int offsetX, int offsetY){ diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiButtonTextOnly.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiButtonTextOnly.java index 42266381..c474032e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiButtonTextOnly.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiButtonTextOnly.java @@ -34,7 +34,7 @@ public class GuiButtonTextOnly extends GuiButton{ int l = 0x777777; String trimmedDisplayString = displayString; - if (fontrenderer.getStringWidth(displayString) > width && !this.field_146123_n){ + if (fontrenderer.getStringWidth(displayString) > width+30 && !this.field_146123_n){ int energencyBreak = 0; while (fontrenderer.getStringWidth(trimmedDisplayString)*0.7 > width-5){ trimmedDisplayString = trimmedDisplayString.substring(0, trimmedDisplayString.length()-1); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiManual.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiManual.java index f8ee50b5..9aeccf4c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiManual.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiManual.java @@ -7,8 +7,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -17,13 +18,17 @@ import org.lwjgl.opengl.GL12; * Created by Brandon on 16/09/2014. */ @SideOnly(Side.CLIENT) -public class GuiManual extends GuiContainer { +public class GuiManual extends GuiScreen { protected final PageCollection root; protected int pageIndex = 0; + protected int xSize = 0; + protected int ySize = 0; + public Container inventorySlots; + protected int guiLeft; + protected int guiTop; public GuiManual() { - super(new DummyContainer()); this.xSize = 256; this.ySize = 202; root = createRoot(); @@ -75,6 +80,25 @@ public class GuiManual extends GuiContainer { pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModItems.safetyMatch), "")); pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, mobSoul, "")); + pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.weatherController), "")); + pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.sunDial), "")); + pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.playerDetector), "")); + pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.playerDetectorAdvanced), "")); + pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.grinder), "")); + pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.energyInfuser), "")); + pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.customSpawner), "")); + + pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.particleGenerator), "")); + pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.xRayBlock), "")); + pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.potentiometer), "")); + pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.rainSensor), "")); + pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.draconium), "")); + pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.energyStorageCore), "")); + pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.energyPylon), "")); + pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.draconium, 1, 1), "")); + pageCollection.addPage(new CraftingPage("CRAFTING_PAGE_"+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.draconium, 1, 2), "")); + + pageCollection.addPage(new IndexPage("INDEX", pageCollection)); return pageCollection; @@ -89,6 +113,7 @@ public class GuiManual extends GuiContainer { @Override public void drawScreen(int mouseX, int mouseY, float par3) { super.drawScreen(mouseX, mouseY, par3); + drawGuiBackgroundLayer(par3, mouseX, mouseY); prepareRenderState(); GL11.glPushMatrix(); root.drawScreen(this.mc, this.guiLeft, this.guiTop, mouseX - this.guiLeft, mouseY - this.guiTop); @@ -111,8 +136,7 @@ public class GuiManual extends GuiContainer { RenderHelper.enableStandardItemLighting(); } - @Override - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int mouseX, int mouseY) { + protected void drawGuiBackgroundLayer(float p_146976_1_, int mouseX, int mouseY) { GL11.glPushMatrix(); GL11.glTranslated(this.guiLeft, this.guiTop, 0); root.renderBackgroundLayer(this.mc, 0, 0, mouseX - this.guiLeft, mouseY - this.guiTop); @@ -144,5 +168,12 @@ public class GuiManual extends GuiContainer { public void handleInput() { super.handleInput(); } + + @Override + public void initGui() { + super.initGui(); + this.guiLeft = (this.width - this.xSize) / 2; + this.guiTop = (this.height - this.ySize) / 2; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/IndexPage.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/IndexPage.java index dd759e0a..abc8bd65 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/IndexPage.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/IndexPage.java @@ -24,7 +24,7 @@ public class IndexPage extends TitledPage { String indexName = page.INDEX_NAME; if (indexName==null && page instanceof CraftingPage) indexName = ttl(((CraftingPage)page).result.getUnlocalizedName()+".name"); else if (indexName==null) indexName = page.getReferenceName(); - buttonList.add(new GuiButtonTextOnly(999, getXMin()+5+collum*60, getYMin()+20+(row*7), 60, 7, indexName, page.getReferenceName())); + buttonList.add(new GuiButtonTextOnly(999, getXMin()+5+collum*81, getYMin()+20+(row*7), 82, 7, indexName, page.getReferenceName())); row++; if (row > 21){ row = 0;