1.20.6 + resettime for fields is now customizable

This commit is contained in:
LunarAkai 2024-05-02 15:25:27 +02:00
commit 482fc1e22d
3 changed files with 114 additions and 7 deletions

View file

@ -6,7 +6,7 @@
<groupId>de.lunarakai</groupId> <groupId>de.lunarakai</groupId>
<artifactId>Minecleaner</artifactId> <artifactId>Minecleaner</artifactId>
<version>1.1.4</version> <version>1.1.5</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Minecleaner</name> <name>Minecleaner</name>
@ -86,7 +86,7 @@
<dependency> <dependency>
<groupId>io.papermc.paper</groupId> <groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId> <artifactId>paper-api</artifactId>
<version>1.20.4-R0.1-SNAPSHOT</version> <version>1.20.6-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View file

@ -153,6 +153,70 @@ public class MinecleanerListener implements Listener {
} }
break; 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: { default: {
break; break;
} }

View file

@ -14,6 +14,7 @@ import org.bukkit.OfflinePlayer;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Item;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
@ -49,6 +50,7 @@ public class MinecleanerManager {
private Inventory settingsInventory; private Inventory settingsInventory;
private SettingKey minecleanerSettingTimerKey; private SettingKey minecleanerSettingTimerKey;
private SettingKey minecleanerAdditionalDisplaySettingKey; private SettingKey minecleanerAdditionalDisplaySettingKey;
private SettingKey minecleanerResetTimerSettingKey;
public MinecleanerManager(MinecleanerPlugin plugin) { public MinecleanerManager(MinecleanerPlugin plugin) {
this.plugin = plugin; this.plugin = plugin;
@ -76,6 +78,10 @@ public class MinecleanerManager {
minecleanerAdditionalDisplaySettingKey.setDefault(0); minecleanerAdditionalDisplaySettingKey.setDefault(0);
minecleanerAdditionalDisplaySettingKey.setDisplayName("Zusätzliche Anzeige in der Action Bar"); 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, this.settingsInventory = plugin.getServer().createInventory(null, InventoryType.CHEST,
plugin.getDisplayedPluginName() + " Einstellungen"); plugin.getDisplayedPluginName() + " Einstellungen");
@ -118,9 +124,6 @@ public class MinecleanerManager {
this.statisticsTimeRecord = null; this.statisticsTimeRecord = null;
this.statisticsTotalGamesPlayed = null; this.statisticsTotalGamesPlayed = null;
} }
} }
@ -177,7 +180,7 @@ public class MinecleanerManager {
} else { } else {
leaveArena(player, false); leaveArena(player, false);
} }
}, 100L); }, plugin.getManager().getSettingsValue("resettime", player) * 20L);
return; return;
} }
int millis = (int) (System.currentTimeMillis() - arena.getCurrentGameStartTime()); int millis = (int) (System.currentTimeMillis() - arena.getCurrentGameStartTime());
@ -238,7 +241,7 @@ public class MinecleanerManager {
} else { } else {
leaveArena(player, false); leaveArena(player, false);
} }
}, 100L); }, plugin.getManager().getSettingsValue("resettime", player) * 20L);
} }
public void clearAllArenas() { public void clearAllArenas() {
@ -367,6 +370,9 @@ public class MinecleanerManager {
public Inventory showSettingsInventory(Player player) { public Inventory showSettingsInventory(Player player) {
int current = getSettingsValue("additionaldisplay", player); int current = getSettingsValue("additionaldisplay", player);
settingsInventory.setItem(10,
ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.BARRIER), ChatColor.RED + "Platzhalter")));
if(current == 0) { if(current == 0) {
settingsInventory.setItem(12, settingsInventory.setItem(12,
ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.NAME_TAG), ChatColor.RED + "Zusätzliche Anzeige in der Action Bar"))); 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"))); 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; return settingsInventory;
} }
@ -421,4 +462,6 @@ public class MinecleanerManager {
public SettingKey getMinecleanerAdditionalDisplaySettingKey() { public SettingKey getMinecleanerAdditionalDisplaySettingKey() {
return minecleanerAdditionalDisplaySettingKey; return minecleanerAdditionalDisplaySettingKey;
} }
public SettingKey getMinecleanerResetTimeSettingKey() {return minecleanerResetTimerSettingKey; }
} }