Fix some bugs

TiagoFar78 · Apr 19, 2024 · a00c140 · a00c140
1 parent a9baccf
commit a00c140
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 17 deletions.
diff --git a/src/main/java/net/tiagofar78/prisonescape/Events.java b/src/main/java/net/tiagofar78/prisonescape/Events.java
@@ -98,6 +98,7 @@ public void playerLeave(PlayerQuitEvent e) {
             return;
         }
 
+        System.out.println("Vai fechar aqui, player saiu");
         game.playerCloseMenu(e.getPlayer().getName());
     }
 
@@ -130,6 +131,7 @@ public void playerCloseInventory(InventoryCloseEvent e) {
             return;
         }
 
+        System.out.println("Vai fechar aqui");
         game.playerCloseMenu(e.getPlayer().getName());
     }
 
@@ -144,6 +146,7 @@ public void playerClickInventory(InventoryClickEvent e) {
             return;
         }
 
+        System.out.println("Entrou");
         boolean isPlayerInv = false;
         if (e.getClickedInventory().getType() == InventoryType.PLAYER) {
             Inventory topInv = e.getView().getTopInventory();

diff --git a/src/main/java/net/tiagofar78/prisonescape/bukkit/BukkitMenu.java b/src/main/java/net/tiagofar78/prisonescape/bukkit/BukkitMenu.java
@@ -172,7 +172,7 @@ public static int convertToIndexPlayerInventory(int slot) {
 //  #                 Shop                 #
 //  ########################################
 
-    private static final int NUM_OF_ITEMS_FOR_SALE = 1;
+    private static final int NUM_OF_ITEMS_FOR_SALE = 5;
 
     public static void openShop(String playerName) {
         Player bukkitPlayer = Bukkit.getPlayer(playerName);
@@ -193,12 +193,10 @@ public static void openShop(String playerName) {
     }
 
     public static int convertToIndexShop(int slot) {
-        for (int i = 0; i < NUM_OF_ITEMS_FOR_SALE; i++) {
-            if (NUM_OF_ITEMS_FOR_SALE <= slot) {
-                return i;
-            }
+        if (slot >= NUM_OF_ITEMS_FOR_SALE) {
+            return -1;
         }
 
-        return -1;
+        return slot;
     }
 }
diff --git a/src/main/java/net/tiagofar78/prisonescape/game/PrisonEscapeGame.java b/src/main/java/net/tiagofar78/prisonescape/game/PrisonEscapeGame.java
@@ -9,8 +9,10 @@
 import net.tiagofar78.prisonescape.game.phases.Finished;
 import net.tiagofar78.prisonescape.game.phases.Phase;
 import net.tiagofar78.prisonescape.game.phases.Waiting;
+import net.tiagofar78.prisonescape.game.prisonbuilding.Chest;
 import net.tiagofar78.prisonescape.game.prisonbuilding.PrisonBuilding;
 import net.tiagofar78.prisonescape.game.prisonbuilding.PrisonEscapeLocation;
+import net.tiagofar78.prisonescape.game.prisonbuilding.Vault;
 import net.tiagofar78.prisonescape.game.prisonbuilding.WallCrack;
 import net.tiagofar78.prisonescape.items.FunctionalItem;
 import net.tiagofar78.prisonescape.items.Item;
@@ -20,11 +22,9 @@
 import net.tiagofar78.prisonescape.managers.ConfigManager;
 import net.tiagofar78.prisonescape.managers.GameManager;
 import net.tiagofar78.prisonescape.managers.MessageLanguageManager;
-import net.tiagofar78.prisonescape.menus.Chest;
 import net.tiagofar78.prisonescape.menus.ClickReturnAction;
 import net.tiagofar78.prisonescape.menus.Clickable;
 import net.tiagofar78.prisonescape.menus.Shop;
-import net.tiagofar78.prisonescape.menus.Vault;
 
 import org.bukkit.block.Block;
 import org.bukkit.event.player.PlayerInteractEvent;
@@ -531,6 +531,7 @@ public void playerCloseMenu(String playerName) {
 
         if (_playerOpenMenu.containsKey(playerName)) {
             _playerOpenMenu.get(playerName).close();
+            System.out.println("Vai fechar"); // Wtf
             _playerOpenMenu.remove(playerName);
         }
     }
@@ -541,7 +542,10 @@ public ClickReturnAction playerClickMenu(String playerName, int slot, Item itemH
             return ClickReturnAction.IGNORE;
         }
 
+        System.out.println(playerName);
         if (!_playerOpenMenu.containsKey(playerName)) {
+            System.out.println("It's not saved D:");
+            System.out.println(playerName);
             return ClickReturnAction.IGNORE;
         }
 
@@ -740,7 +744,10 @@ public void policeOpenShop(String playerName) {
         }
 
         Shop shop = new Shop();
-        _playerOpenMenu.put(playerName, shop);
+        System.out.println("open");
+        System.out.println(playerName);
+        _playerOpenMenu.put(player.getName(), shop);
+
         shop.open(player);
     }
 

diff --git a/.../tiagofar78/prisonescape/menus/Chest.java → ...isonescape/game/prisonbuilding/Chest.java b/.../tiagofar78/prisonescape/menus/Chest.java → ...isonescape/game/prisonbuilding/Chest.java
@@ -1,4 +1,4 @@
-package net.tiagofar78.prisonescape.menus;
+package net.tiagofar78.prisonescape.game.prisonbuilding;
 
 import net.tiagofar78.prisonescape.bukkit.BukkitMenu;
 import net.tiagofar78.prisonescape.bukkit.BukkitMessageSender;
@@ -8,6 +8,8 @@
 import net.tiagofar78.prisonescape.items.NullItem;
 import net.tiagofar78.prisonescape.managers.ConfigManager;
 import net.tiagofar78.prisonescape.managers.MessageLanguageManager;
+import net.tiagofar78.prisonescape.menus.ClickReturnAction;
+import net.tiagofar78.prisonescape.menus.Clickable;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/main/java/net/tiagofar78/prisonescape/game/prisonbuilding/PrisonBuilding.java b/src/main/java/net/tiagofar78/prisonescape/game/prisonbuilding/PrisonBuilding.java
@@ -5,8 +5,6 @@
 import net.tiagofar78.prisonescape.game.prisonbuilding.regions.Region;
 import net.tiagofar78.prisonescape.game.prisonbuilding.regions.SquaredRegion;
 import net.tiagofar78.prisonescape.managers.ConfigManager;
-import net.tiagofar78.prisonescape.menus.Chest;
-import net.tiagofar78.prisonescape.menus.Vault;
 
 import org.bukkit.block.Block;
 

diff --git a/.../tiagofar78/prisonescape/menus/Vault.java → ...isonescape/game/prisonbuilding/Vault.java b/.../tiagofar78/prisonescape/menus/Vault.java → ...isonescape/game/prisonbuilding/Vault.java
@@ -1,9 +1,11 @@
-package net.tiagofar78.prisonescape.menus;
+package net.tiagofar78.prisonescape.game.prisonbuilding;
 
 import net.tiagofar78.prisonescape.bukkit.BukkitMenu;
 import net.tiagofar78.prisonescape.game.PrisonEscapePlayer;
 import net.tiagofar78.prisonescape.items.Item;
 import net.tiagofar78.prisonescape.items.NullItem;
+import net.tiagofar78.prisonescape.menus.ClickReturnAction;
+import net.tiagofar78.prisonescape.menus.Clickable;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/main/java/net/tiagofar78/prisonescape/menus/Shop.java b/src/main/java/net/tiagofar78/prisonescape/menus/Shop.java
@@ -50,22 +50,26 @@ private List<Item> createContentsList() {
 
     @Override
     public ClickReturnAction click(PrisonEscapePlayer player, int slot, Item itemHeld, boolean clickedPlayerInv) {
+        System.out.println("clicou");
         if (clickedPlayerInv) {
             return ClickReturnAction.NOTHING;
         }
-        int index = BukkitMenu.convertToIndexChest(slot);
+        System.out.println("1");
+        int index = BukkitMenu.convertToIndexShop(slot);
         if (index == -1) {
             return ClickReturnAction.NOTHING;
         }
-
+        System.out.println("2");
         Item item = _contents.get(index);
         if (item instanceof NullItem) {
             return ClickReturnAction.NOTHING;
         }
-
+        System.out.println("3");
+        System.out.println(item.isBuyable());
         if (!(item.isBuyable())) {
             return ClickReturnAction.NOTHING;
         }
+        System.out.println("4");
         Buyable buyableItem = (Buyable) item;
         MessageLanguageManager messages = MessageLanguageManager.getInstanceByPlayer(player.getName());
 

diff --git a/src/main/resources/languages/english.yml b/src/main/resources/languages/english.yml
@@ -107,7 +107,7 @@ Messages:
     CanOnlyFixHoles: "&cYou can only fix holes, not cracked blocks."
     ReachedItemLimit: "&cSorry, you've already reached the maximum limit for this item."
     NotEnoughMoney: "&cYou do not have enough money to buy this item."
-    SuccessfullyBoughtItem: "&aSuccessfully bought item. Your current balance is: {BALABNCE}."
+    SuccessfullyBoughtItem: "&aSuccessfully bought item. Your current balance is: {BALANCE}."
   Announcements:
     GameStarting:
     - "&6==================================="