build.gradle.kts

@@ -7,13 +7,13 @@ import net.minecrell.pluginyml.paper.PaperPluginDescription
 plugins {
     id("java")
     id("java-library")
-    id("de.eldoria.plugin-yml.paper") version "0.9.0"
+    id("de.eldoria.plugin-yml.paper") version "0.8.0"
     id("xyz.jpenilla.run-paper") version "1.0.6"
     id("maven-publish")
 }
 
 group = "com.alttd.playershops"
-version = System.getenv("BUILD_NUMBER") ?: "1.4-SNAPSHOT"
+version = System.getenv("BUILD_NUMBER") ?: "1.3-SNAPSHOT"
 description = "Player Shop plugin for Altitude."
 
 apply<JavaLibraryPlugin>()
@@ -29,17 +29,16 @@ tasks {
     }
 
     runServer {
-        val dir = File(System.getProperty("user.home") + "/share/devserver/")
+        val fileName = "./run/cosmos.jar"
-        if (!dir.parentFile.exists()) {
+        val file = File(fileName)
-            dir.parentFile.mkdirs()
+        if (!file.parentFile.exists()) {
+            file.parentFile.mkdirs()
+        }
+        if (!file.exists()) {
+//            download("https://jenkins.destro.xyz/job/Cosmos/lastSuccessfulBuild/artifact/cosmos-server/build/libs/cosmos-bundler-1.21.11-R0.1-SNAPSHOT-mojmap.jar", fileName)
         }
-        runDirectory.set(dir)
-
-        val fileName = "/cosmos.jar"
-        val file = File(dir.path + fileName)
-
         serverJar(file)
-        minecraftVersion("26.2")
+        minecraftVersion("1.21")
     }
 
     jar {
@@ -74,8 +73,8 @@ dependencies {
     }
     compileOnly("com.github.TechFortress:GriefPrevention:16.17.1")
 
-    compileOnly("org.projectlombok:lombok:1.18.46")
+    compileOnly("org.projectlombok:lombok:1.18.30")
-    annotationProcessor("org.projectlombok:lombok:1.18.46")
+    annotationProcessor("org.projectlombok:lombok:1.18.30")
 }
 
 fun download(link: String, path: String) {

src/main/java/com/alttd/playershops/config/MessageConfig.java

@@ -174,14 +174,12 @@ public class MessageConfig {
     public static String GUI_HOME_TITLE = "<green>PlayerShops";
     public static String GUI_LIST_PLAYERS_TITLE = "<green>Player shops";
     public static String GUI_LIST_SHOPS_TITLE = "<green>Players shops by <playername>";
-    public static String GUI_LIST_SHOPS_ITEM_TITLE = "<green>Players shops by item";
     public static String GUI_LIST_TRANSACTIONS_TITLE = "<green>Shop Transactions";
     public static String GUI_MANAGE_TITLE = "<green>Shop Manager";
     public static String GUI_PLAYER_SETTINGS_TITLE = "<green>Shop Settings Manager";
     private static void guiTitles() {
         GUI_HOME_TITLE = getString("gui.home-title", GUI_HOME_TITLE);
         GUI_LIST_PLAYERS_TITLE = getString("gui.list-players-title", GUI_LIST_PLAYERS_TITLE);
-        GUI_LIST_SHOPS_ITEM_TITLE = getString("gui.list-items-title", GUI_LIST_SHOPS_ITEM_TITLE);
         GUI_LIST_SHOPS_TITLE = getString("gui.list-shops-title", GUI_LIST_SHOPS_TITLE);
         GUI_LIST_TRANSACTIONS_TITLE = getString("gui.list-transactions-title", GUI_LIST_TRANSACTIONS_TITLE);
         GUI_MANAGE_TITLE = getString("gui.manage-title", GUI_MANAGE_TITLE);

src/main/java/com/alttd/playershops/dialog/ManageShopDialog.java

@@ -85,6 +85,9 @@ public class ManageShopDialog extends AbstractDialog {
                         .initial(false)
                         .build()
         );
+        inputs.add(
+                DialogInput.singleOption("item", MiniMessage.miniMessage().deserialize("<gold>Item</gold>"), itemEntries()).build()
+        );
         int maxQty = (shop.isInitialized() && shop.getItemStack() != null ? shop.getItemStack().getMaxStackSize() : 64);
         int initialQty = (shop.isInitialized() ? Math.min(shop.getAmount(), maxQty) : 1);
         inputs.add(
@@ -145,21 +148,19 @@ public class ManageShopDialog extends AbstractDialog {
 
                     // Change Item
                     if (Boolean.TRUE.equals(view.getBoolean("changeitem"))) {
-                        ItemStack itemStack = player.getInventory().getItemInMainHand().clone();
+                        String selection = view.getText("item");
-                        shop.setItemStack(itemStack);
+                        if (selection != null) {
-//                        String selection = view.getText("item");
+                            if (selection.equalsIgnoreCase("reset")) {
-//                        if (selection != null) {
+                                shop.setItemStack(null);
-//                            if (selection.equalsIgnoreCase("reset")) {
+                            } else {
-//                                shop.setItemStack(null);
+                                int slot;
-//                            } else {
+                                try {
-//                                int slot;
+                                    slot = Integer.parseInt(selection);
-//                                try {
+                                    shop.setItemStack(player.getInventory().getItem(slot));
-//                                    slot = Integer.parseInt(selection);
+                                } catch (NumberFormatException ignored) {
-//                                    shop.setItemStack(player.getInventory().getItem(slot));
+                                }
-//                                } catch (NumberFormatException ignored) {
+                            }
-//                                }
+                        }
-//                            }
-//                        }
                     }
 
                     // Change Amount
@@ -187,27 +188,27 @@ public class ManageShopDialog extends AbstractDialog {
         actions.add(saveButton);
     }
 
-//    List<SingleOptionDialogInput.OptionEntry> itemEntries() {
+    List<SingleOptionDialogInput.OptionEntry> itemEntries() {
-//        List<SingleOptionDialogInput.OptionEntry> optionEntries = new ArrayList<>();
+        List<SingleOptionDialogInput.OptionEntry> optionEntries = new ArrayList<>();
-//
+
-//        if (getPlayer() == null) {
+        if (getPlayer() == null) {
-//            return optionEntries;
+            return optionEntries;
-//        }
+        }
-//
+
-//        optionEntries.add(
+        optionEntries.add(
-//                SingleOptionDialogInput.OptionEntry.create("reset", MiniMessage.miniMessage().deserialize("<gold>Reset"), false)
+                SingleOptionDialogInput.OptionEntry.create("reset", MiniMessage.miniMessage().deserialize("<gold>Reset"), false)
-//        );
+        );
-//
+
-//        for (int i = 0; i < getPlayer().getInventory().getSize() ; i++) {
+        for (int i = 0; i < getPlayer().getInventory().getSize() ; i++) {
-//            ItemStack item = getPlayer().getInventory().getItem(i);
+            ItemStack item = getPlayer().getInventory().getItem(i);
-//            if (item == null || item.getType() == Material.AIR) continue;
+            if (item == null || item.getType() == Material.AIR) continue;
-//            ItemStack itemStack = item.clone();
+            ItemStack itemStack = item.clone();
-//            optionEntries.add(
+            optionEntries.add(
-//                    SingleOptionDialogInput.OptionEntry.create(String.valueOf(i), ShopUtil.spriteComponent(itemStack), shop.getItemStack() == itemStack)
+                    SingleOptionDialogInput.OptionEntry.create(String.valueOf(i), ShopUtil.spriteComponent(itemStack), shop.getItemStack() == itemStack)
-//            );
+            );
-//        }
+        }
-//
+
-//        return optionEntries;
+        return optionEntries;
-//    }
+    }
 
 }

src/main/java/com/alttd/playershops/dialog/SearchShopsDialog.java

@@ -44,7 +44,7 @@ public class SearchShopsDialog extends AbstractDialog {
                                 closeButton,
                                 5)
                         )
-                        .base(DialogBase.builder(MiniMessage.miniMessage().deserialize(MessageConfig.GUI_LIST_SHOPS_ITEM_TITLE))
+                        .base(DialogBase.builder(MiniMessage.miniMessage().deserialize(MessageConfig.GUI_LIST_SHOPS_TITLE))
                                 .body(texts)
                                 .inputs(inputs)
                                 .afterAction(DialogBase.DialogAfterAction.CLOSE)
@@ -59,11 +59,6 @@ public class SearchShopsDialog extends AbstractDialog {
 
         for (Map.Entry<Material, List<PlayerShop>> entry : PlayerShops.getInstance().getShopHandler().shopByMaterial().entrySet()) {
             actions.add(ActionButton.builder(ShopUtil.spriteComponent(entry.getKey()))
-                            .tooltip(
-                                    MiniMessage.miniMessage().deserialize(
-                                            entry.getValue().size() + "<green> Shops"
-                                    )
-                            )
                             .action(
                                     DialogAction.customClick((view, audience) -> {
                                         if (!(audience instanceof Player player)) {

src/main/java/com/alttd/playershops/handler/ShopHandler.java

@@ -210,7 +210,7 @@ public class ShopHandler {
      * @return TreeMap containing a list of PlayerShops per material.
      */
     public TreeMap<Material, List<PlayerShop>> shopByMaterial() {
-        // TODO -- make this a cache. update cache on change, do not calc dynamically
+        // TODO -- make this a cache. update cache on change, do not calc dynamicly
         TreeMap<Material, List<PlayerShop>> shopByMaterialTreeSet = new TreeMap<>();
 
         for (PlayerShop shop : getShops()) {
@@ -218,7 +218,7 @@ public class ShopHandler {
                 continue;
             }
 
-            Material material = shop.getShopItemType();
+            Material material = shop.getItemStack().getType();
             List<PlayerShop> shopList = shopByMaterialTreeSet.computeIfAbsent(material, v -> new ArrayList<>());
             shopList.add(shop);
         }

src/main/java/com/alttd/playershops/shop/PlayerShop.java

@@ -148,10 +148,9 @@ public class PlayerShop {
     }
 
     public Inventory getInventory() {
-        if (shopLocation.getBlock().getState() instanceof InventoryHolder inventoryHolder) {
+        // Could use a check if the block is still an InventoryHolder.
-            return inventoryHolder.getInventory();
+        InventoryHolder container = (InventoryHolder) shopLocation.getBlock().getState();
-        }
+        return container.getInventory();
-        return null;
     }
 
     public boolean isInitialized() {
@@ -433,15 +432,12 @@ public class PlayerShop {
     }
 
     public ItemStack getItemStack() {
-        if (!isInitialized()) {
+        if (!isInitialized())
             return null;
-        }
+        if (this.getType() != ShopType.RANDOM)
-        if (this.getType() != ShopType.RANDOM) {
             return itemStack;
-        }
+        if (this.getInventory().isEmpty())
-        if (this.getInventory() == null) {
             return null;
-        }
         ArrayList<ItemStack> contents = new ArrayList<>();
         for (ItemStack it : this.getInventory().getContents()) {
             if (it != null) {
@@ -472,13 +468,11 @@ public class PlayerShop {
         Component component = ShopUtil.itemNameComponent(getItemStack())
                 .append(Component.newline())
                 .append(Component.newline())
-                .append(Component.text("ShopOwner: " + getOwnerName()))
-                .append(Component.newline())
                 .append(Component.text("ShopType: " + type))
                 .append(Component.newline())
                 .append(Component.text("Price: " + price))
                 .append(Component.newline())
-                .append(Component.text("Amount: " + amount))
+                .append(Component.text("ShopType: " + amount))
                 .append(Component.newline())
                 .append(Component.text("World: " + shopLocation.getWorld().getName()))
                 .append(Component.newline())
@@ -490,11 +484,4 @@ public class PlayerShop {
 
         return component;
     }
-
-    public Material getShopItemType() {
-        if (this.type == ShopType.RANDOM) {
-            return Material.STRUCTURE_VOID; // TODO -- Load from config
-        }
-        return itemStack.getType();
-    }
 }

src/main/java/com/alttd/playershops/utils/ItemMatcher.java

@@ -209,7 +209,8 @@ public class ItemMatcher {
                         if (mapView1 == null || mapView2 == null)
                             return false;
 
-                        return mapView1.getId() == mapView2.getId();
+                        if (mapView1.getId() == mapView2.getId())
+                            return true;
                     }
                     return true;
                 }