maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed the double click sound when pressing back button

Browse source 
changed all text colour to white until config is in
This commit is contained in:
gigabit101 2015-11-01 15:15:44 +00:00
parent 2483dc0c2f
commit 9dcc36adfe
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/techreborn/pda/pages/ContentsPage.java
View file

@ -50,10 +50,8 @@ public class ContentsPage extends TitledPage {
if (button.id == 5)collection.changeActivePage("MULTIBLOCKS"); if (button.id == 5)collection.changeActivePage("MULTIBLOCKS");
if (button.id == 6)collection.changeActivePage("UPGRADES"); if (button.id == 6)collection.changeActivePage("UPGRADES");
if (button.id == 7)collection.changeActivePage("VERSION"); if (button.id == 7)collection.changeActivePage("VERSION");
if (button.id == 8){ if (button.id == 8)mc.displayGuiScreen(new TechRebornConfigGui(this));
buttonList.clear();
mc.displayGuiScreen(new TechRebornConfigGui(this));
}
if (button.id == 9)collection.changeActivePage("CONFIG"); if (button.id == 9)collection.changeActivePage("CONFIG");
} }

7
src/main/java/techreborn/pda/pages/CraftingInfoPage.java
View file

@ -1,5 +1,6 @@
package techreborn.pda.pages; package techreborn.pda.pages;
import java.awt.Color;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
@ -42,7 +43,7 @@ public class CraftingInfoPage extends TitledPage{
private float descriptionScale = 0.66f; private float descriptionScale = 0.66f;
public CraftingInfoPage(String name, PageCollection collection, ItemStack itemStack, String unlocalizedDescription) { 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.result = itemStack;
this.recipe = getFirstRecipeForItem(itemStack); this.recipe = getFirstRecipeForItem(itemStack);
for (ItemStack stack : recipe) if (stack != null) hasRecipe = true; for (ItemStack stack : recipe) if (stack != null) hasRecipe = true;
@ -62,7 +63,7 @@ public class CraftingInfoPage extends TitledPage{
} }
else { else {
drawTexturedModalRect(offsetX + 119, offsetY + 17, 0, 202, 18, 18); 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(); GL11.glPopMatrix();
@ -123,7 +124,7 @@ public class CraftingInfoPage extends TitledPage{
s = s.substring(2); s = s.substring(2);
offset += fontRendererObj.FONT_HEIGHT/2; offset += fontRendererObj.FONT_HEIGHT/2;
} }
fontRendererObj.drawString(s, 0, offset, 6666666); fontRendererObj.drawString(s, 0, offset, Color.white.getRGB());
offset += fontRendererObj.FONT_HEIGHT; offset += fontRendererObj.FONT_HEIGHT;
} }
GL11.glPopMatrix(); GL11.glPopMatrix();

8
src/main/java/techreborn/pda/pages/ItemsPage.java
View file

@ -1,5 +1,7 @@
package techreborn.pda.pages; package techreborn.pda.pages;
import java.awt.Color;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderItem;
@ -15,7 +17,7 @@ public class ItemsPage extends TitledPage{
public String PAGE; public String PAGE;
public ItemsPage(String name, PageCollection collection, 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; 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 @Override
public void actionPerformed(GuiButton button) { public void actionPerformed(GuiButton button) {
if (button instanceof GuiButtonTextOnly) if (button instanceof GuiButtonTextOnly)
collection.changeActivePage(((GuiButtonTextOnly)button).LINKED_PAGE); collection.changeActivePage(((GuiButtonTextOnly)button).LINKED_PAGE);
if (button.id == 0) collection.changeActivePage("CONTENTS"); if (button.id == 1) collection.changeActivePage("CONTENTS");
} }
@Override @Override
@ -63,6 +66,5 @@ public class ItemsPage extends TitledPage{
((GuiButtonTextOnly) this.buttonList.get(k)).drawButton(this.mc, mouseX + offsetX, mouseY + offsetY); ((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")));
} }
} }

2
src/main/java/techreborn/pda/pages/VersionPage.java
View file

@ -23,7 +23,7 @@ import techreborn.pda.PageCollection;
public class VersionPage extends TitledPage{ public class VersionPage extends TitledPage{
public VersionPage(String name, PageCollection collection, String unlocalizedTitle, int colour) { 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 @Override