diff --git a/pom.xml b/pom.xml index 2012184..1fc0a5c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ de.lunarakai Minecleaner - 1.1.4 + 1.1.5 jar Minecleaner @@ -86,7 +86,7 @@ io.papermc.paper paper-api - 1.20.4-R0.1-SNAPSHOT + 1.20.6-R0.1-SNAPSHOT provided diff --git a/src/main/java/de/lunarakai/minecleaner/MinecleanerListener.java b/src/main/java/de/lunarakai/minecleaner/MinecleanerListener.java index 74353a5..46a1ff1 100644 --- a/src/main/java/de/lunarakai/minecleaner/MinecleanerListener.java +++ b/src/main/java/de/lunarakai/minecleaner/MinecleanerListener.java @@ -153,6 +153,70 @@ public class MinecleanerListener implements Listener { } break; } + case 16: { + switch (plugin.getManager().getSettingsValue("resettime", player)) { + case 1: { + plugin.getManager().updateSettingsValue("resettime", 2, player); + player.closeInventory(); + player.openInventory(plugin.getManager().showSettingsInventory(player)); + break; + } + case 2: { + plugin.getManager().updateSettingsValue("resettime", 3, player); + player.closeInventory(); + player.openInventory(plugin.getManager().showSettingsInventory(player)); + break; + } + case 3: { + plugin.getManager().updateSettingsValue("resettime", 4, player); + player.closeInventory(); + player.openInventory(plugin.getManager().showSettingsInventory(player)); + break; + } + case 4: { + plugin.getManager().updateSettingsValue("resettime", 5, player); + player.closeInventory(); + player.openInventory(plugin.getManager().showSettingsInventory(player)); + break; + } + case 5: { + plugin.getManager().updateSettingsValue("resettime", 6, player); + player.closeInventory(); + player.openInventory(plugin.getManager().showSettingsInventory(player)); + break; + } + case 6: { + plugin.getManager().updateSettingsValue("resettime", 7, player); + player.closeInventory(); + player.openInventory(plugin.getManager().showSettingsInventory(player)); + break; + } + case 7: { + plugin.getManager().updateSettingsValue("resettime", 8, player); + player.closeInventory(); + player.openInventory(plugin.getManager().showSettingsInventory(player)); + break; + } + case 8: { + plugin.getManager().updateSettingsValue("resettime", 9, player); + player.closeInventory(); + player.openInventory(plugin.getManager().showSettingsInventory(player)); + break; + } + case 9: { + plugin.getManager().updateSettingsValue("resettime", 10, player); + player.closeInventory(); + player.openInventory(plugin.getManager().showSettingsInventory(player)); + break; + } + case 10: { + plugin.getManager().updateSettingsValue("resettime", 1, player); + player.closeInventory(); + player.openInventory(plugin.getManager().showSettingsInventory(player)); + break; + } + } + } default: { break; } diff --git a/src/main/java/de/lunarakai/minecleaner/MinecleanerManager.java b/src/main/java/de/lunarakai/minecleaner/MinecleanerManager.java index bc2681a..f3cb3a5 100644 --- a/src/main/java/de/lunarakai/minecleaner/MinecleanerManager.java +++ b/src/main/java/de/lunarakai/minecleaner/MinecleanerManager.java @@ -14,6 +14,7 @@ import org.bukkit.OfflinePlayer; import org.bukkit.Sound; import org.bukkit.World; import org.bukkit.enchantments.Enchantment; +import org.bukkit.entity.Item; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; @@ -49,6 +50,7 @@ public class MinecleanerManager { private Inventory settingsInventory; private SettingKey minecleanerSettingTimerKey; private SettingKey minecleanerAdditionalDisplaySettingKey; + private SettingKey minecleanerResetTimerSettingKey; public MinecleanerManager(MinecleanerPlugin plugin) { this.plugin = plugin; @@ -76,6 +78,10 @@ public class MinecleanerManager { minecleanerAdditionalDisplaySettingKey.setDefault(0); minecleanerAdditionalDisplaySettingKey.setDisplayName("Zusätzliche Anzeige in der Action Bar"); + minecleanerResetTimerSettingKey = plugin.getCubesideStatistics().getSettingKey("minecleaner.settings.resettime"); + minecleanerResetTimerSettingKey.setDefault(5); + minecleanerResetTimerSettingKey.setDisplayName("Dauer die das Spielfeld für das Zurücksetzen brauchen soll"); + this.settingsInventory = plugin.getServer().createInventory(null, InventoryType.CHEST, plugin.getDisplayedPluginName() + " Einstellungen"); @@ -118,9 +124,6 @@ public class MinecleanerManager { this.statisticsTimeRecord = null; this.statisticsTotalGamesPlayed = null; } - - - } @@ -177,7 +180,7 @@ public class MinecleanerManager { } else { leaveArena(player, false); } - }, 100L); + }, plugin.getManager().getSettingsValue("resettime", player) * 20L); return; } int millis = (int) (System.currentTimeMillis() - arena.getCurrentGameStartTime()); @@ -238,7 +241,7 @@ public class MinecleanerManager { } else { leaveArena(player, false); } - }, 100L); + }, plugin.getManager().getSettingsValue("resettime", player) * 20L); } public void clearAllArenas() { @@ -367,6 +370,9 @@ public class MinecleanerManager { public Inventory showSettingsInventory(Player player) { int current = getSettingsValue("additionaldisplay", player); + settingsInventory.setItem(10, + ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.BARRIER), ChatColor.RED + "Platzhalter"))); + if(current == 0) { settingsInventory.setItem(12, ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.NAME_TAG), ChatColor.RED + "Zusätzliche Anzeige in der Action Bar"))); @@ -386,6 +392,41 @@ public class MinecleanerManager { ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.CLOCK), ChatColor.GREEN + "Timer anzeigen"))); } + current = getSettingsValue("resettime", player); + + switch (current) { + case 1: + settingsInventory.setItem(16, ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.CANDLE), ChatColor.GOLD + "Resetzeit: " + ChatColor.RED + "1s"))); + break; + case 2: + settingsInventory.setItem(16, ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.CANDLE), ChatColor.GOLD + "Resetzeit: " + ChatColor.RED + "2s"))); + break; + case 3: + settingsInventory.setItem(16, ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.CANDLE), ChatColor.GOLD + "Resetzeit: " + ChatColor.RED + "3s"))); + break; + case 4: + settingsInventory.setItem(16, ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.CANDLE), ChatColor.GOLD + "Resetzeit: " + ChatColor.RED + "4s"))); + break; + case 5: + settingsInventory.setItem(16, ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.CANDLE), ChatColor.GOLD + "Resetzeit: " + ChatColor.RED + "5s"))); + break; + case 6: + settingsInventory.setItem(16, ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.CANDLE), ChatColor.GOLD + "Resetzeit: " + ChatColor.RED + "6s"))); + break; + case 7: + settingsInventory.setItem(16, ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.CANDLE), ChatColor.GOLD + "Resetzeit: " + ChatColor.RED + "7s"))); + break; + case 8: + settingsInventory.setItem(16, ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.CANDLE), ChatColor.GOLD + "Resetzeit: " + ChatColor.RED + "8s"))); + break; + case 9: + settingsInventory.setItem(16, ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.CANDLE), ChatColor.GOLD + "Resetzeit: " + ChatColor.RED + "9s"))); + break; + case 10: + settingsInventory.setItem(16, ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.CANDLE), ChatColor.GOLD + "Resetzeit: " + ChatColor.RED + "10s"))); + break; + } + return settingsInventory; } @@ -421,4 +462,6 @@ public class MinecleanerManager { public SettingKey getMinecleanerAdditionalDisplaySettingKey() { return minecleanerAdditionalDisplaySettingKey; } + + public SettingKey getMinecleanerResetTimeSettingKey() {return minecleanerResetTimerSettingKey; } }