From 59799cad7771597dd58e8a26edcdcecfa37c0624 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Sat, 15 Aug 2015 12:34:37 +0100 Subject: Added a config option to disable curses. --- src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java | 6 ++++-- src/main/java/darkknight/jewelrycraft/client/gui/GuiTabCurses.java | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/client') diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java index 752a2a7..c0c48cd 100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java @@ -9,6 +9,7 @@ import darkknight.jewelrycraft.JewelrycraftMod; import darkknight.jewelrycraft.api.Curse; import darkknight.jewelrycraft.client.TabCurses; import darkknight.jewelrycraft.client.TabRegistry; +import darkknight.jewelrycraft.config.ConfigHandler; import darkknight.jewelrycraft.events.KeyBindings; import darkknight.jewelrycraft.network.PacketSendClientPlayerInfo; import darkknight.jewelrycraft.network.PacketSendServerPlayerInfo; @@ -124,7 +125,8 @@ public class GuiCurseInfo extends GuiContainer { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1f, 1f, 1f, 0.5f); + if(!curse.canCurseBeActivated() || !ConfigHandler.CURSES_ENABLED) GL11.glColor4f(1f, 0f, 0f, 0.5f); + else GL11.glColor4f(1f, 1f, 1f, 0.5f); } mc.renderEngine.bindTexture(Variables.MISC_TEXTURE); drawTexturedModalRect(guiLeft + 43, guiTop + 8 + (size - 8) * (ind - page * 5), 0, 32, 112, 22); @@ -196,7 +198,7 @@ public class GuiCurseInfo extends GuiContainer { Curse.availableCurses.add(curse); JewelrycraftMod.netWrapper.sendToServer(new PacketSendServerPlayerInfo("remove", curse.getName(), playerInfo)); JewelrycraftMod.netWrapper.sendToAll(new PacketSendServerPlayersInfo()); - } else if (player.capabilities.isCreativeMode && isCtrlKeyDown() && playerInfo.getInteger(curse.getName()) <= 0) { + } else if (player.capabilities.isCreativeMode && isCtrlKeyDown() && playerInfo.getInteger(curse.getName()) <= 0 && curse.canCurseBeActivated() && ConfigHandler.CURSES_ENABLED) { playerInfo.setInteger(curse.getName(), 1); playerInfo.setInteger("activeCurses", playerInfo.getInteger("activeCurses") + 1); Curse.availableCurses.remove(curse); diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabCurses.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabCurses.java index 0bbf258..4157a38 100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabCurses.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabCurses.java @@ -75,13 +75,17 @@ public class GuiTabCurses extends GuiTab text = "Any mob you kill or block you destroy(eg. Diamond Ore, Redstone Ore, stuff that drops items not the block itself) drops double the amount of items it normally would."; Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop() - 5, new ItemStack(ItemList.testItem, 1, 9), text, 40f, 0, 0, Curse.getCurseList().get(page-1).getDisplayName(), 45, 10, false); break; + case 11: + text = "All the damage you do pierces through armor or any other type of defense, but creatures no longer drop XP."; + Page.addImageTextPage(gui, gui.getLeft() + xPos, gui.getTop() - 5, new ItemStack(ItemList.testItem, 1, 10), text, 40f, 0, 0, Curse.getCurseList().get(page-1).getDisplayName(), 45, 10, false); + break; default:; } } @Override public int getMaxPages() { - return 10; + return 11; } @Override -- cgit v1.2.3