diff --git a/src/main/java/techreborn/pda/pages/ContentsPage.java b/src/main/java/techreborn/pda/pages/ContentsPage.java index 1d26079e2..574a7d171 100644 --- a/src/main/java/techreborn/pda/pages/ContentsPage.java +++ b/src/main/java/techreborn/pda/pages/ContentsPage.java @@ -50,10 +50,8 @@ public class ContentsPage extends TitledPage { if (button.id == 5)collection.changeActivePage("MULTIBLOCKS"); if (button.id == 6)collection.changeActivePage("UPGRADES"); if (button.id == 7)collection.changeActivePage("VERSION"); - if (button.id == 8){ - buttonList.clear(); - mc.displayGuiScreen(new TechRebornConfigGui(this)); - } + if (button.id == 8)mc.displayGuiScreen(new TechRebornConfigGui(this)); + if (button.id == 9)collection.changeActivePage("CONFIG"); } diff --git a/src/main/java/techreborn/pda/pages/CraftingInfoPage.java b/src/main/java/techreborn/pda/pages/CraftingInfoPage.java index de9fb0a20..cbc8916f6 100644 --- a/src/main/java/techreborn/pda/pages/CraftingInfoPage.java +++ b/src/main/java/techreborn/pda/pages/CraftingInfoPage.java @@ -1,5 +1,6 @@ package techreborn.pda.pages; +import java.awt.Color; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Iterator; @@ -42,7 +43,7 @@ public class CraftingInfoPage extends TitledPage{ private float descriptionScale = 0.66f; public CraftingInfoPage(String name, PageCollection collection, ItemStack itemStack, String unlocalizedDescription) { - super(name, true, collection, itemStack.getUnlocalizedName()+".name", 7777777); + super(name, true, collection, itemStack.getUnlocalizedName()+".name", Color.white.getRGB()); this.result = itemStack; this.recipe = getFirstRecipeForItem(itemStack); for (ItemStack stack : recipe) if (stack != null) hasRecipe = true; @@ -62,7 +63,7 @@ public class CraftingInfoPage extends TitledPage{ } else { drawTexturedModalRect(offsetX + 119, offsetY + 17, 0, 202, 18, 18); - drawString(fontRendererObj, "No Crafting Recipe", offsetX + 145, offsetY + 17, 6666666); + drawString(fontRendererObj, "No Crafting Recipe", offsetX + 145, offsetY + 17, Color.white.getRGB()); } } GL11.glPopMatrix(); @@ -123,7 +124,7 @@ public class CraftingInfoPage extends TitledPage{ s = s.substring(2); offset += fontRendererObj.FONT_HEIGHT/2; } - fontRendererObj.drawString(s, 0, offset, 6666666); + fontRendererObj.drawString(s, 0, offset, Color.white.getRGB()); offset += fontRendererObj.FONT_HEIGHT; } GL11.glPopMatrix(); diff --git a/src/main/java/techreborn/pda/pages/ItemsPage.java b/src/main/java/techreborn/pda/pages/ItemsPage.java index 5174b32ce..eed484cd6 100644 --- a/src/main/java/techreborn/pda/pages/ItemsPage.java +++ b/src/main/java/techreborn/pda/pages/ItemsPage.java @@ -1,5 +1,7 @@ package techreborn.pda.pages; +import java.awt.Color; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.entity.RenderItem; @@ -15,7 +17,7 @@ public class ItemsPage extends TitledPage{ public String PAGE; public ItemsPage(String name, PageCollection collection, String page) { - super(name, false, collection, page, 7777777); + super(name, false, collection, page, Color.white.getRGB()); PAGE = page; } @@ -41,13 +43,14 @@ public class ItemsPage extends TitledPage{ } } } + buttonList.add(new GuiButton(1, getXMin() + 20, getYMin() + 180, ttl("techreborn.pda.backbutton"))); } @Override public void actionPerformed(GuiButton button) { if (button instanceof GuiButtonTextOnly) collection.changeActivePage(((GuiButtonTextOnly)button).LINKED_PAGE); - if (button.id == 0) collection.changeActivePage("CONTENTS"); + if (button.id == 1) collection.changeActivePage("CONTENTS"); } @Override @@ -63,6 +66,5 @@ public class ItemsPage extends TitledPage{ ((GuiButtonTextOnly) this.buttonList.get(k)).drawButton(this.mc, mouseX + offsetX, mouseY + offsetY); } } - buttonList.add(new GuiButton(0, offsetX + 20, offsetY + 180, ttl("techreborn.pda.backbutton"))); } } diff --git a/src/main/java/techreborn/pda/pages/VersionPage.java b/src/main/java/techreborn/pda/pages/VersionPage.java index 61e0a2deb..72b47d997 100644 --- a/src/main/java/techreborn/pda/pages/VersionPage.java +++ b/src/main/java/techreborn/pda/pages/VersionPage.java @@ -23,7 +23,7 @@ import techreborn.pda.PageCollection; public class VersionPage extends TitledPage{ public VersionPage(String name, PageCollection collection, String unlocalizedTitle, int colour) { - super(name, false, collection, unlocalizedTitle, 77777); + super(name, false, collection, unlocalizedTitle, Color.white.getRGB()); } @Override