From 6470f695698b922dfa247ed6abb1a2b9c228e3cd Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Tue, 22 Jul 2014 20:37:53 -0400 Subject: [PATCH] A big load of work on the new upgrade GUI --- .../client/gui/GuiUpgradeManagement.java | 109 +++++++++++++++++- src/main/java/mekanism/common/Upgrade.java | 14 +++ .../mekanism/common/item/ItemUpgrade.java | 24 +++- .../tile/component/TileComponentUpgrade.java | 11 +- .../mekanism/gui/GuiUpgradeManagement.png | Bin 4715 -> 5092 bytes .../resources/assets/mekanism/lang/en_US.lang | 4 +- 6 files changed, 157 insertions(+), 5 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index 5119b899a..ab4c15735 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -1,17 +1,21 @@ package mekanism.client.gui; +import java.util.Arrays; +import java.util.Set; + import mekanism.api.Coord4D; +import mekanism.api.EnumColor; +import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.IUpgradeTile; import mekanism.common.Mekanism; +import mekanism.common.Upgrade; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.container.ContainerUpgradeManagement; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; -import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; @@ -24,6 +28,8 @@ public class GuiUpgradeManagement extends GuiMekanism { public IUpgradeTile tileEntity; + public Upgrade selectedType; + public GuiUpgradeManagement(InventoryPlayer inventory, IUpgradeTile tile) { super(new ContainerUpgradeManagement(inventory, tile)); @@ -33,10 +39,58 @@ public class GuiUpgradeManagement extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(MekanismUtils.localize("gui.upgrades.supported") + ":", 26, 60, 0x404040); + + if(selectedType == null) + { + renderText(MekanismUtils.localize("gui.upgrades.noSelection") + ".", 96, 9, 0.8F); + } + + int rendered = 0; + + for(Upgrade upgrade : tileEntity.getComponent().getSupportedTypes()) + { + renderUpgrade(upgrade, 84 + (rendered++*12), 60, 0.8F); + } + + int counter = 0; + + for(Upgrade upgrade : getCurrentUpgrades()) + { + int xPos = 25; + int yPos = 7 + (counter++*12); + int yRender = 0; + + if(xAxis >= xPos && xAxis <= xPos+64 && yAxis >= yPos && yAxis <= yPos+12) + { + func_146283_a(MekanismUtils.splitLines(upgrade.getDescription()), xAxis, yAxis); + } + } super.drawGuiContainerForegroundLayer(mouseX, mouseY); } + + private void renderText(String text, int x, int y, float size) + { + GL11.glPushMatrix(); + GL11.glScalef(size, size, size); + fontRendererObj.drawString(text, (int)(x*(1+(1-size))), (int)(y*(1+(1-size))), 0x00CD00); + GL11.glPopMatrix(); + } + + private void renderUpgrade(Upgrade type, int x, int y, float size) + { + GL11.glPushMatrix(); + GL11.glScalef(size, size, size); + GL11.glEnable(GL11.GL_LIGHTING); + itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), type.getStack(), (int)(x*(1+(1-size))), (int)(y*(1+(1-size)))); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glPopMatrix(); + } @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) @@ -61,10 +115,46 @@ public class GuiUpgradeManagement extends GuiMekanism int displayInt = tileEntity.getComponent().getScaledUpgradeProgress(14); drawTexturedModalRect(guiWidth + 154, guiHeight + 26, 176, 28, 10, displayInt); + + if(selectedType != null && tileEntity.getComponent().getUpgrades(selectedType) == 0) + { + selectedType = null; + } + + int rendered = 0; + + for(Upgrade upgrade : getCurrentUpgrades()) + { + int xPos = 25; + int yPos = 7 + (rendered++*12); + int yRender = 0; + + if(upgrade == selectedType) + { + yRender = 166 + 24; + } + else if(xAxis >= xPos && xAxis <= xPos+64 && yAxis >= yPos && yAxis <= yPos+12) + { + yRender = 166; + } + else { + yRender = 166 + 12; + } + + MekanismRenderer.color(upgrade.getColor(), 1.0F, 2.5F); + drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, 0, yRender, 64, 12); + MekanismRenderer.resetColor(); + } super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } + /* Here for scrolling in the future */ + private Set getCurrentUpgrades() + { + return tileEntity.getComponent().getInstalledTypes(); + } + @Override protected void mouseClicked(int mouseX, int mouseY, int button) { @@ -83,6 +173,21 @@ public class GuiUpgradeManagement extends GuiMekanism SoundHandler.playSound("gui.button.press"); Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tile), guiId)); } + + int counter = 0; + + for(Upgrade upgrade : getCurrentUpgrades()) + { + int xPos = 25; + int yPos = 7 + (counter++*12); + int yRender = 0; + + if(xAxis >= xPos && xAxis <= xPos+64 && yAxis >= yPos && yAxis <= yPos+12) + { + selectedType = upgrade; + break; + } + } } } } diff --git a/src/main/java/mekanism/common/Upgrade.java b/src/main/java/mekanism/common/Upgrade.java index 7a4931fca..9ff6f88c1 100644 --- a/src/main/java/mekanism/common/Upgrade.java +++ b/src/main/java/mekanism/common/Upgrade.java @@ -5,6 +5,7 @@ import java.util.Map; import mekanism.api.EnumColor; import mekanism.common.util.MekanismUtils; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.Constants.NBT; @@ -51,6 +52,19 @@ public enum Upgrade return getMax() > 1; } + public ItemStack getStack() + { + switch(this) + { + case SPEED: + return new ItemStack(Mekanism.SpeedUpgrade); + case ENERGY: + return new ItemStack(Mekanism.EnergyUpgrade); + } + + return null; + } + public static Map buildMap(NBTTagCompound nbtTags) { Map upgrades = new HashMap(); diff --git a/src/main/java/mekanism/common/item/ItemUpgrade.java b/src/main/java/mekanism/common/item/ItemUpgrade.java index 4d4a5ec7f..7267e31da 100644 --- a/src/main/java/mekanism/common/item/ItemUpgrade.java +++ b/src/main/java/mekanism/common/item/ItemUpgrade.java @@ -1,7 +1,17 @@ package mekanism.common.item; +import java.util.List; + +import org.lwjgl.input.Keyboard; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import mekanism.api.EnumColor; import mekanism.common.IUpgradeItem; import mekanism.common.Upgrade; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; public class ItemUpgrade extends ItemMekanism implements IUpgradeItem @@ -11,10 +21,22 @@ public class ItemUpgrade extends ItemMekanism implements IUpgradeItem public ItemUpgrade(Upgrade type) { upgrade = type; - setMaxStackSize(type.getMax()); } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + { + if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + { + list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails")); + } + else { + list.addAll(MekanismUtils.splitLines(getUpgradeType(itemstack).getDescription())); + } + } + @Override public Upgrade getUpgradeType(ItemStack stack) { diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index 2a1818f80..f01e27e05 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -13,7 +13,6 @@ import mekanism.common.IUpgradeItem; import mekanism.common.Upgrade; import mekanism.common.tile.TileEntityContainerBlock; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; public class TileComponentUpgrade implements ITileComponent { @@ -138,6 +137,16 @@ public class TileComponentUpgrade implements ITileComponent { return supported.contains(upgrade); } + + public Set getInstalledTypes() + { + return upgrades.keySet(); + } + + public Set getSupportedTypes() + { + return supported; + } @Override public void read(ByteBuf dataStream) diff --git a/src/main/resources/assets/mekanism/gui/GuiUpgradeManagement.png b/src/main/resources/assets/mekanism/gui/GuiUpgradeManagement.png index e2ee25523379f7ecdd26d9bedad209cf55cc8dbd..25e3faa8e44e140bed30884594eace765f5eaf9b 100644 GIT binary patch delta 4076 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 Q4WN&yq4}BTr(LiA3u;N%Gynhq delta 3696 zcmb`IX;f3!9>tSufJCUoU`6I2gP=@;5}5(}39BWq!krKl0{5R}**Twfq+tO_q?G$m#lY!1IKd^T8}7ZUmy zkd~I_`c|0>Z63|-;tIW1g8Fkb>}y-BMwy+R_Z#CcwydoCh>e z=sGNV>v^Y>9l(tSBhH>wCZ5$}Fz)V(3HMTc{X0_+xyWdUN$)1U<3{7|<@L3e7xNq! zIYm}zz9-gm@z&AN)%NJo(OY@o?ljcI%9T(4pZPQzA*Q`X`=VG$?1%+(5<(lt&Q`y zaz4d`UHeWv-2m=q6j>^qEfvT$Yf}yU+H8k-+_n_yc7$-1R}?T1u{Z_x`Lj#T@mUAk zOPp^#2*aIUm$?cV8II{UZ>oh0Q%q<^!-Ul=RWH4^EI&6qut#Kc z5f8Ykv;>WYjYx-!tP&azCva?-(`ibHe#mffih6=1w(>M#d%J{{_>(GrK$coMwDCBp z$eI%0xGrn65wWsd|Hk`38?(l8BlpE}`DC}6_(>xuc)<+@-zCXPSjKHM9$9!Lm1wHA zRqf#&*Cj>0WSa}SL_0`M1Vq=oE^XB`7s^?YUKE{*T1!rqa+78Zv$Q}G;k8hKB1^L;-Z9w%6_$@p>Lasymt8^M;&{6qed zmq7R_ma>{yA#c4bj*VC}l;J9YJ`~ZJ+PbC58Di`wS(Lhr;gy zwFPZoKHm?i(mKA{&WtQH`uz>sd;Z0Ds$GJyW*n%8xo(%QhH0OgBJIq(>4Rp66j06@ zz?ZaMrd1ZYsxX5_>qxoPOZTF{#Xg)|MP+5BjL&NOZQHm!quNu1fG_c~z8ge}m1yXT z*>;y1{;R3kGbw}f?E{j3Qu#2$ek~pp#Sgp=n z1DmCc%IjtnSp47zNaaM@jeP|7H{yGY0UL3G=u?rS~aQZZ9Pmxzs%i_ zCbR15UUP<;)P)^joc769J)Q7fmzoBYL53FmBicSRzp+`|CT%Elri}=4**2Q6H{u&o z=?J4B|9<#(=3>8v2AMpWiF0_cY%)I@Q1mT_vOJdPUf-WjMHor?8(Yz0I22sV3AO8r z&agC1bos$2tl?$x@8YfX91tdaA2s0W6+YEMIyK0H8KZt9q4VwWK)$`J0tnoO{)XF# zQzppXy;ykf{Rb|&td&CX!%SUeEiC-lyzYBIZRF!atVRu6fD|U<#BgBa zq96>kunU0AGApf$S(fGrE&C_K*GFzCaJ*OwtU1#>&AlfD8>0DR#LUqiLVvpUvazb*{-0)wm{y`vq;+Dvlq^^v*zTEN8gUwLvI@xkp>*;GuK*+3KG}P z23S{FZ4fU?My&jl>-7yU2l3n)Uf43mosgjy-l~@^qh7Ni`f5@~-{+bq1K08EbSKzs zUoJK~lZwc8)j6DuC&N+nmfIM_C$EcE2bf6&?UWYpk{(?6JFnH5@!)RbuLX-NH zbOPPufCqZCa~19AEmXwdxC;sxg)$mVK6MmXC!Y;t7wFnzmEb6B!O37G?JM*)*+dI@ zP6G=+CwJl-^+9hu5E%XdK|7Doq@K4cQ%A6+|6UFFS2_Q$8d{S$=EI*yw7h|5kL3B+ zsfe@!TzLPFo@PMQ&U`X(Bq67$*IN7C%&0S2yUJ*8V>0l6|$eXOstB z8X92e;h{qOPXMwRCFR~5@%d$mA5c^HIX&S)b8b{pmf?+?ieuu7sKJ&peT);t#Yx+3 z{|Wk^G|8uln%P$&zAg{la-ll{gI|8YaKb7;U~Zo*)1l2lH0NAHbMVH{mhrt)-veV1 zhp__oUfMZG{5iXl`-rFVQ2tMG_4dFYkm^5@PuQcPpV<)#&i8nz~FX85UYs>5Mgj zVym*XGYBZo&?tD0EP70b-z`u<^ zp6mT^1=km!@b&9Fv|F5CG6(PA>pEjEKnCVv<<_)4(87Um7PtbXensk}2-N|JI~e~Q zHDRwE{7GRYkuul0RuQG`SevhxC8p)j_-#h0h8@cFq1Z22dosWtAJWjQ85(y zW#Mzp%*@R6lMH-+|0F?TJcac|0ih^|f9rju#$S@q68d`bNkdjCfK%$!yNLQbSy;HH zDt=@i8p8Eo5rO|8qkkL`esU3JDPovCP1w;@8fTc-g^b-F0mVtMXPu@s{}h87EG*IA z>GU0xzrnfvE_4ex3Zz>&6U||?g(WfU(ny9^asgF3$&bgb50QB9-QlT$asxzQMP1a_ zFQdVfW%n<7gZ3b($_zU%DFkXLas zQypd38Pd2?G&@KBWCX9j(Atz(0F4~k2j_s|&ETmOu;+zgtLLwlaghm(AOPb25Q7hN z9Dss~ zhLR$TpgOj@34r7nSld|QHaK*MK_g>}I7G@OikXK&0?ypiRO_8QU+f@(mI4wR!bD%2 zVKIVneQ$8{B1eMHtF0c{M&oMX`ACZL+*tFQZc>N|?F9X)RK)7SCrGnXqwUJ`1Jzdt zOkJr^b2(e?SME?8q&IAfFGy5HV0lI$`R;s-m*LA(B4Jl#{)IH%v%T@pOk#{HSkmz u96%t^*nfEe{_7L}w}FBGwxMW4A(&Pi|0d_gj5`c^j@y5C?2(=CFaH6MpG`0T diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 9b77b6c90..3eb24488d 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -292,7 +292,7 @@ update.outdated=Using outdated version on one or more modules //Upgrades upgrade.energy=Energy -upgrade.energy.desc=Increases energy efficiency and capacity of machinery. +upgrade.energy.desc=Increases energy efficiency !nand capacity of machinery. upgrade.speed=Speed upgrade.speed.desc=Increases speed of machinery. @@ -356,6 +356,8 @@ gui.finished=Finished gui.well=All is well! gui.upgrades=Upgrades +gui.upgrades.supported=Supported +gui.upgrades.noSelection=No selection gui.chemicalInfuser.short=C. Infuser gui.chemicalDissolutionChamber.short=C. Dissolution Chamber