Changes

Prince527GitHub · Prince527GitHub · commit 4e1493dc0d10 · 2026-04-04T19:22:31.000-03:00
diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
@@ -0,0 +1,36 @@
+name: Build Development
+
+on:
+  push:
+    branches: [main]
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+
+      - name: Build
+        run: mvn package --file pom.xml
+
+      - name: Extract repository name
+        run: echo "NAME=$(basename ${{ github.repository }})" >> $GITHUB_ENV
+
+      - name: Upload Build
+        uses: marvinpinto/action-automatic-releases@master
+        with:
+          title: "${{ env.NAME }}"
+          automatic_release_tag: "latest"
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          files: "target/*.jar"
+          prerelease: false
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,19 @@
 /dataSources/
 /dataSources.local.xml
 /target
-/.idea
+/.idea
+
+# Eclipse
+.settings
+.classpath
+.project
+.factorypath
+
+# VS Code
+.vscode
+
+# macOS
+.DS_Store
+
+# Maven
+dependency-reduced-pom.xml
diff --git a/src/main/java/fun/pozzoo/quickwaystones/QuickWaystones.java b/src/main/java/fun/pozzoo/quickwaystones/QuickWaystones.java
@@ -17,7 +17,7 @@ public final class QuickWaystones extends JavaPlugin {
     private static QuickWaystones plugin;
     private static DataManager dataManager;
     private static final Map<Location, WaystoneData> waystonesMap = new HashMap<>();
-    private static final Map<UUID, Set<Integer>> playerAccess = new HashMap<>();
+    private static final Map<UUID, Set<String>> playerAccess = new HashMap<>();
     private static int lastWaystoneID = 0;
     private static WaystonePass waystonePass;
     private static Metrics metrics;
@@ -41,7 +41,13 @@ public void onEnable() {
         waystonePass = new WaystonePass(plugin, "waystone_pass", "bound_waystone");
 
         OptionalInt maxId = waystonesMap.values().stream()
-                .mapToInt(WaystoneData::getId)
+                .mapToInt(ws -> {
+                    try {
+                        return Integer.parseInt(ws.getName().replace("Waystone ", ""));
+                    } catch (NumberFormatException e) {
+                        return 0;
+                    }
+                })
                 .max();
 
         if (maxId.isPresent()) {
@@ -94,7 +100,7 @@ public static WaystoneData getWaystone(Location location) {
         return waystonesMap.get(location);
     }
 
-    public static Map<UUID, Set<Integer>> getPlayerAccess() {
+    public static Map<UUID, Set<String>> getPlayerAccess() {
         return playerAccess;
     }
 
diff --git a/src/main/java/fun/pozzoo/quickwaystones/data/WaystoneData.java b/src/main/java/fun/pozzoo/quickwaystones/data/WaystoneData.java
@@ -6,25 +6,31 @@
 import java.util.UUID;
 
 public class WaystoneData {
-    private final int id;
+    private final String id;
     private String name;
     private final UUID owner;
     private final Location location;
 
     public WaystoneData(Location location, UUID owner) {
-        id = QuickWaystones.getAndIncrementLastWaystoneID();
-        name = "Waystone " + id ;
+        id = UUID.randomUUID().toString();
+        name = "Waystone " + QuickWaystones.getAndIncrementLastWaystoneID();
         this.location = location;
         this.owner = owner;
     }
     public WaystoneData(String name, Location location, UUID owner) {
-        id = QuickWaystones.getAndIncrementLastWaystoneID();
+        id = UUID.randomUUID().toString();
+        this.name = name;
+        this.location = location;
+        this.owner = owner;
+    }
+    public WaystoneData(String id, String name, Location location, UUID owner) {
+        this.id = id;
         this.name = name;
         this.location = location;
         this.owner = owner;
     }
 
-    public int getId() {
+    public String getId() {
         return id;
     }
 
diff --git a/src/main/java/fun/pozzoo/quickwaystones/events/OnPlayerInteract.java b/src/main/java/fun/pozzoo/quickwaystones/events/OnPlayerInteract.java
@@ -36,7 +36,7 @@ public void onPlayerInteract(PlayerInteractEvent event) {
         ItemStack item = player.getInventory().getItemInMainHand();
 
         if (this.plugin.getConfig().getBoolean("Settings.EnableWaystonePass") && item.getType() == Material.PAPER && QuickWaystones.getWaystonePass().checkKey(item) && (event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.RIGHT_CLICK_AIR)) {
-            int waystoneID = QuickWaystones.getWaystonePass().getWaystoneID(item);
+            String waystoneID = QuickWaystones.getWaystonePass().getWaystoneID(item);
 
             if (QuickWaystones.getPlayerAccess().get(player.getUniqueId()).contains(waystoneID)) {
                 player.playSound(player, Sound.ENTITY_GENERIC_EXTINGUISH_FIRE, 0.1f, 1);
@@ -47,6 +47,7 @@ public void onPlayerInteract(PlayerInteractEvent event) {
             player.playSound(player, Sound.ENTITY_PLAYER_LEVELUP, 1, 1);
             player.sendMessage(StringUtils.formatString("<gold>" + this.plugin.getConfig().getString("Messages.WaystoneDiscovered")));
             QuickWaystones.getPlayerAccess().get(player.getUniqueId()).add(waystoneID);
+            QuickWaystones.saveData();
 
             return;
         }
@@ -68,6 +69,7 @@ public void onPlayerInteract(PlayerInteractEvent event) {
             QuickWaystones.createWaystone(location, new WaystoneData(location, player.getUniqueId()));
 
             QuickWaystones.getPlayerAccess().get(player.getUniqueId()).add(QuickWaystones.getWaystonesMap().get(location).getId());
+            QuickWaystones.saveData();
 
             return;
         }
@@ -82,6 +84,7 @@ public void onPlayerInteract(PlayerInteractEvent event) {
 
                 QuickWaystones.getWaystone(location).setName(textComponent.content());
                 player.getInventory().getItemInMainHand().subtract();
+                QuickWaystones.saveData();
 
                 return;
             }
@@ -104,9 +107,11 @@ public void onPlayerInteract(PlayerInteractEvent event) {
                 player.playSound(player, Sound.ENTITY_PLAYER_LEVELUP, 1, 1);
                 player.sendMessage(StringUtils.formatString("<gold>" + this.plugin.getConfig().getString("Messages.WaystoneDiscovered")));
                 QuickWaystones.getPlayerAccess().get(player.getUniqueId()).add(QuickWaystones.getWaystonesMap().get(location).getId());
+                QuickWaystones.saveData();
             }
         } else {
             QuickWaystones.getPlayerAccess().get(player.getUniqueId()).add(QuickWaystones.getWaystonesMap().get(location).getId());
+            QuickWaystones.saveData();
         }
 
         WaystoneGUI.runGUI(player, QuickWaystones.getWaystonesMap().get(location));
diff --git a/src/main/java/fun/pozzoo/quickwaystones/gui/WaystoneGUI.java b/src/main/java/fun/pozzoo/quickwaystones/gui/WaystoneGUI.java
@@ -19,12 +19,12 @@
 
 public class WaystoneGUI implements Listener {
 
-    private static final int ROWS = 4;
-    private static final int PAGE_SIZE = 27; // top 3 rows
+    private static final int ROWS = 6;
+    private static final int PAGE_SIZE = 45; // top 5 rows
     private static final int INVENTORY_SIZE = ROWS * 9;
-    private static final int PREV_SLOT = 27 + (3 - 1); // 29
-    private static final int NEXT_SLOT = 27 + (7 - 1); // 33
-    private static final int PAGE_SLOT = 27 + (5 - 1); // 31
+    private static final int PREV_SLOT = 45 + (3 - 1); // 47
+    private static final int NEXT_SLOT = 45 + (7 - 1); // 51
+    private static final int PAGE_SLOT = 45 + (5 - 1); // 49
 
     private static volatile boolean registered = false;
 
@@ -48,13 +48,16 @@ private static void ensureRegistered() {
 
     private static void openPage(Player player, int page, WaystoneData waystoneData) {
         Map<Location, WaystoneData> waystonesMap = new HashMap<>(QuickWaystones.getWaystonesMap());
-        Map<UUID, Set<Integer>> playerAccess = QuickWaystones.getPlayerAccess();
+        Map<UUID, Set<String>> playerAccess = QuickWaystones.getPlayerAccess();
 
         if (QuickWaystones.getInstance().getConfig().getBoolean("Settings.HideUndiscoveredWaystones")) {
             waystonesMap.entrySet().removeIf(entry -> !playerAccess.get(player.getUniqueId()).contains(entry.getValue().getId()));
         }
 
         List<WaystoneData> waystones = new ArrayList<>(waystonesMap.values());
+        
+        // Sort waystones by name
+        waystones.sort(Comparator.comparing(WaystoneData::getName));
 
         int totalItems = waystones.size();
         int totalPages = Math.max(1, (int) Math.ceil(totalItems / (double) PAGE_SIZE));
@@ -65,13 +68,28 @@ private static void openPage(Player player, int page, WaystoneData waystoneData)
         WaystoneHolder holder = new WaystoneHolder(currentPage, totalPages, waystoneData);
         Inventory inv = Bukkit.createInventory(holder, INVENTORY_SIZE, title);
 
-        // Fill page items (top 27 slots)
+        // Fill page items (top 45 slots)
         int startIndex = currentPage * PAGE_SIZE;
         int endIndex = Math.min(startIndex + PAGE_SIZE, totalItems);
         int slot = 0;
         for (int i = startIndex; i < endIndex; i++) {
             WaystoneData ws = waystones.get(i);
-            ItemStack item = new ItemStack(Material.ENDER_PEARL);
+            
+            // Get world-specific icon
+            Material material;
+            switch (ws.getLocation().getWorld().getEnvironment()) {
+                case NETHER:
+                    material = Material.NETHERRACK;
+                    break;
+                case THE_END:
+                    material = Material.END_STONE;
+                    break;
+                default:
+                    material = Material.GRASS_BLOCK;
+                    break;
+            }
+            
+            ItemStack item = new ItemStack(material);
             ItemMeta meta = item.getItemMeta();
             if (meta != null) {
                 meta.displayName(StringUtils.formatItemName(ws.getName()));
@@ -158,7 +176,7 @@ public void onInventoryClick(InventoryClickEvent event) {
         // Waystone teleport
         WaystoneData ws = holder.slotToWaystone.get(slot);
         if (ws != null) {
-            if (ws.getId() == holder.waystoneData.getId()) {
+            if (ws.getId().equals(holder.waystoneData.getId())) {
                 String message = QuickWaystones.getInstance().getConfig().getString("Messages.SameWaystone", "You cannot teleport to the same waystone!");
                 player.sendMessage(StringUtils.formatString("<red>" + message));
                 player.playSound(player, Sound.ENTITY_GENERIC_EXTINGUISH_FIRE, 0.1f, 1);
diff --git a/src/main/java/fun/pozzoo/quickwaystones/items/WaystonePass.java b/src/main/java/fun/pozzoo/quickwaystones/items/WaystonePass.java
@@ -45,11 +45,11 @@ public WaystonePass(QuickWaystones plugin, String pass_key, String bound_wayston
         this.item = item;
     }
 
-    public ItemStack createItem(int waystoneID) {
+    public ItemStack createItem(String waystoneID) {
         ItemStack item = this.item.clone();
         ItemMeta meta = item.getItemMeta();
 
-        meta.getPersistentDataContainer().set(this.bound_waystone_key, PersistentDataType.INTEGER, waystoneID);
+        meta.getPersistentDataContainer().set(this.bound_waystone_key, PersistentDataType.STRING, waystoneID);
         item.setItemMeta(meta);
 
         return item;
@@ -59,8 +59,8 @@ public boolean checkKey(ItemStack item) {
         return item.getItemMeta().getPersistentDataContainer().get(this.pass_key,  PersistentDataType.BYTE) != null;
     }
 
-    public Integer getWaystoneID(ItemStack item) {
+    public String getWaystoneID(ItemStack item) {
         ItemMeta meta = item.getItemMeta();
-        return meta.getPersistentDataContainer().get(this.bound_waystone_key, PersistentDataType.INTEGER);
+        return meta.getPersistentDataContainer().get(this.bound_waystone_key, PersistentDataType.STRING);
     }
 }
diff --git a/src/main/java/fun/pozzoo/quickwaystones/managers/DataManager.java b/src/main/java/fun/pozzoo/quickwaystones/managers/DataManager.java
@@ -47,28 +47,30 @@ public void loadData() {
             config.load(file);
 
             for (String key : waystoneKeys) {
-                WaystoneData waystoneData = new WaystoneData(key, config.getLocation("Waystones." + key + ".location"), UUID.fromString(Objects.requireNonNull(config.getString("Waystones." + key + ".owner"))));
+                WaystoneData waystoneData = new WaystoneData(key, config.getString("Waystones." + key + ".name"), config.getLocation("Waystones." + key + ".location"), UUID.fromString(Objects.requireNonNull(config.getString("Waystones." + key + ".owner"))));
                 QuickWaystones.getWaystonesMap().put(waystoneData.getLocation(), waystoneData);
             }
 
             for (String key : accessKeys) {
-                QuickWaystones.getPlayerAccess().put(UUID.fromString(key), new HashSet<>(Arrays.asList(Objects.requireNonNull(config.getIntegerList("Access." + key)).toArray(new Integer[0]))));
+                List<String> stringList = config.getStringList("Access." + key);
+                QuickWaystones.getPlayerAccess().put(UUID.fromString(key), new HashSet<>(stringList));
             }
         } catch (InvalidConfigurationException | IOException e) {
             throw new RuntimeException(e);
         }
     }
 
-    public void saveData(Collection<WaystoneData> waystones, Map<UUID, Set<Integer>> playerAccess) {
+    public void saveData(Collection<WaystoneData> waystones, Map<UUID, Set<String>> playerAccess) {
         configOverwrite = new YamlConfiguration();
 
         for (WaystoneData waystone : waystones) {
-            configOverwrite.set("Waystones." + waystone.getName() + ".location", waystone.getLocation());
-            configOverwrite.set("Waystones." + waystone.getName() + ".owner", waystone.getOwner().toString());
+            configOverwrite.set("Waystones." + waystone.getId() + ".name", waystone.getName());
+            configOverwrite.set("Waystones." + waystone.getId() + ".location", waystone.getLocation());
+            configOverwrite.set("Waystones." + waystone.getId() + ".owner", waystone.getOwner().toString());
         }
 
-        for (Map.Entry<UUID, Set<Integer>> entry : playerAccess.entrySet()) {
-            configOverwrite.set("Access." + entry.getKey().toString(), entry.getValue().toArray(new Integer[0]));
+        for (Map.Entry<UUID, Set<String>> entry : playerAccess.entrySet()) {
+            configOverwrite.set("Access." + entry.getKey().toString(), new ArrayList<>(entry.getValue()));
         }
 
         save();

Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,11 @@ public WaystonePass(QuickWaystones plugin, String pass_key, String bound_wayston`
`45`	`45`	`this.item = item;`
`46`	`46`	`}`
`47`	`47`
`48`		`- public ItemStack createItem(int waystoneID) {`
	`48`	`+ public ItemStack createItem(String waystoneID) {`
`49`	`49`	`ItemStack item = this.item.clone();`
`50`	`50`	`ItemMeta meta = item.getItemMeta();`
`51`	`51`
`52`		`- meta.getPersistentDataContainer().set(this.bound_waystone_key, PersistentDataType.INTEGER, waystoneID);`
	`52`	`+ meta.getPersistentDataContainer().set(this.bound_waystone_key, PersistentDataType.STRING, waystoneID);`
`53`	`53`	`item.setItemMeta(meta);`
`54`	`54`
`55`	`55`	`return item;`
`@@ -59,8 +59,8 @@ public boolean checkKey(ItemStack item) {`
`59`	`59`	`return item.getItemMeta().getPersistentDataContainer().get(this.pass_key, PersistentDataType.BYTE) != null;`
`60`	`60`	`}`
`61`	`61`
`62`		`- public Integer getWaystoneID(ItemStack item) {`
	`62`	`+ public String getWaystoneID(ItemStack item) {`
`63`	`63`	`ItemMeta meta = item.getItemMeta();`
`64`		`- return meta.getPersistentDataContainer().get(this.bound_waystone_key, PersistentDataType.INTEGER);`
	`64`	`+ return meta.getPersistentDataContainer().get(this.bound_waystone_key, PersistentDataType.STRING);`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,28 +47,30 @@ public void loadData() {`
`47`	`47`	`config.load(file);`
`48`	`48`
`49`	`49`	`for (String key : waystoneKeys) {`
`50`		`- WaystoneData waystoneData = new WaystoneData(key, config.getLocation("Waystones." + key + ".location"), UUID.fromString(Objects.requireNonNull(config.getString("Waystones." + key + ".owner"))));`
	`50`	`+ WaystoneData waystoneData = new WaystoneData(key, config.getString("Waystones." + key + ".name"), config.getLocation("Waystones." + key + ".location"), UUID.fromString(Objects.requireNonNull(config.getString("Waystones." + key + ".owner"))));`
`51`	`51`	`QuickWaystones.getWaystonesMap().put(waystoneData.getLocation(), waystoneData);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`for (String key : accessKeys) {`
`55`		`- QuickWaystones.getPlayerAccess().put(UUID.fromString(key), new HashSet<>(Arrays.asList(Objects.requireNonNull(config.getIntegerList("Access." + key)).toArray(new Integer[0]))));`
	`55`	`+ List<String> stringList = config.getStringList("Access." + key);`
	`56`	`+ QuickWaystones.getPlayerAccess().put(UUID.fromString(key), new HashSet<>(stringList));`
`56`	`57`	`}`
`57`	`58`	`} catch (InvalidConfigurationException \| IOException e) {`
`58`	`59`	`throw new RuntimeException(e);`
`59`	`60`	`}`
`60`	`61`	`}`
`61`	`62`
`62`		`- public void saveData(Collection<WaystoneData> waystones, Map<UUID, Set<Integer>> playerAccess) {`
	`63`	`+ public void saveData(Collection<WaystoneData> waystones, Map<UUID, Set<String>> playerAccess) {`
`63`	`64`	`configOverwrite = new YamlConfiguration();`
`64`	`65`
`65`	`66`	`for (WaystoneData waystone : waystones) {`
`66`		`- configOverwrite.set("Waystones." + waystone.getName() + ".location", waystone.getLocation());`
`67`		`- configOverwrite.set("Waystones." + waystone.getName() + ".owner", waystone.getOwner().toString());`
	`67`	`+ configOverwrite.set("Waystones." + waystone.getId() + ".name", waystone.getName());`
	`68`	`+ configOverwrite.set("Waystones." + waystone.getId() + ".location", waystone.getLocation());`
	`69`	`+ configOverwrite.set("Waystones." + waystone.getId() + ".owner", waystone.getOwner().toString());`
`68`	`70`	`}`
`69`	`71`
`70`		`- for (Map.Entry<UUID, Set<Integer>> entry : playerAccess.entrySet()) {`
`71`		`- configOverwrite.set("Access." + entry.getKey().toString(), entry.getValue().toArray(new Integer[0]));`
	`72`	`+ for (Map.Entry<UUID, Set<String>> entry : playerAccess.entrySet()) {`
	`73`	`+ configOverwrite.set("Access." + entry.getKey().toString(), new ArrayList<>(entry.getValue()));`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`save();`