From 4f7ad220df0438b6f3382110577b53f29da46453 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 15:50:07 -0400 Subject: Update of all changes --- .../jewelrycraft/client/gui/GuiCurseInfo.java | 277 +++++++++++++++------ 1 file changed, 207 insertions(+), 70 deletions(-) mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java (limited to 'src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java') diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java old mode 100644 new mode 100755 index 16b946c..acd1a69 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiCurseInfo.java @@ -2,7 +2,9 @@ package darkknight.jewelrycraft.client.gui; import java.util.ArrayList; import java.util.List; + import org.lwjgl.opengl.GL11; + import darkknight.jewelrycraft.JewelrycraftMod; import darkknight.jewelrycraft.api.Curse; import darkknight.jewelrycraft.client.TabCurses; @@ -23,13 +25,14 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; public class GuiCurseInfo extends GuiContainer { - World world; - EntityPlayer player; - ResourceLocation texture; - int page = 0, maxPages = 1; - String selectedCurse = ""; + World world; + EntityPlayer player; + ResourceLocation texture; + int page = 0, maxPages = 1; + String selectedCurse = ""; - public GuiCurseInfo(Container container, World world, EntityPlayer player, ResourceLocation texture) { + public GuiCurseInfo(Container container, World world, + EntityPlayer player, ResourceLocation texture) { super(container); this.world = world; this.player = player; @@ -38,47 +41,75 @@ public class GuiCurseInfo extends GuiContainer { ySize = 166; } + @Override public void drawScreen(int x, int y, float size) { super.drawScreen(x, y, size); } @Override - public void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) { + public void drawGuiContainerBackgroundLayer(float f, int mouseX, + int mouseY) { GL11.glColor3f(1, 1, 1); Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if (player != null) { - NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); - if (!player.capabilities.isCreativeMode) maxPages = playerInfo.getInteger("activeCurses") / 5 - (playerInfo.getInteger("activeCurses") % 5 == 0 ? 1 : 0); - else maxPages = Curse.getCurseList().size() / 5 - (Curse.getCurseList().size() % 5 == 0 ? 1 : 0); - if (!player.capabilities.isCreativeMode) survivalCurses(playerInfo); - else creativeCurses(playerInfo); - if (playerInfo.hasKey("cursePoints")) this.drawString(fontRendererObj, "Curse points: " + playerInfo.getInteger("cursePoints") + " | Active curses: " + playerInfo.getInteger("activeCurses"), guiLeft, guiTop - 10, 0xffffff); + NBTTagCompound playerInfo = PlayerUtils + .getModPlayerPersistTag(player, Variables.MODID); + if (!player.capabilities.isCreativeMode) + maxPages = playerInfo.getInteger("activeCurses") / 5 + - (playerInfo.getInteger("activeCurses") % 5 == 0 + ? 1 : 0); + else + maxPages = Curse.getCurseList().size() / 5 + - (Curse.getCurseList().size() % 5 == 0 ? 1 : 0); + if (!player.capabilities.isCreativeMode) + survivalCurses(playerInfo); + else + creativeCurses(playerInfo); + if (playerInfo.hasKey("cursePoints")) + this.drawString(fontRendererObj, + "Curse points: " + + playerInfo.getInteger("cursePoints") + + " | Active curses: " + + playerInfo.getInteger("activeCurses"), + guiLeft, guiTop - 10, 0xffffff); } Minecraft.getMinecraft().getTextureManager().bindTexture(texture); - drawTexturedModalRect(guiLeft + 5, guiTop + ySize - 14, 0, ySize, 13, 11); - drawTexturedModalRect(guiLeft + xSize - 38, guiTop + ySize - 14, 13, ySize, 13, 11); - this.drawString(fontRendererObj, (page + 1) + "/" + (maxPages + 1), guiLeft + 90, guiTop + 153, 0xffffff); - this.drawString(fontRendererObj, "Click on an active curse to see its description", guiLeft, guiTop + 170, 0xffffff); + drawTexturedModalRect(guiLeft + 5, guiTop + ySize - 14, 0, ySize, + 13, 11); + drawTexturedModalRect(guiLeft + xSize - 38, guiTop + ySize - 14, + 13, ySize, 13, 11); + this.drawString(fontRendererObj, (page + 1) + "/" + (maxPages + 1), + guiLeft + 90, guiTop + 153, 0xffffff); + this.drawString(fontRendererObj, + "Click on an active curse to see its description", guiLeft, + guiTop + 170, 0xffffff); if (player.capabilities.isCreativeMode) { - drawText(this, "To enable or disable a curse simply hold the CTRL key and click on one.", guiLeft - 100, guiTop, 20, 0xff0000); - drawText(this, "If you do not have any curse points you need to type the command '/jw addCursePoints [playerUsername] [no of curse points]'. If you don't do this any curse you activate won't have any effect.", guiLeft - 100, guiTop + 50, 20, 0xff0000); + drawText(this, + "To enable or disable a curse simply hold the CTRL key and click on one.", + guiLeft - 100, guiTop, 20, 0xff0000); + drawText(this, + "If you do not have any curse points you need to type the command '/jw addCursePoints [playerUsername] [no of curse points]'. If you don't do this any curse you activate won't have any effect.", + guiLeft - 100, guiTop + 50, 20, 0xff0000); } } - public static void drawText(GuiCurseInfo gui, String text, int x, int y, int characters, int color) { + public static void drawText(GuiCurseInfo gui, String text, int x, + int y, int characters, int color) { String[] s = text.split(" "); String displayText = ""; - ArrayList textLines = new ArrayList(); + ArrayList textLines = new ArrayList<>(); for (String element : s) - if ((displayText + element + " ").length() <= characters) displayText += element + " "; + if ((displayText + element + " ").length() <= characters) + displayText += element + " "; else { textLines.add(displayText.trim()); displayText = element + " "; } textLines.add(displayText.trim()); for (int i = 0; i < textLines.size(); i++) - gui.drawString(gui.getFont(), textLines.get(i), x, y + i * 9, color); + gui.drawString(gui.getFont(), textLines.get(i), x, y + i * 9, + color); } public FontRenderer getFont() { @@ -92,41 +123,80 @@ public class GuiCurseInfo extends GuiContainer { for (Curse curse : Curse.getCurseList()) { if (playerInfo.getInteger(curse.getName()) > 0) { if (ind >= page * 5 && ind < (page + 1) * 5) { - if (ind == page * 5 && selectedCurse == "") selectedCurse = curse.getName(); - mc.renderEngine.bindTexture(Variables.MISC_TEXTURE); - drawTexturedModalRect(guiLeft + 43, guiTop + 8 + (size - 8) * (ind - page * 5), 0, 32, 112, 22); + if (ind == page * 5 && selectedCurse == "") + selectedCurse = curse.getName(); + mc.renderEngine + .bindTexture(Variables.MISC_TEXTURE); + drawTexturedModalRect(guiLeft + 43, + guiTop + 8 + (size - 8) * (ind - page * 5), + 0, 32, 112, 22); if (selectedCurse == curse.getName()) { GL11.glPushMatrix(); GL11.glScalef(1.2f, 1.5f, 0f); - drawTexturedModalRect((int) (guiLeft / (1.2)) + 126, (int) (guiTop / (1.5)) + 7 + (size - 16) * (ind - page * 5), 48, 16, 32, 16); - drawTexturedModalRect((int) (guiLeft / (1.2)) + 5, (int) (guiTop / (1.5)) + 7 + (size - 16) * (ind - page * 5), 80, 16, 32, 16); + drawTexturedModalRect( + (int) (guiLeft / (1.2)) + 126, + (int) (guiTop / (1.5)) + 7 + + (size - 16) + * (ind - page * 5), + 48, 16, 32, 16); + drawTexturedModalRect( + (int) (guiLeft / (1.2)) + 5, + (int) (guiTop / (1.5)) + 7 + + (size - 16) + * (ind - page * 5), + 80, 16, 32, 16); GL11.glPopMatrix(); GL11.glPushMatrix(); - List descr = fontRendererObj.listFormattedStringToWidth(curse.getDescription(), 238); + List descr = fontRendererObj + .listFormattedStringToWidth( + curse.getDescription(), 238); GL11.glScalef(0.75F, 0.75F, 0F); for (int i = 0; i < descr.size(); i++) - this.drawString(fontRendererObj, descr.get(i).toString(), (int) (guiLeft / 0.75F) + 12, (int) (guiTop / 0.75F) + 184 + i * 12 - (descr.size() > 1 ? 6 : 0), 0xffffff); + this.drawString(fontRendererObj, + descr.get(i).toString(), + (int) (guiLeft / 0.75F) + 12, + (int) (guiTop / 0.75F) + 184 + + i * 12 + - (descr.size() > 1 ? 6 + : 0), + 0xffffff); GL11.glPopMatrix(); } if (playerInfo.getInteger(curse.getName()) == 2) { - mc.renderEngine.bindTexture(Variables.MISC_TEXTURE); + mc.renderEngine + .bindTexture(Variables.MISC_TEXTURE); GL11.glPushMatrix(); GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, + GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glColor4f(1f, 1f, 1f, 0.5f); - drawTexturedModalRect(guiLeft + 134, guiTop + 11 + (size - 8) * (ind - page * 5), 3 * 16, 0, 16, 16); + drawTexturedModalRect(guiLeft + 134, + guiTop + 11 + + (size - 8) + * (ind - page * 5), + 3 * 16, 0, 16, 16); GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); } - mc.renderEngine.bindTexture(new ResourceLocation(Variables.MODID, "textures/gui/" + curse.getTexturePack() + ".png")); + mc.renderEngine.bindTexture( + new ResourceLocation(Variables.MODID, + "textures/gui/" + + curse.getTexturePack() + + ".png")); int tag = curse.getTextureID(); GL11.glPushMatrix(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glDisable(GL11.GL_LIGHTING); GL11.glScalef(0.5f, 0.5f, 0.0f); - drawTexturedModalRect(guiLeft * 2 + 100, guiTop * 2 + 22 + (ind - page * 5) * 48, tag % 8 * 32, tag / 8 * 32, 32, 32); + drawTexturedModalRect(guiLeft * 2 + 100, + guiTop * 2 + 22 + (ind - page * 5) * 48, + tag % 8 * 32, tag / 8 * 32, 32, 32); GL11.glPopMatrix(); - this.drawString(fontRendererObj, curse.getDisplayName(), guiLeft + 70, guiTop + 15 + (ind - page * 5) * (size - 8), 0xffffff); + this.drawString(fontRendererObj, + curse.getDisplayName(), guiLeft + 70, + guiTop + 15 + + (ind - page * 5) * (size - 8), + 0xffffff); } ind++; } @@ -139,39 +209,69 @@ public class GuiCurseInfo extends GuiContainer { int ind = 0; for (Curse curse : Curse.getCurseList()) { if (ind >= page * 5 && ind < (page + 1) * 5) { - if (ind == page * 5 && selectedCurse == "") selectedCurse = curse.getName(); + if (ind == page * 5 && selectedCurse == "") + selectedCurse = curse.getName(); if (playerInfo.getInteger(curse.getName()) <= 0) { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - if (!curse.canCurseBeActivated() || !ConfigHandler.CURSES_ENABLED) GL11.glColor4f(1f, 0f, 0f, 0.5f); - else GL11.glColor4f(1f, 1f, 1f, 0.5f); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, + GL11.GL_ONE_MINUS_SRC_ALPHA); + 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); + drawTexturedModalRect(guiLeft + 43, + guiTop + 8 + (size - 8) * (ind - page * 5), 0, 32, + 112, 22); if (selectedCurse == curse.getName()) { GL11.glPushMatrix(); GL11.glScalef(1.2f, 1.5f, 0f); - drawTexturedModalRect((int) (guiLeft / (1.2)) + 126, (int) (guiTop / (1.5)) + 7 + (size - 16) * (ind - page * 5), 48, 16, 32, 16); - drawTexturedModalRect((int) (guiLeft / (1.2)) + 5, (int) (guiTop / (1.5)) + 7 + (size - 16) * (ind - page * 5), 80, 16, 32, 16); + drawTexturedModalRect((int) (guiLeft / (1.2)) + 126, + (int) (guiTop / (1.5)) + 7 + + (size - 16) * (ind - page * 5), + 48, 16, 32, 16); + drawTexturedModalRect((int) (guiLeft / (1.2)) + 5, + (int) (guiTop / (1.5)) + 7 + + (size - 16) * (ind - page * 5), + 80, 16, 32, 16); GL11.glPopMatrix(); GL11.glPushMatrix(); - List descr = fontRendererObj.listFormattedStringToWidth(curse.getDescription(), 238); + List descr = + fontRendererObj.listFormattedStringToWidth( + curse.getDescription(), 238); GL11.glScalef(0.75F, 0.75F, 0F); for (int i = 0; i < descr.size(); i++) - this.drawString(fontRendererObj, descr.get(i).toString(), (int) (guiLeft / 0.75F) + 12, (int) (guiTop / 0.75F) + 184 + i * 12 - (descr.size() > 1 ? 6 : 0), 0xffffff); + this.drawString(fontRendererObj, + descr.get(i).toString(), + (int) (guiLeft / 0.75F) + 12, + (int) (guiTop / 0.75F) + 184 + i * 12 + - (descr.size() > 1 ? 6 : 0), + 0xffffff); GL11.glPopMatrix(); } - mc.renderEngine.bindTexture(new ResourceLocation(Variables.MODID, "textures/gui/" + curse.getTexturePack() + ".png")); + mc.renderEngine.bindTexture(new ResourceLocation( + Variables.MODID, "textures/gui/" + + curse.getTexturePack() + ".png")); int tag = curse.getTextureID(); GL11.glPushMatrix(); - if (playerInfo.getInteger(curse.getName()) <= 0) GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.5F); - else GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + if (playerInfo.getInteger(curse.getName()) <= 0) + GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.5F); + else + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glDisable(GL11.GL_LIGHTING); GL11.glScalef(0.5f, 0.5f, 0.0f); - drawTexturedModalRect(guiLeft * 2 + 100, guiTop * 2 + 22 + (ind - page * 5) * 48, tag % 8 * 32, tag / 8 * 32, 32, 32); + drawTexturedModalRect(guiLeft * 2 + 100, + guiTop * 2 + 22 + (ind - page * 5) * 48, + tag % 8 * 32, tag / 8 * 32, 32, 32); GL11.glPopMatrix(); - this.drawString(fontRendererObj, curse.getDisplayName(), guiLeft + 70, guiTop + 15 + (ind - page * 5) * (size - 8), playerInfo.getInteger(curse.getName()) > 0 ? 0xffffffff : 0xaaffffff); + this.drawString(fontRendererObj, curse.getDisplayName(), + guiLeft + 70, + guiTop + 15 + (ind - page * 5) * (size - 8), + playerInfo.getInteger(curse.getName()) > 0 + ? 0xffffffff : 0xaaffffff); if (playerInfo.getInteger(curse.getName()) <= 0) { GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); @@ -182,12 +282,15 @@ public class GuiCurseInfo extends GuiContainer { } @Override - public void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {} + public void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { + // Do nothing + } @Override protected void keyTyped(char charecter, int key) { super.keyTyped(charecter, key); - if (key == KeyBindings.curses.getKeyCode()) mc.thePlayer.closeScreen(); + if (key == KeyBindings.curses.getKeyCode()) + mc.thePlayer.closeScreen(); } @Override @@ -200,44 +303,78 @@ public class GuiCurseInfo extends GuiContainer { TabRegistry.addTabsToList(this.buttonList); } + @Override protected void mouseClicked(int x, int y, int id) { super.mouseClicked(x, y, id); int ind = 0; int size = 32; if (player != null) { - NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); + NBTTagCompound playerInfo = PlayerUtils + .getModPlayerPersistTag(player, Variables.MODID); for (Curse curse : Curse.getCurseList()) { if (player.capabilities.isCreativeMode) { - if (x > (guiLeft + 43) && y > (guiTop + 8 + (size - 8) * (ind - page * 5)) && x < (guiLeft + 43 + 112) && y < (guiTop + 40 + (size - 8) * (ind - page * 5)) && ind >= page * 5 && ind < (page + 1) * 5) { - if (player.capabilities.isCreativeMode && isCtrlKeyDown() && playerInfo.getInteger(curse.getName()) > 0) { + if (x > (guiLeft + 43) + && y > (guiTop + 8 + + (size - 8) * (ind - page * 5)) + && x < (guiLeft + 43 + 112) + && y < (guiTop + 40 + + (size - 8) * (ind - page * 5)) + && ind >= page * 5 && ind < (page + 1) * 5) { + if (player.capabilities.isCreativeMode + && isCtrlKeyDown() && playerInfo + .getInteger(curse.getName()) > 0) { playerInfo.setInteger(curse.getName(), 0); - playerInfo.setInteger("activeCurses", playerInfo.getInteger("activeCurses") - 1); + playerInfo.setInteger("activeCurses", + playerInfo.getInteger("activeCurses") + - 1); 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 && curse.canCurseBeActivated() && ConfigHandler.CURSES_ENABLED) { + 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 + && curse.canCurseBeActivated() + && ConfigHandler.CURSES_ENABLED) { playerInfo.setInteger(curse.getName(), 1); - playerInfo.setInteger("activeCurses", playerInfo.getInteger("activeCurses") + 1); + playerInfo.setInteger("activeCurses", + playerInfo.getInteger("activeCurses") + + 1); Curse.availableCurses.remove(curse); - JewelrycraftMod.netWrapper.sendToServer(new PacketSendServerPlayerInfo("add", curse.getName(), playerInfo)); - JewelrycraftMod.netWrapper.sendToAll(new PacketSendServerPlayersInfo()); - } - else selectedCurse = curse.getName(); + JewelrycraftMod.netWrapper.sendToServer( + new PacketSendServerPlayerInfo("add", + curse.getName(), playerInfo)); + JewelrycraftMod.netWrapper.sendToAll( + new PacketSendServerPlayersInfo()); + } else + selectedCurse = curse.getName(); } ind++; - } - else if (playerInfo.getInteger(curse.getName()) > 0) { - if (x > (guiLeft + 43) && y > (guiTop + 8 + (size - 8) * (ind - page * 5)) && x < (guiLeft + 43 + 112) && y < (guiTop + 40 + (size - 8) * (ind - page * 5)) && ind >= page * 5 && ind < (page + 1) * 5) selectedCurse = curse.getName(); + } else if (playerInfo.getInteger(curse.getName()) > 0) { + if (x > (guiLeft + 43) + && y > (guiTop + 8 + + (size - 8) * (ind - page * 5)) + && x < (guiLeft + 43 + 112) + && y < (guiTop + 40 + + (size - 8) * (ind - page * 5)) + && ind >= page * 5 && ind < (page + 1) * 5) + selectedCurse = curse.getName(); ind++; } } } - if (page > 0 && x > guiLeft + 5 && x < guiLeft + 18 && y > guiTop + ySize - 14 && y < guiTop + ySize - 3) { + if (page > 0 && x > guiLeft + 5 && x < guiLeft + 18 + && y > guiTop + ySize - 14 && y < guiTop + ySize - 3) { page--; selectedCurse = ""; } - if (page < maxPages && x > guiLeft + xSize - 38 && x < guiLeft + xSize - 25 && y > guiTop + ySize - 14 && y < guiTop + ySize - 3) { + if (page < maxPages && x > guiLeft + xSize - 38 + && x < guiLeft + xSize - 25 && y > guiTop + ySize - 14 + && y < guiTop + ySize - 3) { page++; selectedCurse = ""; } -- cgit v1.2.3