v1.0.5 - 1.16, lang.yml, and more

adabugra · Feb 2, 2021 · 275248f · 275248f
1 parent 267532a
commit 275248f
Show file tree

Hide file tree

Showing 31 changed files with 577 additions and 199 deletions.
diff --git a/arenaregen/build.gradle b/arenaregen/build.gradle
@@ -19,13 +19,14 @@ processResources {
 dependencies {
     compile 'org.projectlombok:lombok:1.16.20'
     compile 'org.spigotmc:spigot-api:1.13-R0.1-SNAPSHOT'
-    compile 'com.github.RealizedMC.Duels:duels-api:3.3.0'
+    compile 'com.github.Realizedd.Duels:duels-api:3.4.1'
     compile project(':nms')
     compile project(':v1_8_R3')
     compile project(':v1_8_R3_paper')
     compile project(':v1_12_R1')
     compile project(':v1_14_R1')
     compile project(':v1_15_R1')
+    compile project(':v1_16_R3')
 }
 
 shadowJar {
@@ -38,6 +39,7 @@ shadowJar {
         include(dependency(':v1_12_R1'))
         include(dependency(':v1_14_R1'))
         include(dependency(':v1_15_R1'))
+        include(dependency(':v1_16_R3'))
     }
 }
 

diff --git a/arenaregen/src/main/java/me/realized/de/arenaregen/ArenaRegen.java b/arenaregen/src/main/java/me/realized/de/arenaregen/ArenaRegen.java
@@ -3,8 +3,10 @@
 import lombok.Getter;
 import me.realized.de.arenaregen.command.ArenaregenCommand;
 import me.realized.de.arenaregen.config.Config;
+import me.realized.de.arenaregen.config.Lang;
 import me.realized.de.arenaregen.nms.NMS;
 import me.realized.de.arenaregen.nms.fallback.NMSHandler;
+import me.realized.de.arenaregen.selection.SelectionManager;
 import me.realized.de.arenaregen.util.CompatUtil;
 import me.realized.de.arenaregen.util.ReflectionUtil;
 import me.realized.de.arenaregen.zone.ResetZoneManager;
@@ -14,16 +16,19 @@ public class ArenaRegen extends DuelsExtension {
 
     @Getter
     private Config configuration;
-
+    @Getter
+    private Lang lang;
     @Getter
     private NMS handler;
-
+    @Getter
+    private SelectionManager selectionManager;
     @Getter
     private ResetZoneManager zoneManager;
 
     @Override
     public void onEnable() {
         this.configuration = new Config(this);
+        this.lang = new Lang(this);
 
         final String packageName = api.getServer().getClass().getPackage().getName();
         final String version = packageName.substring(packageName.lastIndexOf('.') + 1);
@@ -46,6 +51,7 @@ public void onEnable() {
 
         info("NMSHandler: Using " + handler.getClass().getName());
 
+        this.selectionManager = new SelectionManager(this, api);
         this.zoneManager = new ResetZoneManager(this, api);
         api.registerSubCommand("duels", new ArenaregenCommand(this, api));
     }
@@ -57,13 +63,17 @@ public void onDisable() {
 
     @Override
     public String getRequiredVersion() {
-        return "3.3.0";
+        return "3.4.1";
     }
 
     public void info(final String s) {
         api.info("[" + getName() + " Extension] " + s);
     }
 
+    public void error(final String s) {
+        api.error("[" + getName() + " Extension] " + s);
+    }
+
     public void error(final String s, final Throwable thrown) {
         api.error("[" + getName() + " Extension] " + s, thrown);
     }

diff --git a/arenaregen/src/main/java/me/realized/de/arenaregen/Lang.java b/arenaregen/src/main/java/me/realized/de/arenaregen/Lang.java
diff --git a/arenaregen/src/main/java/me/realized/de/arenaregen/command/ARCommand.java b/arenaregen/src/main/java/me/realized/de/arenaregen/command/ARCommand.java
@@ -2,6 +2,8 @@
 
 import lombok.Getter;
 import me.realized.de.arenaregen.ArenaRegen;
+import me.realized.de.arenaregen.config.Lang;
+import me.realized.de.arenaregen.selection.SelectionManager;
 import me.realized.de.arenaregen.zone.ResetZoneManager;
 import me.realized.duels.api.Duels;
 import me.realized.duels.api.arena.ArenaManager;
@@ -10,6 +12,8 @@
 public abstract class ARCommand {
 
     protected final ArenaManager arenaManager;
+    protected final Lang lang;
+    protected final SelectionManager selectionManager;
     protected final ResetZoneManager zoneManager;
 
     @Getter
@@ -25,6 +29,8 @@ public abstract class ARCommand {
 
     protected ARCommand(final ArenaRegen extension, final Duels api, final String name, final String usage, final String description, final int length, final boolean playerOnly) {
         this.arenaManager = api.getArenaManager();
+        this.lang = extension.getLang();
+        this.selectionManager = extension.getSelectionManager();
         this.zoneManager = extension.getZoneManager();
         this.name = name;
         this.usage = usage;

diff --git a/arenaregen/src/main/java/me/realized/de/arenaregen/command/ArenaregenCommand.java b/arenaregen/src/main/java/me/realized/de/arenaregen/command/ArenaregenCommand.java
@@ -3,22 +3,28 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import me.realized.de.arenaregen.ArenaRegen;
-import me.realized.de.arenaregen.Lang;
 import me.realized.de.arenaregen.command.commands.CreateCommand;
 import me.realized.de.arenaregen.command.commands.DeleteCommand;
 import me.realized.de.arenaregen.command.commands.ListCommand;
 import me.realized.de.arenaregen.command.commands.ResetCommand;
+import me.realized.de.arenaregen.config.Lang;
+import me.realized.de.arenaregen.util.StringUtil;
 import me.realized.duels.api.Duels;
 import me.realized.duels.api.command.SubCommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 public class ArenaregenCommand extends SubCommand {
 
+    private static final String PLAYER_ONLY_MESSAGE = "&cThis command is player only!";
+
+    private final Lang lang;
     private final Map<String, ARCommand> commands = new LinkedHashMap<>();
 
     public ArenaregenCommand(final ArenaRegen extension, final Duels api) {
         super("arenaregen", null, null, null, false, 1, "ar");
+        this.lang = extension.getLang();
+
         register(
             new CreateCommand(extension, api),
             new DeleteCommand(extension, api),
@@ -35,30 +41,30 @@ private void register(final ARCommand... commands) {
 
     @Override
     public void execute(final CommandSender sender, final String label, final String[] args) {
+        final String cmdName = label + " " + args[0];
+
         if (args.length == getLength()) {
-            Lang.HELP_HEADER.sendTo(sender);
-            commands.values().forEach(command -> Lang.HELP_FORMAT.sendTo(sender, label + " " + args[0] + " " + command.getUsage(), command.getDescription()));
-            Lang.HELP_FOOTER.sendTo(sender);
+            lang.sendMessage(sender, "COMMAND.arenaregen.usage", "command", cmdName);
             return;
         }
 
         final ARCommand command = commands.get(args[1].toLowerCase());
 
         if (command != null) {
             if (command.isPlayerOnly() && !(sender instanceof Player)) {
-                Lang.PLAYER_ONLY.sendTo(sender);
+                sender.sendMessage(StringUtil.color(PLAYER_ONLY_MESSAGE));
                 return;
             }
 
             if (args.length < command.getLength()) {
-                Lang.USAGE_FORMAT.sendTo(sender, label + " " + args[0] + " " + command.getUsage(), command.getDescription());
+                lang.sendMessage(sender, "COMMAND.sub-command-usage", "command", cmdName, "usage", command.getUsage(), "description", command.getDescription());
                 return;
             }
 
             command.execute(sender, label, args);
             return;
         }
 
-        Lang.INVALID_COMMAND.sendTo(sender, args[1], label + " " + args[0]);
+        lang.sendMessage(sender, "ERROR.invalid-sub-command", "argument", args[1], "command", cmdName);
     }
 }
diff --git a/arenaregen/src/main/java/me/realized/de/arenaregen/command/commands/CreateCommand.java b/arenaregen/src/main/java/me/realized/de/arenaregen/command/commands/CreateCommand.java
@@ -1,9 +1,8 @@
 package me.realized.de.arenaregen.command.commands;
 
 import me.realized.de.arenaregen.ArenaRegen;
-import me.realized.de.arenaregen.Lang;
 import me.realized.de.arenaregen.command.ARCommand;
-import me.realized.de.arenaregen.zone.ResetZoneManager.Selection;
+import me.realized.de.arenaregen.selection.Selection;
 import me.realized.duels.api.Duels;
 import me.realized.duels.api.arena.Arena;
 import org.apache.commons.lang.StringUtils;
@@ -22,23 +21,23 @@ public void execute(final CommandSender sender, final String label, final String
         final Arena arena = arenaManager.get(name);
 
         if (arena == null) {
-            Lang.ARENA_NOT_FOUND.sendTo(sender, name);
+            lang.sendMessage(sender, "ERROR.arena-not-found", "name", name);
             return;
         }
 
         final Player player = (Player) sender;
-        final Selection selection = zoneManager.get(player);
+        final Selection selection = selectionManager.get(player);
 
         if (selection == null || !selection.isSelected()) {
-            Lang.NO_SELECTION.sendTo(sender);
+            lang.sendMessage(sender, "ERROR.no-selection");
             return;
         }
 
         if (!zoneManager.create(arena, selection)) {
-            Lang.ALREADY_EXISTS.sendTo(sender, name);
+            lang.sendMessage(sender, "ERROR.already-exists", "name", name);
             return;
         }
 
-        Lang.CREATED.sendTo(sender, name);
+        lang.sendMessage(sender, "COMMAND.arenaregen.create", "name", name);
     }
 }
diff --git a/arenaregen/src/main/java/me/realized/de/arenaregen/command/commands/DeleteCommand.java b/arenaregen/src/main/java/me/realized/de/arenaregen/command/commands/DeleteCommand.java
@@ -1,7 +1,6 @@
 package me.realized.de.arenaregen.command.commands;
 
 import me.realized.de.arenaregen.ArenaRegen;
-import me.realized.de.arenaregen.Lang;
 import me.realized.de.arenaregen.command.ARCommand;
 import me.realized.duels.api.Duels;
 import me.realized.duels.api.arena.Arena;
@@ -20,15 +19,15 @@ public void execute(final CommandSender sender, final String label, final String
         final Arena arena = arenaManager.get(name);
 
         if (arena == null) {
-            Lang.ARENA_NOT_FOUND.sendTo(sender, name);
+            lang.sendMessage(sender, "ERROR.arena-not-found", "name", name);
             return;
         }
 
         if (!zoneManager.remove(name)) {
-            Lang.ZONE_NOT_FOUND.sendTo(sender, name);
+            lang.sendMessage(sender, "ERROR.zone-not-found", "name", name);
             return;
         }
 
-        Lang.DELETED.sendTo(sender, name);
+        lang.sendMessage(sender, "COMMAND.arenaregen.delete", "name", name);
     }
 }
diff --git a/arenaregen/src/main/java/me/realized/de/arenaregen/command/commands/ListCommand.java b/arenaregen/src/main/java/me/realized/de/arenaregen/command/commands/ListCommand.java
@@ -2,7 +2,6 @@
 
 import java.util.Collection;
 import me.realized.de.arenaregen.ArenaRegen;
-import me.realized.de.arenaregen.Lang;
 import me.realized.de.arenaregen.command.ARCommand;
 import me.realized.de.arenaregen.util.StringUtil;
 import me.realized.de.arenaregen.zone.ResetZone;
@@ -20,12 +19,13 @@ public void execute(final CommandSender sender, final String label, final String
         final Collection<ResetZone> zones = zoneManager.getZones();
 
         if (zones.isEmpty()) {
-            Lang.NO_ACTIVE_ZONES.sendTo(sender);
+            lang.sendMessage(sender, "ERROR.no-active-zones");
             return;
         }
 
-        Lang.LIST_HEADER.sendTo(sender);
-        zones.forEach(zone -> Lang.LIST_FORMAT.sendTo(sender, zone.getName(), StringUtil.from(zone.getMin()), StringUtil.from(zone.getMax()), zone.getTotalBlocks()));
-        Lang.LIST_FOOTER.sendTo(sender, zones.size());
+        lang.sendMessage(sender, "COMMAND.arenaregen.list.header");
+        zones.forEach(zone -> lang.sendMessage(sender, "COMMAND.arenaregen.list.format",
+            "name", zone.getName(), "min_pos", StringUtil.from(zone.getMin()), "max_pos", StringUtil.from(zone.getMax()), "blocks_count", zone.getTotalBlocks()));
+        lang.sendMessage(sender, "COMMAND.arenaregen.list.footer", "zones_count", zones.size());
     }
 }
diff --git a/arenaregen/src/main/java/me/realized/de/arenaregen/command/commands/ResetCommand.java b/arenaregen/src/main/java/me/realized/de/arenaregen/command/commands/ResetCommand.java
@@ -1,13 +1,13 @@
 package me.realized.de.arenaregen.command.commands;
 
 import me.realized.de.arenaregen.ArenaRegen;
-import me.realized.de.arenaregen.Lang;
 import me.realized.de.arenaregen.command.ARCommand;
 import me.realized.de.arenaregen.zone.ResetZone;
 import me.realized.duels.api.Duels;
 import me.realized.duels.api.arena.Arena;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 public class ResetCommand extends ARCommand {
 
@@ -21,18 +21,24 @@ public void execute(final CommandSender sender, final String label, final String
         final Arena arena = arenaManager.get(name);
 
         if (arena == null) {
-            Lang.ARENA_NOT_FOUND.sendTo(sender, name);
+            lang.sendMessage(sender, "ERROR.arena-not-found", "name", name);
             return;
         }
 
         final ResetZone zone = zoneManager.get(name);
 
         if (zone == null) {
-            Lang.ZONE_NOT_FOUND.sendTo(sender, name);
+            lang.sendMessage(sender, "ERROR.zone-not-found", "name", name);
             return;
         }
 
-        Lang.RESET_START.sendTo(sender, name);
-        zone.reset(() -> Lang.RESET_END.sendTo(sender, name));
+        lang.sendMessage(sender, "COMMAND.arenaregen.reset.start", "name", name);
+        zone.reset(() -> {
+            if (sender instanceof Player) {
+                zone.refreshChunks((Player) sender);
+            }
+
+            lang.sendMessage(sender, "COMMAND.arenaregen.reset.end", "name", name);
+        });
     }
 }
diff --git a/arenaregen/src/main/java/me/realized/de/arenaregen/config/Config.java b/arenaregen/src/main/java/me/realized/de/arenaregen/config/Config.java
@@ -20,6 +20,8 @@ public class Config {
     @Getter
     private final boolean preventBlockMelt;
     @Getter
+    private final boolean preventBlockExplode;
+    @Getter
     private final boolean preventFireSpread;
     @Getter
     private final boolean preventLeafDecay;
@@ -32,6 +34,7 @@ public Config(final ArenaRegen extension) {
         this.removeDroppedItems = config.getBoolean("remove-dropped-items", true);
         this.preventBlockBurn = config.getBoolean("prevent-block-burn", true);
         this.preventBlockMelt = config.getBoolean("prevent-block-melt", true);
+        this.preventBlockExplode = config.getBoolean("prevent-block-explode", true);
         this.preventFireSpread = config.getBoolean("prevent-fire-spread", true);
         this.preventLeafDecay = config.getBoolean("prevent-leaf-decay", true);
     }