Update to v1.9.2 (#143)

Author: gmitch215

.github/workflows/build.yml

@@ -47,23 +47,60 @@ jobs:
       - name: Gradle Test
         run: ./gradlew test
 
+  test-server:
+    runs-on: ubuntu-latest
+    timeout-minutes: 360
+    needs: test
+
+    strategy:
+      fail-fast: false
+      matrix:
+        version: [ 1.16.5, 1.15.2, 1.14.4, 1.13.2, 1.12.2, 1.11.2, 1.10.2, 1.9.4, 1.8.8 ]
+        java-version: [ 8 ]
+        include:
+          - version: 1.19.4
+            java-version: 17
+          - version: 1.20.4
+            java-version: 17
+
+    name: Test Plugin on MC ${{ matrix.version }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java-version }}
+          distribution: 'temurin'
+          cache: 'gradle'
+      - name: Change Permissions
+        run: chmod +x ./gradlew
+      - name: Build Plugin
+        run: ./gradlew clean assemble
+      - name: Test Plugin - ${{ matrix.version }}
+        uses: GamerCoder215/TestMC@v1.0.1
+        with:
+          path: 'plugin/build/libs/novaconomy-*.jar'
+          runtime: 'paper'
+          version: ${{ matrix.version }}
+          time: 120
+
   build:
     runs-on: ubuntu-latest
     needs: setup
     timeout-minutes: 30
 
     strategy:
+      fail-fast: false
       matrix:
-        java-version: [17, 18, 19]
-        java-vendor: [temurin, zulu]
+        java-version: [8, 11, 16, 17]
 
-    name: Build Java ${{ matrix.java-version }}-${{ matrix.java-vendor }}
+    name: Build Java ${{ matrix.java-version }}
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v4
         with:
-          distribution: ${{ matrix.java-vendor }}
+          distribution: 'temurin'
           java-version: ${{ matrix.java-version }}
           cache: 'gradle'
       - name: Change Permissions

README.md

@@ -71,6 +71,21 @@ Novaconomy is an economy plugin with so many features, you'll never need another
   - Fix Essentials-related Integration Issues
   - Fix Additional 1.20.3+ Issues
 
+- **v1.9.2** 
+  - **Player Language Override**
+    - Players can specify their own language
+    - Uses currently supported Languages
+    - **Not all messages can be used this way**. Some GUI-related items will use the global language.
+  - **Corporation & Business Mail**
+    - Corporations and Businesses can now receive mail messages from players.
+    - Use Book & Quill to write to them.
+    - Read Wiki for more information.
+  - Update to Gradle 8.7
+  - Update Lamp to v3.2.1
+  - Fix Java 8 Support
+  - Improve Testing Capabilities
+  - Minor Code Optimization
+
 ### 💸 1.8.0 Update: Ecstatic Economy
 - New Features
   - **Unlimited Business Products**

abstraction/src/main/java/us/teaminceptus/novaconomy/abstraction/CommandWrapper.java

@@ -122,6 +122,10 @@ public final Class<?> getClass(String key) {
         return null;
     }
 
+    public void cancel() { set("cancelled", true); }
+
+    public boolean isCancelled() { return getBoolean("cancelled"); }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

abstraction/src/main/java/us/teaminceptus/novaconomy/abstraction/NBTWrapper.java

@@ -55,6 +55,8 @@ default int getCommandVersion() {
 
     void sendSign(Player p, Consumer<String[]> lines);
 
+    void openBook(Player p, ItemStack book);
+
     // Defaults
 
     default List<Material> getCrops() {

abstraction/src/main/java/us/teaminceptus/novaconomy/abstraction/Wrapper.java

@@ -64,4 +64,7 @@ public void removePacketInjector(Player p) {}
     @Override
     public void sendSign(Player p, Consumer<String[]> lines) {}
 
+    @Override
+    public void openBook(Player p, ItemStack book) {}
+
 }

abstraction/src/main/java/us/teaminceptus/novaconomy/abstraction/test/TestWrapper.java

@@ -18,22 +18,22 @@ class BukkitMessageHandler implements MessageHandler {
 
     @Override
     public void send(CommandSender sender, String key, Object... args) {
-        sendRaw(sender, format(get(key), args));
+        sendRaw(sender, format(sender, get(sender, key), args));
     }
 
     @Override
     public void sendMessage(CommandSender sender, String key, Object... args) {
-        sendRawMessage(sender, format(get(key), args));
+        sendRawMessage(sender, format(sender, get(sender, key), args));
     }
 
     @Override
     public void sendError(CommandSender sender, String key, Object... args) {
-        sendRawMessage(sender, ChatColor.RED + format(get(key), args));
+        sendRawMessage(sender, ChatColor.RED + format(sender, get(sender, key), args));
     }
 
     @Override
     public void sendSuccess(CommandSender sender, String key, Object... args) {
-        sendRawMessage(sender, ChatColor.GREEN + format(get(key), args));
+        sendRawMessage(sender, ChatColor.GREEN + format(sender, get(sender, key), args));
     }
 
     @Override

abstraction/src/main/java/us/teaminceptus/novaconomy/messages/BukkitMessageHandler.java

@@ -10,6 +10,7 @@
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.permissions.ServerOperator;
 import org.bukkit.plugin.Plugin;
 import us.teaminceptus.novaconomy.api.Language;
 import us.teaminceptus.novaconomy.api.NovaConfig;
@@ -125,8 +126,8 @@ static <T> Supplier<String> any(Supplier<T[]> array, Function<T, String> toStrin
             .put("error.argument.icon", any(Material::values, Material::toString, w::isItem))
             .put("error.argument.integer", r::nextInt)
             .put("error.argument.item", any(Material::values, Material::toString, w::isItem))
-            .put("error.argument.scale", () -> r.nextInt(10, 30) / 10.0)
-            .put("error.argument.symbol", () -> "'" + (char) r.nextInt(0x21, 0x7E) + "'")
+            .put("error.argument.scale", () -> r.nextInt(20) / 10.0)
+            .put("error.argument.symbol", () -> "'" + (char) (r.nextInt(0x7E - 0x21) + 0x21) + "'")
 
             .build()
             .entrySet()
@@ -140,17 +141,39 @@ static String prefix() {
         return get("plugin.prefix");
     }
 
+    static String prefix(ServerOperator sender) {
+        return get(sender, "plugin.prefix");
+    }
+
     static String get(String key) {
         return Language.getCurrentMessage(key);
     }
 
+    static String get(ServerOperator sender, String key) {
+        if (!(sender instanceof Player)) return get(key);
+        Player p = (Player) sender;
+        NovaPlayer np = new NovaPlayer(p);
+
+        return np.getLanguage().getMessage(key);
+    }
+
     static String format(String format, Object... args) {
         if (args.length == 0) return format;
 
         return String.format(Language.getCurrentLocale(), format, args)
                 .replace("\u00a0", " "); // Replace non-breaking space with regular space
     }
 
+    static String format(ServerOperator sender, String format, Object... args) {
+        if (!(sender instanceof Player)) return format(format, args);
+
+        Player p = (Player) sender;
+        NovaPlayer np = new NovaPlayer(p);
+
+        return String.format(np.getLanguage().getLocale(), format, args)
+                .replace("\u00a0", " "); // Replace non-breaking space with regular space
+    }
+
     // Fetching
 
     static MessageHandler getMessageHandler() {

abstraction/src/main/java/us/teaminceptus/novaconomy/messages/MessageHandler.java

@@ -77,7 +77,7 @@ private static void map(CommandSender sender, List<BaseComponent> components, St
         if (!advancedText(sender)) return;
 
         if (MessageHandler.ERROR_EXAMPLES.containsKey(key)) {
-            BaseComponent[] example = TextComponent.fromLegacyText(EXAMPLE_COLORS[r.nextInt(EXAMPLE_COLORS.length)] + format(get("constants.example"), ChatColor.GOLD + MessageHandler.ERROR_EXAMPLES.get(key).get()));
+            BaseComponent[] example = TextComponent.fromLegacyText(EXAMPLE_COLORS[r.nextInt(EXAMPLE_COLORS.length)] + format(sender, get(sender, "constants.example"), ChatColor.GOLD + MessageHandler.ERROR_EXAMPLES.get(key).get()));
             HoverEvent hover = new HoverEvent(HoverEvent.Action.SHOW_TEXT, example);
 
             components.forEach(c -> c.setHoverEvent(hover));
@@ -86,15 +86,15 @@ private static void map(CommandSender sender, List<BaseComponent> components, St
 
     @Override
     public void send(CommandSender sender, String key, Object... args) {
-        List<BaseComponent> message = new ArrayList<>(Arrays.asList(TextComponent.fromLegacyText(format(get(key), args))));
+        List<BaseComponent> message = new ArrayList<>(Arrays.asList(TextComponent.fromLegacyText(format(sender, get(sender, key), args))));
         map(sender, message, key);
 
         sendComponents(sender, message);
     }
 
     @Override
     public void sendMessage(CommandSender sender, String key, Object... args) {
-        List<BaseComponent> message = new ArrayList<>(Arrays.asList(TextComponent.fromLegacyText(format(get(key), args))));
+        List<BaseComponent> message = new ArrayList<>(Arrays.asList(TextComponent.fromLegacyText(format(sender, get(sender, key), args))));
         map(sender, message, key);
 
         message.add(0, prefix(sender));
@@ -104,7 +104,7 @@ public void sendMessage(CommandSender sender, String key, Object... args) {
 
     @Override
     public void sendError(CommandSender sender, String key, Object... args) {
-        List<BaseComponent> message = new ArrayList<>(Arrays.asList(TextComponent.fromLegacyText(ChatColor.RED + format(get(key), args))));
+        List<BaseComponent> message = new ArrayList<>(Arrays.asList(TextComponent.fromLegacyText(ChatColor.RED + format(sender, get(sender, key), args))));
         map(sender, message, key);
 
         message.add(0, prefix(sender));
@@ -114,7 +114,7 @@ public void sendError(CommandSender sender, String key, Object... args) {
 
     @Override
     public void sendSuccess(CommandSender sender, String key, Object... args) {
-        List<BaseComponent> message = new ArrayList<>(Arrays.asList(TextComponent.fromLegacyText(ChatColor.GREEN + format(get(key), args))));
+        List<BaseComponent> message = new ArrayList<>(Arrays.asList(TextComponent.fromLegacyText(ChatColor.GREEN + format(sender, get(sender, key), args))));
         map(sender, message, key);
 
         message.add(0, prefix(sender));

abstraction/src/main/java/us/teaminceptus/novaconomy/messages/SpigotMessageHandler.java

@@ -0,0 +1,89 @@
+package us.teaminceptus.novaconomy.scheduler;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import java.util.function.Consumer;
+
+public final class BukkitScheduler implements NovaScheduler {
+
+    private Plugin plugin;
+
+    public BukkitScheduler(Plugin plugin) {
+        this.plugin = plugin;
+        plugin.getLogger().info("Using BukkitScheduler");
+    }
+
+    @Override
+    public void teleport(Entity en, Location l) {
+        en.teleport(l);
+    }
+
+    @Override
+    public void syncContext(Consumer<NovaTask> consumer) {
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                consumer.accept(this::cancel);
+            }
+        }.runTask(plugin);
+    }
+
+    @Override
+    public void asyncContext(Consumer<NovaTask> consumer) {
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                consumer.accept(this::cancel);
+            }
+        }.runTaskAsynchronously(plugin);
+    }
+
+    @Override
+    public void syncLaterContext(Consumer<NovaTask> consumer, long delay) {
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                consumer.accept(this::cancel);
+            }
+        }.runTaskLater(plugin, delay);
+    }
+
+    @Override
+    public void asyncLaterContext(Consumer<NovaTask> consumer, long delay) {
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                consumer.accept(this::cancel);
+            }
+        }.runTaskLaterAsynchronously(plugin, delay);
+    }
+
+    @Override
+    public void syncRepeatingContext(Consumer<NovaTask> consumer, long delay, long period) {
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                consumer.accept(this::cancel);
+            }
+        }.runTaskTimer(plugin, delay, period);
+    }
+
+    @Override
+    public void asyncRepeatingContext(Consumer<NovaTask> consumer, long delay, long period) {
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                consumer.accept(this::cancel);
+            }
+        }.runTaskTimerAsynchronously(plugin, delay, period);
+    }
+
+    @Override
+    public void cancelAll() {
+        Bukkit.getScheduler().cancelTasks(plugin);
+    }
+}