diff options
| author | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2015-08-15 12:34:37 +0100 |
|---|---|---|
| committer | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2015-08-15 12:34:37 +0100 |
| commit | 59799cad7771597dd58e8a26edcdcecfa37c0624 (patch) | |
| tree | ea96c46852e8beba46a7cad56c342461db6987a9 /src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java | |
| parent | 5a4aff197ffeabaf45f25636537fa53eb819fb7a (diff) | |
Added a config option to disable curses.
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java')
| -rw-r--r-- | src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java | 6 |
1 files changed, 4 insertions, 2 deletions
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);
|
