Merge branch 'master' into qodana-automation-460659264

Author: Skullians

Diff for: .github/workflows/build.yml

@@ -5,6 +5,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import me.lucko.helper.internal.LoaderUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
@@ -26,8 +27,6 @@ public class Config {
             .build();
 
     private static Config instance;
-    @Setter
-    private static File cachedDataFolder;
 
     public record EmbedDisplay(
             String single,
@@ -750,20 +749,16 @@ public record Debug(
     @Comment("\nDebug configurations (useful for bug diagnosis)")
     Debug debug = new Debug(false, false);
 
-    static {
-        cachedDataFolder = Objects.requireNonNull(Bukkit.getPluginManager().getPlugin("MultiChatDiscordSrvAddon")).getDataFolder();
-    }
-
     public static Config i() {
-        return Objects.requireNonNullElseGet(instance, () -> YamlConfigurations.update(new File(cachedDataFolder, "config.yml").toPath(), Config.class, properties));
+        if (instance != null) return instance;
+        return instance = YamlConfigurations.update(new File(LoaderUtils.getPlugin().getDataFolder(), "config.yml").toPath(), Config.class, properties);
     }
 
     public void saveConfig() {
-        YamlConfigurations.save(new File(cachedDataFolder, "config.yml").toPath(), Config.class, this, properties);
+        YamlConfigurations.save(new File(LoaderUtils.getPlugin().getDataFolder(), "config.yml").toPath(), Config.class, this, properties);
     }
 
-    public void reload(File dataFolder) {
-        cachedDataFolder = dataFolder;
-        instance = YamlConfigurations.load(new File(dataFolder, "config.yml").toPath(), Config.class, properties);
+    public void reload() {
+        instance = YamlConfigurations.load(new File(LoaderUtils.getPlugin().getDataFolder(), "config.yml").toPath(), Config.class, properties);
     }
 }

Diff for: abstraction/src/main/java/com/loohp/multichatdiscordsrvaddon/config/Config.java

@@ -20,20 +20,22 @@
 
 package com.loohp.multichatdiscordsrvaddon.objectholders;
 
+import lombok.Getter;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 
 import java.util.Optional;
 
+@Getter
 public class PaintingVariant {
 
-    private static Optional<Component> getLegacyPaintingTitle(Key key) {
-        return Optional.of(Component.translatable("painting." + key.namespace() + "." + key.value() + ".title").color(NamedTextColor.YELLOW));
+    private static Component getLegacyPaintingTitle(Key key) {
+        return Component.translatable("painting." + key.namespace() + "." + key.value() + ".title").color(NamedTextColor.YELLOW);
     }
 
-    private static Optional<Component> getLegacyPaintingAuthor(Key key) {
-        return Optional.of(Component.translatable("painting." + key.namespace() + "." + key.value() + ".author").color(NamedTextColor.GRAY));
+    private static Component getLegacyPaintingAuthor(Key key) {
+        return Component.translatable("painting." + key.namespace() + "." + key.value() + ".author").color(NamedTextColor.GRAY);
     }
 
     private final Key key;
@@ -42,10 +44,10 @@ private static Optional<Component> getLegacyPaintingAuthor(Key key) {
     private final int blockWidth;
     private final int blockHeight;
 
-    private final Optional<Component> title;
-    private final Optional<Component> author;
+    private final Component title;
+    private final Component author;
 
-    public PaintingVariant(Key key, int offsetX, int offsetY, int blockWidth, int blockHeight, Optional<Component> title, Optional<Component> author) {
+    public PaintingVariant(Key key, int offsetX, int offsetY, int blockWidth, int blockHeight, Component title, Component author) {
         this.key = key;
         this.offsetX = offsetX;
         this.offsetY = offsetY;
@@ -55,7 +57,7 @@ public PaintingVariant(Key key, int offsetX, int offsetY, int blockWidth, int bl
         this.author = author;
     }
 
-    public PaintingVariant(Key key, int blockWidth, int blockHeight, Optional<Component> title, Optional<Component> author) {
+    public PaintingVariant(Key key, int blockWidth, int blockHeight, Component title, Component author) {
         this(key, 0, 0, blockWidth, blockHeight, title, author);
     }
 
@@ -66,40 +68,4 @@ public PaintingVariant(Key key, int offsetX, int offsetY, int blockWidth, int bl
     public PaintingVariant(Key key, int blockWidth, int blockHeight) {
         this(key, blockWidth, blockHeight, getLegacyPaintingTitle(key), getLegacyPaintingAuthor(key));
     }
-
-    public Key getKey() {
-        return key;
-    }
-
-    public int getOffsetX() {
-        return offsetX;
-    }
-
-    public int getOffsetY() {
-        return offsetY;
-    }
-
-    public int getPixelWidth() {
-        return blockWidth * 16;
-    }
-
-    public int getPixelHeight() {
-        return blockHeight * 16;
-    }
-
-    public int getBlockWidth() {
-        return blockWidth;
-    }
-
-    public int getBlockHeight() {
-        return blockHeight;
-    }
-
-    public Optional<Component> getTitle() {
-        return title;
-    }
-
-    public Optional<Component> getAuthor() {
-        return author;
-    }
 }

Diff for: abstraction/src/main/java/com/loohp/multichatdiscordsrvaddon/objectholders/PaintingVariant.java

@@ -27,8 +27,6 @@
 import com.loohp.multichatdiscordsrvaddon.integration.IntegrationManager;
 import com.loohp.multichatdiscordsrvaddon.objectholders.*;
 import com.loohp.multichatdiscordsrvaddon.registry.MultiChatRegistry;
-import com.loohp.multichatdiscordsrvaddon.utils.MCVersion;
-import com.loohp.multichatdiscordsrvaddon.utils.VersionManager;
 import com.loohp.multichatdiscordsrvaddon.utils.*;
 import me.lucko.helper.plugin.ExtendedJavaPlugin;
 import net.kyori.adventure.text.Component;
@@ -196,8 +194,6 @@ public void enable() {
 
         AssetsDownloader.loadLibraries(getDataFolder());
 
-        Config.setCachedDataFolder(getDataFolder());
-
         long itemDisplayTimeout = Config.i().getSettings().timeout() * 60L * 1000L;
         itemDisplay = new ConcurrentCacheHashMap<>(itemDisplayTimeout, 60000);
         inventoryDisplay = new ConcurrentCacheHashMap<>(itemDisplayTimeout, 60000);
@@ -317,11 +313,11 @@ private void cachePlayerSkin(OfflinePlayer player) {
     @Override
     public void disable() {
         DiscordInteractionEvents.unregisterAll();
-        modelRenderer.close();
-        mediaReadingService.shutdown();
-        if (resourceManager != null) {
-            resourceManager.close();
-        }
+
+        if (modelRenderer != null) modelRenderer.close();
+        if (mediaReadingService != null) mediaReadingService.shutdown();
+        if (resourceManager != null) resourceManager.close();
+
         ChatUtils.sendMessage("<red>MultiChat DiscordSRV Addon has been disabled.", Bukkit.getConsoleSender());
     }
 

Diff for: common/src/main/java/com/loohp/multichatdiscordsrvaddon/MultiChatDiscordSrvAddon.java

@@ -20,6 +20,8 @@
 
 package com.loohp.multichatdiscordsrvaddon.api.events;
 
+import lombok.Getter;
+import lombok.Setter;
 import net.kyori.adventure.text.Component;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.inventory.Inventory;
@@ -36,15 +38,17 @@
  *
  * @author LOOHP
  */
+@Getter
+@Setter
 public class GameMessageProcessItemEvent extends GameMessageProcessEvent {
 
     private ItemStack itemstack;
-    private Optional<Inventory> inventory;
+    private Inventory inventory;
 
     public GameMessageProcessItemEvent(OfflinePlayer sender, String title, Component component, boolean cancel, int processId, ItemStack itemstack, Inventory inventory) {
         super(sender, title, component, cancel, processId);
         this.itemstack = itemstack;
-        this.inventory = Optional.ofNullable(inventory);
+        this.inventory = inventory;
     }
 
     public GameMessageProcessItemEvent(OfflinePlayer sender, String title, Component component, boolean cancel, int processId, ItemStack itemstack) {
@@ -60,15 +64,7 @@ public void setItemStack(ItemStack itemstack) {
     }
 
     public boolean hasInventory() {
-        return inventory.isPresent();
-    }
-
-    public Inventory getInventory() {
-        return inventory.orElse(null);
-    }
-
-    public void setInventory(Inventory inventory) {
-        this.inventory = Optional.ofNullable(inventory);
+        return inventory != null;
     }
 
 }

Diff for: common/src/main/java/com/loohp/multichatdiscordsrvaddon/api/events/GameMessageProcessItemEvent.java

@@ -13,11 +13,10 @@
 
 public class CommandHandler {
 
-    private final LegacyPaperCommandManager<CommandSender> manager;
     private final AnnotationParser<CommandSender> parser;
 
     public CommandHandler() {
-        this.manager = LegacyPaperCommandManager.createNative(
+        LegacyPaperCommandManager<CommandSender> manager = LegacyPaperCommandManager.createNative(
                 MultiChatDiscordSrvAddon.plugin,
                 ExecutionCoordinator.asyncCoordinator()
         );
@@ -27,10 +26,10 @@ public CommandHandler() {
         // Natively, brigadier is non-blocking (async) and therefore there is no need to register async completions.
         // This is a simple elif statement to check if the server supports brigadier, and if it does, register it, which will support non-blocking completions.
         // If not, check if the server can support asynchronous completions, and if it does, register it.
-        if (this.manager.hasCapability(CloudBukkitCapabilities.NATIVE_BRIGADIER)) {
-            this.manager.registerBrigadier();
-        } else if (this.manager.hasCapability(CloudBukkitCapabilities.ASYNCHRONOUS_COMPLETION)) {
-            this.manager.registerAsynchronousCompletions();
+        if (manager.hasCapability(CloudBukkitCapabilities.NATIVE_BRIGADIER)) {
+            manager.registerBrigadier();
+        } else if (manager.hasCapability(CloudBukkitCapabilities.ASYNCHRONOUS_COMPLETION)) {
+            manager.registerAsynchronousCompletions();
         }
 
         this.parser = new AnnotationParser<>(

Diff for: common/src/main/java/com/loohp/multichatdiscordsrvaddon/command/CommandHandler.java

@@ -130,8 +130,6 @@ public class BlockModelRenderer extends JFrame {
     public static final Pattern COLOR_HEX_PATTERN = Pattern.compile("^#[0-9a-fA-F]{6}$");
 
     private String title;
-    private BufferedImage image;
-    private Icon icon;
 
     private JTextField textFieldResourceKey;
     private JSpinner spinnerWidth;
@@ -180,8 +178,6 @@ public class BlockModelRenderer extends JFrame {
 
     public BlockModelRenderer(String title, BufferedImage image, Icon icon) throws IllegalAccessException {
         this.title = title;
-        this.image = image;
-        this.icon = icon;
         this.resourceManager = null;
         $$$setupUI$$$();
         this.modelRenderer = new ModelRenderer(() -> 8, () -> (int) spinnerThreads.getValue());
@@ -570,7 +566,6 @@ public void loadResources() {
 
             List<String> resourceOrder;
             int valuePerPack;
-            Config.setCachedDataFolder(Paths.get("MultiChatDiscordSrvAddon").toFile());
             resourceOrder = Config.i().getResources().order();
             Collections.reverse(resourceOrder);
             valuePerPack = (int) ((1.0 / (double) (resourceOrder.size() + 1)) * 10000);

Diff for: common/src/main/java/com/loohp/multichatdiscordsrvaddon/main/BlockModelRenderer.java

@@ -113,8 +113,6 @@ public class MinecraftFontRenderer extends JFrame {
     private static final URLClassLoaderAccess LOADER_ACCESS = URLClassLoaderAccess.create((URLClassLoader) GUIMain.class.getClassLoader());
 
     private String title;
-    private BufferedImage image;
-    private Icon icon;
 
     private JTextArea textAreaInput;
     private JTextArea textAreaResources;
@@ -129,7 +127,6 @@ public class MinecraftFontRenderer extends JFrame {
     private JTextField backgroundColorTextField;
     private JComboBox<LanguageData> comboBoxLanguages;
     private JButton buttonDownloadLanguages;
-    private JScrollPane scrollPaneTextInput;
     private JCheckBox glowingTextBox;
     private JSpinner defaultPackVersionSpinner;
 
@@ -147,8 +144,6 @@ public class MinecraftFontRenderer extends JFrame {
 
     public MinecraftFontRenderer(String title, BufferedImage image, Icon icon) {
         this.title = title;
-        this.image = image;
-        this.icon = icon;
         this.resourceManager = null;
         this.renderedImage = new AtomicReference<>();
         this.renderingComponents = new AtomicReference<>();
@@ -716,7 +711,7 @@ private List<LanguageData> getAllLanguageData(LanguageManager languageManager) {
         buttonDownloadLanguages = new JButton();
         buttonDownloadLanguages.setText("Download All Languages");
         panel.add(buttonDownloadLanguages, new GridConstraints(4, 8, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
-        scrollPaneTextInput = new JScrollPane();
+        JScrollPane scrollPaneTextInput = new JScrollPane();
         panel.add(scrollPaneTextInput, new GridConstraints(1, 0, 3, 14, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
         textAreaInput = new JTextArea();
         textAreaInput.setColumns(0);

Diff for: common/src/main/java/com/loohp/multichatdiscordsrvaddon/main/MinecraftFontRenderer.java

@@ -20,6 +20,7 @@
 
 package com.loohp.multichatdiscordsrvaddon.objectholders;
 
+import lombok.Getter;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
@@ -41,6 +42,8 @@
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 
+@Getter
+@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
 public class CharacterData {
 
     public static ValuePairs<String, List<CharObjectPair<CharacterData>>> fromComponent(Component component, UnaryOperator<String> shaper) {
@@ -107,20 +110,4 @@ public CharacterData(Key font, int color, OptionalInt shadowColor, List<TextDeco
         this.decorations = decorations;
     }
 
-    public Key getFont() {
-        return font;
-    }
-
-    public int getColor() {
-        return color;
-    }
-
-    public OptionalInt getShadowColor() {
-        return shadowColor;
-    }
-
-    public List<TextDecoration> getDecorations() {
-        return decorations;
-    }
-
 }

Diff for: common/src/main/java/com/loohp/multichatdiscordsrvaddon/objectholders/CharacterData.java

@@ -33,12 +33,10 @@
 public class ICPlayerEquipment implements EntityEquipment {
 
     private final Map<EquipmentSlot, Float> dropChance;
-    private final OfflinePlayer parent;
     private final OfflinePlayerData data;
 
     public ICPlayerEquipment(OfflinePlayer parent, OfflinePlayerData data) {
         this.dropChance = new EnumMap<>(EquipmentSlot.class);
-        this.parent = parent;
         this.data = data;
         resetChances();
     }