diff --git a/src/main/java/com/rsscripting/serveradmin/gui/KeepInventoryMenu.java b/src/main/java/com/rsscripting/serveradmin/gui/KeepInventoryMenu.java index b8fd309..af784ed 100644 --- a/src/main/java/com/rsscripting/serveradmin/gui/KeepInventoryMenu.java +++ b/src/main/java/com/rsscripting/serveradmin/gui/KeepInventoryMenu.java @@ -102,7 +102,9 @@ public class KeepInventoryMenu { ItemStack item = new ItemStack( - Material.CHEST + enabled + ? Material.ENDER_CHEST + : Material.CHEST ); ItemMeta meta = @@ -158,7 +160,7 @@ public class KeepInventoryMenu { dao.getAllWorlds(); int start = - page * WORLDS_PER_PAGE; + (page - 1) * WORLDS_PER_PAGE; int slot = 9; @@ -177,7 +179,9 @@ public class KeepInventoryMenu { ItemStack item = new ItemStack( - Material.CHEST + enabled + ? Material.LIME_SHULKER_BOX + : Material.RED_SHULKER_BOX ); ItemMeta meta = @@ -205,14 +209,6 @@ public class KeepInventoryMenu { } - if (enabled) { - - GUIUtils.addGlow( - item - ); - - } - inventory.setItem( slot, item diff --git a/src/main/java/com/rsscripting/serveradmin/listeners/InventoryListener.java b/src/main/java/com/rsscripting/serveradmin/listeners/InventoryListener.java index a41dbdf..65ea268 100644 --- a/src/main/java/com/rsscripting/serveradmin/listeners/InventoryListener.java +++ b/src/main/java/com/rsscripting/serveradmin/listeners/InventoryListener.java @@ -5,6 +5,7 @@ import com.rsscripting.serveradmin.gui.RSMenuHolder; import com.rsscripting.serveradmin.gui.CreeperMenu; import com.rsscripting.serveradmin.RSServerAdmin; import com.rsscripting.serveradmin.settings.SettingKey; +import com.rsscripting.serveradmin.settings.SettingKey; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -126,6 +127,46 @@ public class InventoryListener implements Listener { } + case "KEEP_INVENTORY" -> { + + if (!(event.getWhoClicked() instanceof Player player)) { + return; + } + + switch (event.getSlot()) { + + case 0 -> player.openInventory( + com.rsscripting.serveradmin.gui.MainMenu.create() + ); + + case 4 -> { + + try { + + RSServerAdmin.getInstance() + .getSettingsDAO() + .toggleDefault( + SettingKey.KEEP_INVENTORY_NEW_WORLD + ); + + player.openInventory( + KeepInventoryMenu.create( + holder.getPage() + ) + ); + + } catch (Exception ex) { + + ex.printStackTrace(); + + } + + } + + } + + } + } } diff --git a/src/main/java/com/rsscripting/serveradmin/update/GitHubUpdateChecker.java b/src/main/java/com/rsscripting/serveradmin/update/GitHubUpdateChecker.java index 4e421a5..9020c05 100644 --- a/src/main/java/com/rsscripting/serveradmin/update/GitHubUpdateChecker.java +++ b/src/main/java/com/rsscripting/serveradmin/update/GitHubUpdateChecker.java @@ -56,9 +56,7 @@ public class GitHubUpdateChecker { )) { plugin.getLogger().info( - "Running latest version (" - + currentVersion - + ")." + "RS-ServerAdmin is up to date." ); } else {