From 236658726cca684f42db72e864799474bbf79a7c Mon Sep 17 00:00:00 2001 From: Fi0x Date: Thu, 25 Jun 2020 19:44:18 +0200 Subject: [PATCH] Re-added buttons in skilltree gui Signed-off-by: Fi0x --- .../deepmagic/blocks/AltarOfKnowledge.java | 1 - .../com/fi0x/deepmagic/gui/GuiSkilltree.java | 47 +++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/fi0x/deepmagic/blocks/AltarOfKnowledge.java b/src/main/java/com/fi0x/deepmagic/blocks/AltarOfKnowledge.java index f6a2f25a..9740ddfe 100644 --- a/src/main/java/com/fi0x/deepmagic/blocks/AltarOfKnowledge.java +++ b/src/main/java/com/fi0x/deepmagic/blocks/AltarOfKnowledge.java @@ -28,7 +28,6 @@ public boolean onBlockActivated(@Nonnull World worldIn, @Nonnull BlockPos pos, @ { if(!worldIn.isRemote) { -// PlayerMana playerMana = playerIn.getCapability(PlayerProperties.PLAYER_MANA, null); // PacketHandler.INSTANCE.sendToServer(new PacketGetSkill(playerIn.getName(), playerMana.getSkillXP(), playerMana.getSkillpoints(), playerMana.getManaRegenRate(), playerMana.getManaEfficiency(), playerMana.maxManaMultiplier, playerMana.addedHP, playerMana.hpRegeneration)); Main.proxy.openSkilltreeGui(); } diff --git a/src/main/java/com/fi0x/deepmagic/gui/GuiSkilltree.java b/src/main/java/com/fi0x/deepmagic/gui/GuiSkilltree.java index 60d1de7f..5b36a1a1 100644 --- a/src/main/java/com/fi0x/deepmagic/gui/GuiSkilltree.java +++ b/src/main/java/com/fi0x/deepmagic/gui/GuiSkilltree.java @@ -25,6 +25,12 @@ public class GuiSkilltree extends GuiScreen private int guiY; private static final ResourceLocation backgroundTexture = new ResourceLocation(Reference.MOD_ID + ":textures/gui/skilltree_background.png"); private GuiButton buttonExit; + private GuiButton buttonAddMaxMana; + private GuiButton buttonAddManaRegenRate; + private GuiButton buttonAddManaEfficiency; + private GuiButton buttonAddMaxHP; + private GuiButton buttonAddHPRegen; + private GuiButton buttonAddSpellTier; public GuiSkilltree(EntityPlayer player) { @@ -41,8 +47,21 @@ public void initGui() buttonList.clear(); labelList.clear(); Keyboard.enableRepeatEvents(true); + buttonExit = new GuiButton(0, width/2 -20, guiY + backgroundHeight-30, 40, 20, I18n.format("Exit")); buttonList.add(buttonExit); + buttonAddMaxMana = new GuiButton(1, guiX + 160, guiY + 5, 20, 20, I18n.format("+")); + buttonList.add(buttonAddMaxMana); + buttonAddManaRegenRate = new GuiButton(2, guiX + 160, guiY + 25, 20, 20, I18n.format("+")); + buttonList.add(buttonAddManaRegenRate); + buttonAddManaEfficiency = new GuiButton(3, guiX + 160, guiY + 45, 20, 20, I18n.format("+")); + buttonList.add(buttonAddManaEfficiency); + buttonAddMaxHP = new GuiButton(4, guiX + 160, guiY + 65, 20, 20, I18n.format("+")); + buttonList.add(buttonAddMaxHP); + buttonAddHPRegen = new GuiButton(5, guiX + 160, guiY + 85, 20, 20, I18n.format("+")); + buttonList.add(buttonAddHPRegen); + buttonAddSpellTier = new GuiButton(6, guiX + 160, guiY + 105, 20, 10, I18n.format("+")); + buttonList.add(buttonAddSpellTier); GuiLabel labelMaxMana = new GuiLabel(this.fontRenderer, 101, guiX + 5, guiY + 5, 150, 20, 0); labelMaxMana.addLine("Mana Capacity: " + (int) playerMana.getMaxMana()); @@ -64,6 +83,24 @@ public void initGui() @Override public void updateScreen() { + if(playerMana.getSkillpoints() > 0) + { + buttonAddMaxMana.visible = true; + buttonAddManaRegenRate.visible = true; + buttonAddManaEfficiency.visible = true; + buttonAddMaxHP.visible = true; + buttonAddHPRegen.visible = true; + if(playerMana.getSpellTier() < 10) buttonAddSpellTier.visible = true; + else buttonAddSpellTier.visible = false; + } else + { + buttonAddMaxMana.visible = false; + buttonAddManaRegenRate.visible = false; + buttonAddManaEfficiency.visible = false; + buttonAddMaxHP.visible = false; + buttonAddHPRegen.visible = false; + buttonAddSpellTier.visible = false; + } } @Override @@ -82,6 +119,16 @@ protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, lo protected void actionPerformed(@Nonnull GuiButton button) { if(button == buttonExit) mc.displayGuiScreen(null); + else + { + if(button == buttonAddMaxMana) playerMana.maxManaMultiplier++; + else if(button == buttonAddManaRegenRate) playerMana.setManaRegenRate(playerMana.getManaRegenRate() + 1); + else if(button == buttonAddManaEfficiency) playerMana.setManaEfficiency(playerMana.getManaEfficiency() + 1); + else if(button == buttonAddMaxHP) playerMana.addedHP++; + else if(button == buttonAddHPRegen) playerMana.hpRegeneration++; + else if(button == buttonAddSpellTier) playerMana.addSpellTier(); + playerMana.removeSkillpoint(); + } } @Override