Chore: Cleanup. Fix nullability issues, etc

TerraByteDev · Dec 23, 2024 · 97ae698 · 97ae698
1 parent 12ec0b4
commit 97ae698
Show file tree

Hide file tree

Showing 56 changed files with 573 additions and 315 deletions.
diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml
@@ -0,0 +1,24 @@
+name: Qodana
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  qodana:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+      checks: write
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2024.3
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,4 @@ Server/
 run/
 assets/data.sqlite3
 /tasks
+qodana.yaml
diff --git a/common/src/main/java/net/skullian/skyfactions/common/api/FactionAPI.java b/common/src/main/java/net/skullian/skyfactions/common/api/FactionAPI.java
@@ -98,9 +98,6 @@ public CompletableFuture<Faction> getFaction(String name) {
             if (ex != null || faction == null) return;
 
             factionCache.put(faction.getName(), faction);
-            for (SkyUser player : faction.getAllMembers()) {
-
-            }
             for (SkyUser player : faction.getAllMembers()) {
                 if (!player.isOnline()) return;
                 factionCache.put(faction.getName(), faction);

diff --git a/common/src/main/java/net/skullian/skyfactions/common/api/SoundAPI.java b/common/src/main/java/net/skullian/skyfactions/common/api/SoundAPI.java
@@ -19,11 +19,7 @@ public void playSound(SkyUser player, String identifier, float pitch, float volu
     public abstract void playSound(SkyLocation location, String identifier, float pitch, float volume);
 
     public Sound getSound(String identifier, float pitch, float volume) {
-        Sound sound = Sound.sound(Key.key(identifier), Sound.Source.MASTER, volume, pitch);
-        if (sound == null) {
-            SLogger.warn("Attempted to play a sound of {} when it returned null!", identifier);
-            return null;
-        } else return sound;
+        return Sound.sound(Key.key(identifier), Sound.Source.MASTER, volume, pitch);
     }
 
     public abstract void playMusic(SkyUser def, SkyUser att);

diff --git a/common/src/main/java/net/skullian/skyfactions/common/command/CommandTemplate.java b/common/src/main/java/net/skullian/skyfactions/common/command/CommandTemplate.java
@@ -1,5 +1,7 @@
 package net.skullian.skyfactions.common.command;
 
+import net.skullian.skyfactions.common.user.SkyUser;
+
 import java.util.List;
 
 public abstract class CommandTemplate {
@@ -14,4 +16,8 @@ public abstract class CommandTemplate {
 
     public abstract List<String> permission();
 
+    public boolean hasPermission(SkyUser player, boolean sendDeny) {
+        return CommandsUtility.hasPerm(player, permission(), sendDeny);
+    }
+
 }
diff --git a/common/src/main/java/net/skullian/skyfactions/common/command/discord/LinkCommand.java b/common/src/main/java/net/skullian/skyfactions/common/command/discord/LinkCommand.java
@@ -19,27 +19,30 @@ public class LinkCommand extends CommandTemplate {
     public void perform(
             SkyUser player
     ) {
-        if (!CommandsUtility.hasPerm(player, List.of("skyfactions.command.link", "skyfactions.discord"), true)) return;
+        if (!hasPermission(player, true)) return;
         String locale = SkyApi.getInstance().getPlayerAPI().getLocale(player.getUniqueId());
         DiscordModule module = (DiscordModule) SkyModules.DISCORD.getModule();
 
-        SkyApi.getInstance().getPlayerAPI().getPlayerData(player.getUniqueId()).whenComplete((data, ex) -> {
-            if (ex != null) {
-                ErrorUtil.handleError(player, "link your Discord", "SQL_GET_DISCORD", ex);
-            } else if (data.getDISCORD_ID() == null) {
-                module.createLinkCode(player).whenComplete((code, err) -> {
-                    if (err != null) {
-                        err.printStackTrace();
-                        return;
+        SkyApi.getInstance().getPlayerAPI().getPlayerData(player.getUniqueId())
+                .thenApplyAsync(data -> {
+                    if (data == null) return null;
+                        else if (!data.getDISCORD_ID().equalsIgnoreCase("none")) {
+
+                        String retrievedUser = module.getUsernameByID(data.getDISCORD_ID());
+                        Messages.DISCORD_ALREADY_LINKED.send(player, locale, "discord_name", retrievedUser);
                     }
 
+                    return module.createLinkCode(player);
+                })
+                .thenAcceptAsync(code -> {
+                    if (code == null) return;
+
                     Messages.DISCORD_LINK_PROMPT.send(player, locale, "code", code);
+                })
+                .exceptionally(ex -> {
+                    ErrorUtil.handleError(player, "link your Discord", "SQL_GET_DISCORD", ex);
+                    return null;
                 });
-            } else {
-                String retrievedUser = module.getUsernameByID(data.getDISCORD_ID());
-                Messages.DISCORD_ALREADY_LINKED.send(player, locale, "discord_name", retrievedUser);
-            }
-        });
     }
 
     @Override
@@ -64,6 +67,6 @@ public String getSyntax() {
 
     @Override
     public List<String> permission() {
-        return List.of("skyfactions.command.link");
+        return List.of("skyfactions.command.link", "skyfactions.discord");
     }
 }
diff --git a/common/src/main/java/net/skullian/skyfactions/common/command/discord/UnlinkCommand.java b/common/src/main/java/net/skullian/skyfactions/common/command/discord/UnlinkCommand.java
@@ -34,7 +34,6 @@ public void handleUnlink(
                 Messages.DISCORD_UNLINK_SUCCESS.send(player, locale);
             }
         });
-
     }
 
     @Override

diff --git a/common/src/main/java/net/skullian/skyfactions/common/config/ConfigFileHandler.java b/common/src/main/java/net/skullian/skyfactions/common/config/ConfigFileHandler.java
@@ -2,6 +2,7 @@
 
 import net.skullian.skyfactions.common.api.SkyApi;
 import net.skullian.skyfactions.common.config.types.*;
+import net.skullian.skyfactions.paper.event.defence.DefencePlacementHandler;
 
 import java.io.File;
 import java.util.HashMap;
@@ -11,6 +12,7 @@ public class ConfigFileHandler {
 
     private Map<ConfigTypes, ConfigHandler> configs = new HashMap<>();
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
     public void loadFiles() {
         String configPath = SkyApi.getInstance().getFileAPI().getConfigFolderPath();
         new File(configPath, "/schematics").mkdirs();

diff --git a/common/src/main/java/net/skullian/skyfactions/common/config/ConfigHandler.java b/common/src/main/java/net/skullian/skyfactions/common/config/ConfigHandler.java
@@ -12,6 +12,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Objects;
 
 public class ConfigHandler {
 
@@ -26,7 +27,7 @@ public ConfigHandler(String name) {
         this.file = new File(SkyApi.getInstance().getFileAPI().getConfigFolderPath(), this.name);
 
         try {
-            this.config = YamlDocument.create(this.file, ConfigHandler.class.getClassLoader().getResourceAsStream(this.name),
+            this.config = YamlDocument.create(this.file, Objects.requireNonNull(ConfigHandler.class.getClassLoader().getResourceAsStream(this.name)),
                     GeneralSettings.DEFAULT, LoaderSettings.builder().setAutoUpdate(true).build(), DumperSettings.DEFAULT, UpdaterSettings.builder().setVersioning(new BasicVersioning("CONFIG_VERSION")).build());
         } catch (IOException error) {
             SLogger.setup("----------------- CONFIGURATION EXCEPTION -----------------", true);

diff --git a/common/src/main/java/net/skullian/skyfactions/common/config/types/Messages.java b/common/src/main/java/net/skullian/skyfactions/common/config/types/Messages.java
@@ -265,29 +265,29 @@ public enum Messages {
     NOTIFICATION_FACTION_RANK_UPDATED_TITLE("Notifications.FACTION_RANK_UPDATED_TITLE"),
     NOTIFICATION_FACTION_RANK_UPDATED_DESCRIPTION("Notifications.FACTION_RANK_UPDATED_DESCRIPTION");
 
-    public static Map<String, YamlDocument> configs = new HashMap<>();
+    public static final Map<String, YamlDocument> configs = new HashMap<>();
     private final String path;
 
     Messages(String path) {
         this.path = path;
     }
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
     public static void load(boolean setup) {
         try {
             new File(SkyApi.getInstance().getFileAPI().getConfigFolderPath(), "/language").mkdirs();
             if (setup) SLogger.setup("Saving default language <#05eb2f>[English]<#4294ed>.", false);
                 else SLogger.info("Saving default language <#05eb2f>[English]<#4294ed>.");
 
-            YamlDocument doc = YamlDocument.create(new File(SkyApi.getInstance().getFileAPI().getConfigFolderPath() + "/language/en/en.yml"), Messages.class.getClassLoader().getResourceAsStream("language/en/en.yml"),
+            YamlDocument doc = YamlDocument.create(new File(SkyApi.getInstance().getFileAPI().getConfigFolderPath() + "/language/en/en.yml"), Objects.requireNonNull(Messages.class.getClassLoader().getResourceAsStream("language/en/en.yml")),
                     GeneralSettings.DEFAULT, LoaderSettings.builder().setAutoUpdate(true).build(), DumperSettings.DEFAULT, UpdaterSettings.builder().setVersioning(new BasicVersioning("CONFIG_VERSION")).build());
 
             configs.put("en", doc);
 
-
             File folder = new File(SkyApi.getInstance().getFileAPI().getConfigFolderPath(), "/language");
             if (!folder.exists() || !folder.isDirectory()) throw new Exception("Could not find the language folder. Please report this error ASAP.");
 
-            for (File dir : folder.listFiles()) {
+            for (File dir : Objects.requireNonNull(folder.listFiles())) {
 
                 if (dir.isDirectory()) {
                     if (setup) SLogger.setup("Registering Language: <#05eb2f>[{}]<#4294ed>", false, dir.getName());
@@ -300,6 +300,7 @@ public static void load(boolean setup) {
                     );
 
                     registerGUIs(dir, dir.getName());
+                    SkyApi.getInstance().getDefenceFactory().register(dir, dir.getName());
                 }
             }
         } catch (Exception exception) {
@@ -308,7 +309,7 @@ public static void load(boolean setup) {
             SLogger.setup("Please check that config for any configuration mistakes.", true);
             SLogger.setup("Plugin will now disable.", true);
             SLogger.setup("----------------- CONFIGURATION EXCEPTION -----------------", true);
-            exception.printStackTrace();
+            SLogger.fatal(exception);
             SkyApi.disablePlugin();
         }
 
@@ -317,7 +318,7 @@ public static void load(boolean setup) {
     private static void registerGUIs(File dir, String locale) throws IOException {
         Map<String, YamlDocument> docs = new HashMap<>();
         for (GUIEnums enumEntry : GUIEnums.values()) {
-            YamlDocument doc = YamlDocument.create(new File(dir,  "guis/" + enumEntry.getPath() + ".yml"), Messages.class.getClassLoader().getResourceAsStream(String.format("language/%s/%s.yml", locale, "guis/" + enumEntry.getPath())),
+            YamlDocument doc = YamlDocument.create(new File(dir,  "guis/" + enumEntry.getPath() + ".yml"), Objects.requireNonNull(Messages.class.getClassLoader().getResourceAsStream(String.format("language/%s/%s.yml", locale, "guis/" + enumEntry.getPath()))),
                     GeneralSettings.DEFAULT, LoaderSettings.builder().setAutoUpdate(true).build(), DumperSettings.DEFAULT, UpdaterSettings.builder().setVersioning(new BasicVersioning("CONFIG_VERSION")).build());
 
             docs.put(enumEntry.getPath(), doc);

diff --git a/common/src/main/java/net/skullian/skyfactions/common/database/DatabaseExecutionListener.java b/common/src/main/java/net/skullian/skyfactions/common/database/DatabaseExecutionListener.java
@@ -9,8 +9,9 @@
 
 public class DatabaseExecutionListener implements ExecuteListener {
     @Override
+    @SuppressWarnings("ConstantConditions")
     public void exception(ExecuteContext ctx) {
-        ErrorUtil.handleDatabaseError(ctx.exception());
+        if (ctx.exception() != null) ErrorUtil.handleDatabaseError(ctx.exception());
         SkyApi.getInstance().getDatabaseManager().closed = SkyApi.getInstance().getDatabaseManager().getDataSource().isClosed();
 
         new RuntimeException("Database is closed! Cannot allow player to join without risking dupes and unexpected functionalities. Kicking all online players.").printStackTrace();

diff --git a/common/src/main/java/net/skullian/skyfactions/common/database/cache/CacheService.java b/common/src/main/java/net/skullian/skyfactions/common/database/cache/CacheService.java
@@ -41,6 +41,7 @@ public CompletableFuture<Void> cacheOnce() {
 
                 String factionName = cachedFaction.getKey();
                 Faction faction = SkyApi.getInstance().getFactionAPI().getCachedFaction(factionName);
+                if (faction == null) continue;
 
                 int gemsModification = cachedFaction.getValue().getGems();
                 int runesModification = cachedFaction.getValue().getRunes();

diff --git a/common/src/main/java/net/skullian/skyfactions/common/defence/DefenceFactory.java b/common/src/main/java/net/skullian/skyfactions/common/defence/DefenceFactory.java
@@ -37,32 +37,37 @@ public abstract class DefenceFactory {
 
     private final List<String> cachedMaterials = new ArrayList<>();
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
     public void registerDefaultDefences() {
         new File(SkyApi.getInstance().getFileAPI().getConfigFolderPath() + "/language/en/defences").mkdirs();
 
         try {
-            URI defencesFolder = DefenceFactory.class.getResource("/language/en/defences").toURI();
-            FileSystem fileSystem = FileSystems.newFileSystem(defencesFolder, new HashMap());
-
-            for (Path yamlPath : fileSystem.getRootDirectories()) {
-                Stream<Path> stream = Files.list(yamlPath.resolve("/language/en/defences"));
-                stream.forEach(path -> {
-                    try {
-                        String fullPathName = path.getFileName().toString();
-                        String defenceName = fullPathName.substring(0, fullPathName.length() - 4);
-
-                        YamlDocument.create(new File(SkyApi.getInstance().getFileAPI().getConfigFolderPath() + "/language/en/defences/", defenceName + ".yml"), Objects.requireNonNull(DefenceFactory.class.getClassLoader().getResourceAsStream(String.format("language/en/defences/%s.yml", defenceName))),
-                                GeneralSettings.DEFAULT, LoaderSettings.builder().setAutoUpdate(true).build(), DumperSettings.DEFAULT, UpdaterSettings.builder().setVersioning(new BasicVersioning("CONFIG_VERSION")).build());
+            URI defencesFolder = Objects.requireNonNull(DefenceFactory.class.getResource("/language/en/defences")).toURI();
+            try (FileSystem fileSystem = FileSystems.newFileSystem(defencesFolder, new HashMap<>())) {
+                for (Path yamlPath : fileSystem.getRootDirectories()) {
+                    try (Stream<Path> stream = Files.list(yamlPath.resolve("/language/en/defences"))) {
+                        stream.forEach(path -> {
+                            try {
+                                String fullPathName = path.getFileName().toString();
+                                String defenceName = fullPathName.substring(0, fullPathName.length() - 4);
+
+                                YamlDocument.create(new File(SkyApi.getInstance().getFileAPI().getConfigFolderPath() + "/language/en/defences/", defenceName + ".yml"), Objects.requireNonNull(DefenceFactory.class.getClassLoader().getResourceAsStream(String.format("language/en/defences/%s.yml", defenceName))),
+                                        GeneralSettings.DEFAULT, LoaderSettings.builder().setAutoUpdate(true).build(), DumperSettings.DEFAULT, UpdaterSettings.builder().setVersioning(new BasicVersioning("CONFIG_VERSION")).build());
+                            } catch (IOException error) {
+                                handleError(error);
+                            }
+                        });
                     } catch (IOException error) {
                         handleError(error);
                     }
-                });
+                }
             }
         } catch (URISyntaxException | IOException error) {
             handleError(error);
         }
     }
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
     public void register(File directory, String locale) {
         try {
             File dir = new File(directory + "/defences");
@@ -79,6 +84,8 @@ public void register(File directory, String locale) {
 
                 DefenceStruct struct = createStruct(config, defenceName);
                 dMap.put(struct.getIDENTIFIER(), struct);
+
+                defences.put(locale, dMap);
             }
         } catch (IOException error) {
             handleError(error);

diff --git a/...main/java/net/skullian/skyfactions/common/gui/items/defence/DefenceHostileToggleItem.java b/...main/java/net/skullian/skyfactions/common/gui/items/defence/DefenceHostileToggleItem.java
@@ -54,6 +54,7 @@ public void  onClick(SkyClickType clickType, SkyUser player) {
         }
         DefenceData data = (DefenceData) getOPTIONALS()[0];
         Defence defence = SkyApi.getInstance().getDefenceAPI().getDefenceFromData(data);
+        if (defence == null) return;
 
         data.setTARGET_HOSTILES(!data.isTARGET_HOSTILES());
         defence.setData(data);

diff --git a/...main/java/net/skullian/skyfactions/common/gui/items/defence/DefencePassiveToggleItem.java b/...main/java/net/skullian/skyfactions/common/gui/items/defence/DefencePassiveToggleItem.java
@@ -54,6 +54,7 @@ public void onClick(SkyClickType clickType, SkyUser player) {
         }
         DefenceData data = (DefenceData) getOPTIONALS()[0];
         Defence defence = SkyApi.getInstance().getDefenceAPI().getDefenceFromData(data);
+        if (defence == null) return;
 
         data.setTARGET_PASSIVE(!data.isTARGET_PASSIVE());
         defence.setData(data);

diff --git a/...on/src/main/java/net/skullian/skyfactions/common/gui/items/defence/DefenceRemoveItem.java b/...on/src/main/java/net/skullian/skyfactions/common/gui/items/defence/DefenceRemoveItem.java
@@ -48,6 +48,7 @@ public void onClick(SkyClickType clickType, SkyUser player) {
         DefenceData defenceData = (DefenceData) getOPTIONALS()[1];
 
         Defence defence = SkyApi.getInstance().getDefenceAPI().getDefenceFromData(defenceData);
+        if (defence == null) return;
         defence.disable();
 
         defence.remove().whenComplete((ignored, ex) -> {

diff --git a/common/src/main/java/net/skullian/skyfactions/common/module/SkyModuleManager.java b/common/src/main/java/net/skullian/skyfactions/common/module/SkyModuleManager.java
@@ -15,7 +15,7 @@ public class SkyModuleManager {
     private static final Map<String, SkyModule> enabledModules = new HashMap<>();
 
     public static void registerModule(Class<?> module) {
-        modules.add(module.getClass().getName());
+        modules.add(module.getName());
     }
 
     public static void onEnable() {

diff --git a/common/src/main/java/net/skullian/skyfactions/common/user/SkyUser.java b/common/src/main/java/net/skullian/skyfactions/common/user/SkyUser.java
@@ -14,6 +14,7 @@
 import net.skullian.skyfactions.common.util.SkyLocation;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -47,8 +48,9 @@ public UUID getUniqueId() {
 
     public abstract void teleport(SkyLocation location);
 
+    @SuppressWarnings("")
     public PlayerData getPlayerData() {
-        return this.data.get();
+        return this.data.orElse(null);
     }
 
     public CompletableFuture<Integer> getGems() {
@@ -105,12 +107,12 @@ public CompletableFuture<List<InviteData>> getIncomingInvites() {
     }
 
     public List<InviteData> getCachedInvites() {
-        return this.incomingInvites.get();
+        return this.incomingInvites.orElse(new ArrayList<>());
     }
 
     public void onCacheComplete(int runesAddition, int gemsAddition) {
-        this.runes = Optional.of(this.runes.isPresent() ? this.runes.get() : 0 + runesAddition);
-        this.gems = Optional.of(this.gems.isPresent() ? this.gems.get() : 0 + gemsAddition);
+        this.runes = Optional.of(this.runes.orElse(runesAddition));
+        this.gems = Optional.of(this.gems.orElse(gemsAddition));
     }
 
     @Nullable public abstract CompletableFuture<JoinRequestData> getActiveJoinRequest();
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,3 +37,4 @@ Server/ @@
     run/
     assets/data.sqlite3
     /tasks
+    qodana.yaml