LunarAkai/NewMinecleaner
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases 2 Packages Wiki Activity Actions

fixed compilation error + apparently more usage of translatable components

Browse source
This commit is contained in:
LunarAkai 2024-11-06 01:52:58 +01:00
commit 017a02a0c0
9 changed files with 69 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -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.6-R0.1-SNAPSHOT</version> <version>1.21.3-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

4
src/main/java/de/lunarakai/minecleaner/MinecleanerGroupManager.java
View file

@ -55,13 +55,13 @@ public class MinecleanerGroupManager {
continue; continue;
} }
Player iteratorPlayer = Bukkit.getPlayer(iterator.next()); Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
ChatUtils.sendSimpleInfoMessage(iteratorPlayer, "Die Gruppe wurde aufgelöst, da die Person, welche die Gruppe erstellt hat, aus der Gruppe entfernt wurde."); ChatUtils.sendSimpleInfoMessage(iteratorPlayer, "group.creator.removed");
} }
deleteGroup(getGroup(Bukkit.getPlayer(owner))); deleteGroup(getGroup(Bukkit.getPlayer(owner)));
} }
players.remove(playerUUID); players.remove(playerUUID);
if(players.size() < 2) { if(players.size() < 2) {
ChatUtils.sendSimpleInfoMessage(Bukkit.getPlayer(owner), "Die Gruppe wurde aufgelöst, da du nur noch alleine in der Gruppe bist"); ChatUtils.sendSimpleInfoMessage(Bukkit.getPlayer(owner), "group.dismantled.alone");
deleteGroup(getGroup(Bukkit.getPlayer(owner))); deleteGroup(getGroup(Bukkit.getPlayer(owner)));
} }
} }

7
src/main/java/de/lunarakai/minecleaner/MinecleanerListener.java
View file

@ -5,6 +5,7 @@ import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import java.util.UUID; import java.util.UUID;
import java.util.logging.Level; import java.util.logging.Level;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -199,7 +200,7 @@ public class MinecleanerListener implements Listener {
if(arena != null) { if(arena != null) {
if(plugin.getGroupManager().getGroup(player) == null) { if(plugin.getGroupManager().getGroup(player) == null) {
if((arena.isTooFarAway(player))) { if((arena.isTooFarAway(player))) {
ChatUtils.sendSimpleInfoMessage(player, "Du hast dich zu weit von der Arena entfernt. Das Spiel wurde abgebrochen."); ChatUtils.sendSimpleInfoMessage(player, "arena.common.toofaraway");
Player[] players = new Player[] { Player[] players = new Player[] {
player player
}; };
@ -213,11 +214,11 @@ public class MinecleanerListener implements Listener {
for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(player).getPlayers().iterator(); iterator.hasNext();) { for(Iterator<UUID> iterator = plugin.getGroupManager().getGroup(player).getPlayers().iterator(); iterator.hasNext();) {
Player iteratorPlayer = Bukkit.getPlayer(iterator.next()); Player iteratorPlayer = Bukkit.getPlayer(iterator.next());
if(iteratorPlayer == ownerPlayer) { if(iteratorPlayer == ownerPlayer) {
ChatUtils.sendSimpleInfoMessage(iteratorPlayer, "Du hast dich zu weit von der Arena entfernt. Das Spiel wurde abgebrochen."); ChatUtils.sendSimpleInfoMessage(iteratorPlayer, "arena.common.toofaraway");
continue; continue;
} }
assert iteratorPlayer != null; assert iteratorPlayer != null;
ChatUtils.sendSimpleInfoMessage(iteratorPlayer, "Der Ersteller der Gruppe hat sich zu weit von der Arena entfernt. Das Spiel wurde abgebrochen."); ChatUtils.sendSimpleInfoMessage(iteratorPlayer, "arena.common.groupleadertoofaraway");
} }
Player[] players = new Player[] { Player[] players = new Player[] {
ownerPlayer ownerPlayer

16
src/main/java/de/lunarakai/minecleaner/MinecleanerManager.java
View file

@ -36,8 +36,8 @@ import de.iani.cubesideutils.bukkit.items.ItemStacks;
import de.iani.playerUUIDCache.CachedPlayer; import de.iani.playerUUIDCache.CachedPlayer;
import de.lunarakai.minecleaner.game.BoardSize; import de.lunarakai.minecleaner.game.BoardSize;
import de.lunarakai.minecleaner.utils.MinecleanerStringUtil; import de.lunarakai.minecleaner.utils.MinecleanerStringUtil;
import net.md_5.bungee.api.ChatColor;
// Todo: translatable components verwenden
public class MinecleanerManager { public class MinecleanerManager {
private final MinecleanerPlugin plugin; private final MinecleanerPlugin plugin;
private final Inventory confirmPlayingInventory; private final Inventory confirmPlayingInventory;
@ -69,10 +69,8 @@ public class MinecleanerManager {
this.sizes.put(3, "experte"); this.sizes.put(3, "experte");
this.confirmPlayingInventory = plugin.getServer().createInventory(null, InventoryType.HOPPER, plugin.getDisplayedPluginName() + " starten?"); this.confirmPlayingInventory = plugin.getServer().createInventory(null, InventoryType.HOPPER, plugin.getDisplayedPluginName() + " starten?");
this.confirmPlayingInventory.setItem(1, this.confirmPlayingInventory.setItem(1, ItemStacks.rename(new ItemStack(Material.GREEN_CONCRETE), NamedTextColor.GREEN + "Bestätigen"));
ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.GREEN_CONCRETE), ChatColor.GREEN + "Bestätigen"))); this.confirmPlayingInventory.setItem(3, ItemStacks.rename(new ItemStack(Material.GREEN_CONCRETE), NamedTextColor.RED + "Abbrechen"));
this.confirmPlayingInventory.setItem(3,
ItemStacks.lore(ItemStacks.rename(new ItemStack(Material.RED_CONCRETE), ChatColor.RED + "Abbrechen")));
// Settings // Settings
@ -190,7 +188,7 @@ public class MinecleanerManager {
arena.removePlayers(); arena.removePlayers();
if(message) { if(message) {
for(int i = 0; i < players.length; i++) { for(int i = 0; i < players.length; i++) {
players1[i].sendMessage(ChatColor.YELLOW + "Das " + plugin.getDisplayedPluginName() + "spiel wurde abgebrochen."); players1[i].sendMessage(NamedTextColor.YELLOW + "Das " + plugin.getDisplayedPluginName() + "spiel wurde abgebrochen.");
} }
} }
} }
@ -310,9 +308,9 @@ public class MinecleanerManager {
if(sg != null) { if(sg != null) {
ps.minScore(sg, millis, isUpdated -> { ps.minScore(sg, millis, isUpdated -> {
if(isUpdated != null && isUpdated) { if(isUpdated != null && isUpdated) {
player[0].sendMessage(ChatColor.GOLD + "Herzlichen Glückwunsch! Du hast eine neue Bestzeit erreicht! " + ChatColor.RED + MinecleanerStringUtil.timeToString(millis, false) ); player[0].sendMessage(NamedTextColor.GOLD + "Herzlichen Glückwunsch! Du hast eine neue Bestzeit erreicht! " + NamedTextColor.RED + MinecleanerStringUtil.timeToString(millis, false) );
} else { } else {
player[0].sendMessage(ChatColor.YELLOW + "Glückwunsch, du konntest das " + plugin.getDisplayedPluginName() + "-Feld in " + ChatColor.RED + MinecleanerStringUtil.timeToString(millis, false) + ChatColor.YELLOW + " erfolgreich lösen!"); player[0].sendMessage(NamedTextColor.YELLOW + "Glückwunsch, du konntest das " + plugin.getDisplayedPluginName() + "-Feld in " + NamedTextColor.RED + MinecleanerStringUtil.timeToString(millis, false) + NamedTextColor.YELLOW + " erfolgreich lösen!");
} }
}); });
} }
@ -320,7 +318,7 @@ public class MinecleanerManager {
int wIndex = arena.getWidthIndex(); int wIndex = arena.getWidthIndex();
increaseScore(wIndex, ps, 1); increaseScore(wIndex, ps, 1);
} else { } else {
player[0].sendMessage(ChatColor.YELLOW + "Glückwunsch, du konntest das " + plugin.getDisplayedPluginName() + "-Feld in " + ChatColor.RED + MinecleanerStringUtil.timeToString(millis, false) + ChatColor.YELLOW + " erfolgreich lösen!"); player[0].sendMessage(NamedTextColor.YELLOW + "Glückwunsch, du konntest das " + plugin.getDisplayedPluginName() + "-Feld in " + NamedTextColor.RED + MinecleanerStringUtil.timeToString(millis, false) + NamedTextColor.YELLOW + " erfolgreich lösen!");
} }
scheduleArenaReset(player[0], arena); scheduleArenaReset(player[0], arena);

17
src/main/java/de/lunarakai/minecleaner/MinecleanerSettingsInventory.java
View file

@ -2,7 +2,8 @@ package de.lunarakai.minecleaner;
import de.iani.cubesideutils.bukkit.inventory.AbstractWindow; import de.iani.cubesideutils.bukkit.inventory.AbstractWindow;
import de.lunarakai.minecleaner.utils.ItemUtil; import de.lunarakai.minecleaner.utils.ItemUtil;
import net.md_5.bungee.api.ChatColor; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -35,28 +36,28 @@ public class MinecleanerSettingsInventory extends AbstractWindow {
switch (i) { switch (i) {
case SETTINGS_ALLOW_MANUEL_RESET -> { case SETTINGS_ALLOW_MANUEL_RESET -> {
if (plugin.getManager().getSettingsValue("allowmanualreset", player) == 0) { if (plugin.getManager().getSettingsValue("allowmanualreset", player) == 0) {
item = ItemUtil.createGuiItem(Material.SHEARS, ChatColor.RED + "Manuelles Resetten deaktiviert"); item = ItemUtil.createGuiItem(Material.SHEARS, Component.translatable("settings.manualreset.deny", NamedTextColor.RED));
} else { } else {
item = ItemUtil.createGuiItem(Material.SHEARS, ChatColor.GREEN + "Manuelles Resetten aktiviert"); item = ItemUtil.createGuiItem(Material.SHEARS, Component.translatable("settings.manualreset.allow", NamedTextColor.GREEN));
} }
} }
case SETTINGS_ADDITIONAL_DISPLAY -> { case SETTINGS_ADDITIONAL_DISPLAY -> {
if (plugin.getManager().getSettingsValue("additionaldisplay", player) == 0) { if (plugin.getManager().getSettingsValue("additionaldisplay", player) == 0) {
item = ItemUtil.createGuiItem(Material.NAME_TAG, ChatColor.RED + "Zusätzliche Anzeige in der Action Bar deaktiviert\""); item = ItemUtil.createGuiItem(Material.NAME_TAG, Component.translatable("settings.additionaltimer.deny", NamedTextColor.RED));
} else { } else {
item = ItemUtil.createGuiItem(Material.NAME_TAG, ChatColor.GREEN + "Zusätzliche Anzeige in der Action Bar aktiviert\""); item = ItemUtil.createGuiItem(Material.NAME_TAG, Component.translatable("settings.additionaltimer.allow", NamedTextColor.GREEN));
} }
} }
case SETTINGS_TIMER -> { case SETTINGS_TIMER -> {
if (plugin.getManager().getSettingsValue("timer", player) == 0) { if (plugin.getManager().getSettingsValue("timer", player) == 0) {
item = ItemUtil.createGuiItem(Material.CLOCK, ChatColor.RED + "Timer wird nicht angezeigt"); item = ItemUtil.createGuiItem(Material.CLOCK, Component.translatable("settings.timer.deny", NamedTextColor.RED));
} else { } else {
item = ItemUtil.createGuiItem(Material.CLOCK, ChatColor.GREEN + "Timer wird angezeigt"); item = ItemUtil.createGuiItem(Material.CLOCK, Component.translatable("settings.timer.allow", NamedTextColor.GREEN));
} }
} }
case SETTINGS_RESETTIME -> { case SETTINGS_RESETTIME -> {
int current = plugin.getManager().getSettingsValue("resettime", player); int current = plugin.getManager().getSettingsValue("resettime", player);
item = ItemUtil.createGuiItem(Material.CANDLE, ChatColor.GOLD + "Resetzeit: " + ChatColor.RED + current + "s"); item = ItemUtil.createGuiItem(Material.CANDLE, Component.translatable("settings.resettime.text", NamedTextColor.GOLD).append(Component.text(": ")).append(Component.text(current, NamedTextColor.RED)).append(Component.text(" s", NamedTextColor.RED)));
} }
default -> item = ItemUtil.EMPTY_ICON; default -> item = ItemUtil.EMPTY_ICON;
} }

9
src/main/java/de/lunarakai/minecleaner/utils/ItemUtil.java
View file

@ -1,6 +1,7 @@
package de.lunarakai.minecleaner.utils; package de.lunarakai.minecleaner.utils;
import de.iani.cubesideutils.bukkit.items.ItemBuilder; import de.iani.cubesideutils.bukkit.items.ItemBuilder;
import net.kyori.adventure.text.Component;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemFlag;
@ -8,13 +9,13 @@ import org.bukkit.inventory.ItemStack;
public class ItemUtil { public class ItemUtil {
public static final ItemStack EMPTY_ICON = createGuiItem(Material.GRAY_STAINED_GLASS_PANE, " ", true, true); public static final ItemStack EMPTY_ICON = createGuiItem(Material.GRAY_STAINED_GLASS_PANE, Component.text(" "), true, true);
public static ItemStack createGuiItem(Material material, String name, String... lore) { public static ItemStack createGuiItem(Material material, Component name, String... lore) {
return createGuiItem(material, name, false, lore); return createGuiItem(material, name, false, lore);
} }
public static ItemStack createGuiItem(Material material, String name, boolean glowing, boolean showTooltip, String... lore) { public static ItemStack createGuiItem(Material material, Component name, boolean glowing, boolean showTooltip, String... lore) {
ItemBuilder builder = ItemBuilder.fromMaterial(material).displayName(name).lore(lore); ItemBuilder builder = ItemBuilder.fromMaterial(material).displayName(name).lore(lore);
if (glowing) { if (glowing) {
builder.enchantment(Enchantment.UNBREAKING, 1, true).flag(ItemFlag.HIDE_ENCHANTS); builder.enchantment(Enchantment.UNBREAKING, 1, true).flag(ItemFlag.HIDE_ENCHANTS);
@ -26,7 +27,7 @@ public class ItemUtil {
} }
public static ItemStack createGuiItem(Material material, String name, boolean glowing, String... lore) { public static ItemStack createGuiItem(Material material, Component name, boolean glowing, String... lore) {
return createGuiItem(material, name, glowing, true, lore); return createGuiItem(material, name, glowing, true, lore);
} }
} }

9
src/main/java/de/lunarakai/minecleaner/utils/MinecleanerStringUtil.java
View file

@ -1,6 +1,7 @@
package de.lunarakai.minecleaner.utils; package de.lunarakai.minecleaner.utils;
import java.net.URL; import java.net.URL;
import net.kyori.adventure.text.Component;
public class MinecleanerStringUtil { public class MinecleanerStringUtil {
private MinecleanerStringUtil() { private MinecleanerStringUtil() {
@ -14,7 +15,7 @@ public class MinecleanerStringUtil {
min = min % 60; min = min % 60;
StringBuilder timeString = new StringBuilder(); StringBuilder timeString = new StringBuilder();
if (hours > 0) { if (hours > 0) {
String hoursString = " Stunden"; String hoursString = " " + Component.translatable("minecleaner.common.hours");
if(shorten) { if(shorten) {
hoursString = " h"; hoursString = " h";
} }
@ -24,7 +25,7 @@ public class MinecleanerStringUtil {
if (!timeString.isEmpty()) { if (!timeString.isEmpty()) {
timeString.append(", "); timeString.append(", ");
} }
String minString = " Minuten"; String minString = " " + Component.translatable("minecleaner.common.minutes");
if(shorten) { if(shorten) {
minString = " min"; minString = " min";
} }
@ -32,9 +33,9 @@ public class MinecleanerStringUtil {
} }
if (sec > 0 || !timeString.isEmpty()) { if (sec > 0 || !timeString.isEmpty()) {
if (!timeString.isEmpty()) { if (!timeString.isEmpty()) {
timeString.append(" und "); timeString.append(Component.text(" ")).append(Component.translatable("minecleaner.common.and").append(Component.text(" ")));
} }
String secondsString = " Sekunden"; String secondsString = " " + Component.translatable("minecleaner.common.seconds");
if(shorten) { if(shorten) {
secondsString = " s"; secondsString = " s";
} }

20
src/main/resources/lang/de_DE.properties
View file

@ -3,6 +3,20 @@ minecleaner.info.developer=Entwickelt von
minecleaner.info.website=Website minecleaner.info.website=Website
minecleaner.info.license=Lizenz minecleaner.info.license=Lizenz
minecleaner.common.hours=Stunden
minecleaner.common.minutes=Minuten
minecleaner.common.seconds=Sekunden
minecleaner.common.and=und
settings.manualreset.allow=Manuelles Resetten aktiviert
settings.manualreset.deny=Manuelles Resetten deaktiviert
settings.additionaltimer.allow=Zusätzliche Anzeige in der Action Bar aktiviert
settings.additionaltimer.deny=Zusätzliche Anzeige in der Action Bar deaktiviert
settings.timer.allow=Timer wird angezeigt
settings.timer.deny=Timer wird nicht angezeigt
settings.resettime.text=Resetzeit
arena.name.invalid=Ungültiger Arenaname. Erlaubt sind Buchstaben, Zahlen und der Unterstrich arena.name.invalid=Ungültiger Arenaname. Erlaubt sind Buchstaben, Zahlen und der Unterstrich
arena.name.exists=Eine Arena mit diesem Namen existiert bereits arena.name.exists=Eine Arena mit diesem Namen existiert bereits
arena.width.klein=Klein arena.width.klein=Klein
@ -20,6 +34,8 @@ arena.delete.success=Die {0}-Arena {1} wurde gelöscht.
arena.delete.noarena=Hier befindet sich keine {0}-Arena. arena.delete.noarena=Hier befindet sich keine {0}-Arena.
arena.common.noarena=Hier befindet sich keine Arena. arena.common.noarena=Hier befindet sich keine Arena.
arena.common.toofaraway=Du hast dich zu weit von der Arena entfernt. Das Spiel wurde abgebrochen.
arena.common.groupleadertoofaraway=Der Ersteller der Gruppe hat sich zu weit von der Arena entfernt. Das Spiel wurde abgebrochen.
arena.list.created=Angelegte {0}-Arenen arena.list.created=Angelegte {0}-Arenen
arena.list.none=(keine) arena.list.none=(keine)
@ -56,4 +72,6 @@ group.invite.deny=Ablehnen
group.dismantle.nopermission=Du bist nicht berechtigt deine Gruppe aufzulösen. group.dismantle.nopermission=Du bist nicht berechtigt deine Gruppe aufzulösen.
group.dismantle.yourgroup=Die Gruppe in der du dich befindest wurde aufgelöst. group.dismantle.yourgroup=Die Gruppe in der du dich befindest wurde aufgelöst.
group.game.nopermission=Nur der Ersteller der Gruppe kann eine neue Runde starten! group.game.nopermission=Nur der Ersteller der Gruppe kann eine neue Runde starten!
group.creator.removed=Die Gruppe wurde aufgelöst, da die Person, welche die Gruppe erstellt hat, aus der Gruppe entfernt wurde.
group.dismantled.alone=Die Gruppe wurde aufgelöst, da du nur noch alleine in der Gruppe bist.

18
src/main/resources/lang/en_US.properties
View file

@ -3,6 +3,19 @@ minecleaner.info.developer=Developed by
minecleaner.info.website=Website minecleaner.info.website=Website
minecleaner.info.license=License minecleaner.info.license=License
minecleaner.common.hours=hours
minecleaner.common.minutes=minutes
minecleaner.common.seconds=seconds
minecleaner.common.and=and
settings.manualreset.allow=Manual reset activated
settings.manualreset.deny=Manual reset deactivated
settings.additionaltimer.allow=Additional display activated in the action bar
settings.additionaltimer.deny=Additional display deactivated in the action bar
settings.timer.allow=Timer is displayed
settings.timer.deny=Timer is not displayed
settings.resettime.text=reset time
arena.name.invalid=Invalid arena name. Allowed are letters, numbers and the underscore arena.name.invalid=Invalid arena name. Allowed are letters, numbers and the underscore
arena.name.exists=An arena with this name already exists arena.name.exists=An arena with this name already exists
arena.width.klein=Small arena.width.klein=Small
@ -20,7 +33,8 @@ arena.delete.success=The {0}-arena {1} has been deleted.
arena.delete.noarena=There is no {0}-arena here. arena.delete.noarena=There is no {0}-arena here.
arena.common.noarena=There is no arena here. arena.common.noarena=There is no arena here.
arena.common.toofaraway=You have moved too far away from the arena. The match has been abandoned.
arena.common.groupleadertoofaraway=The creator of the group has moved too far away from the arena. The match has been abandoned.
arena.list.created=Created {0} arenas arena.list.created=Created {0} arenas
arena.list.none=(none) arena.list.none=(none)
@ -58,3 +72,5 @@ group.dismantle.nopermission=You are not authorized to dissolve your group.
group.dismantle.yourgroup=The group you are in has been disbanded. group.dismantle.yourgroup=The group you are in has been disbanded.
group.game.nopermission=Only the creator of the group can start a new round! group.game.nopermission=Only the creator of the group can start a new round!
group.creator.removed=The group has been dissolved because the person who created the group has been removed from the group.
group.dismantled.alone=The group has been dissolved as you are now only alone in the group.