Minor Class Refactoring

.github/README.md

@@ -2,9 +2,6 @@
         <img src="https://github.com/CrazyCloudCraft/worldsystem-depecated/raw/master/.github/Worldsystemlogo_V24X.png" />
 </p>
 <p align="center">
-    <a href="https://github.com/trainerlord/WorldSystem/actions/workflows/codacy.yml">
-        <img src="https://github.com/trainerlord/WorldSystem/actions/workflows/codacy.yml/badge.svg" />
-    </a>
     <a hreg="https://github.com/trainerlord/WorldSystem/releases">
         <img src="https://img.shields.io/github/downloads/trainerlord/WorldSystem/total?color=green&label=All%20Downloads&style=plastic" />
 </a>

.github/workflows/codeql.yml

@@ -0,0 +1,81 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '35 13 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Build and test
+      uses: actions/checkout@v3
+    - name: Setup JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'adopt'
+    - name: Run the Maven verify phase
+       run: mvn --batch-mode --update-snapshots verify
+    #- name: Checkout repository
+    #  uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    #- name: Initialize CodeQL
+    #  uses: github/codeql-action/init@v2
+    #  with:
+     #   languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+        
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    #- name: Autobuild
+    #  uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    #- name: Perform CodeQL Analysis
+    #  uses: github/codeql-action/analyze@v2

src/main/java/de/butzlabben/WorldSystem.java

@@ -1,6 +1,7 @@
-package de.butzlabben.world;
+package de.butzlabben;
 
-import de.butzlabben.world.autoupdater.AutoUpdater;
+import de.butzlabben.world.GCRunnable;
+import de.butzlabben.world.WorldCheckerRunnable;
 import de.butzlabben.world.command.CommandRegistry;
 import de.butzlabben.world.config.*;
 import de.butzlabben.world.listener.*;
@@ -8,7 +9,6 @@ import de.butzlabben.world.util.PapiExtension;
 import de.butzlabben.world.util.PlayerPositions;
 import de.butzlabben.world.util.VersionUtil;
 import de.butzlabben.world.util.database.DatabaseProvider;
-import de.butzlabben.world.wrapper.AsyncCreatorAdapter;
 import de.butzlabben.world.wrapper.CreatorAdapter;
 import de.butzlabben.world.wrapper.SystemWorld;
 import org.bstats.bukkit.Metrics;

src/main/java/de/butzlabben/inventory/OrcListener.java

@@ -1,6 +1,6 @@
 package de.butzlabben.inventory;
 
-import de.butzlabben.world.WorldSystem;
+import de.butzlabben.WorldSystem;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/de/butzlabben/world/autoupdater/UpdateInformations.java

@@ -2,7 +2,7 @@ package de.butzlabben.world.autoupdater;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import de.butzlabben.world.WorldSystem;
+import de.butzlabben.WorldSystem;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;

src/main/java/de/butzlabben/world/command/commands/WSCommands.java

@@ -1,6 +1,6 @@
 package de.butzlabben.world.command.commands;
 
-import de.butzlabben.world.WorldSystem;
+import de.butzlabben.WorldSystem;
 import de.butzlabben.world.autoupdater.AutoUpdater;
 import de.butzlabben.world.config.DependenceConfig;
 import de.butzlabben.world.config.MessageConfig;

src/main/java/de/butzlabben/world/command/commands/WorldAdministrateCommand.java

@@ -1,6 +1,6 @@
 package de.butzlabben.world.command.commands;
 
-import de.butzlabben.world.WorldSystem;
+import de.butzlabben.WorldSystem;
 import de.butzlabben.world.config.DependenceConfig;
 import de.butzlabben.world.config.MessageConfig;
 import de.butzlabben.world.config.PluginConfig;

src/main/java/de/butzlabben/world/command/commands/WorldSettingsCommands.java

@@ -1,6 +1,6 @@
 package de.butzlabben.world.command.commands;
 
-import de.butzlabben.world.WorldSystem;
+import de.butzlabben.WorldSystem;
 import de.butzlabben.world.config.DependenceConfig;
 import de.butzlabben.world.config.MessageConfig;
 import de.butzlabben.world.config.PluginConfig;

src/main/java/de/butzlabben/world/config/GuiConfig.java

@@ -1,7 +1,7 @@
 package de.butzlabben.world.config;
 
 import de.butzlabben.inventory.OrcItem;
-import de.butzlabben.world.WorldSystem;
+import de.butzlabben.WorldSystem;
 import de.butzlabben.world.util.VersionUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;

src/main/java/de/butzlabben/world/config/MessageConfig.java

@@ -1,6 +1,6 @@
 package de.butzlabben.world.config;
 
-import de.butzlabben.world.WorldSystem;
+import de.butzlabben.WorldSystem;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;

src/main/java/de/butzlabben/world/config/PluginConfig.java

@@ -1,6 +1,6 @@
 package de.butzlabben.world.config;
 
-import de.butzlabben.world.WorldSystem;
+import de.butzlabben.WorldSystem;
 import de.butzlabben.world.util.PlayerPositions;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Bukkit;

src/main/java/de/butzlabben/world/config/SettingsConfig.java

@@ -1,6 +1,6 @@
 package de.butzlabben.world.config;
 
-import de.butzlabben.world.WorldSystem;
+import de.butzlabben.WorldSystem;
 import de.butzlabben.world.wrapper.SystemWorld;
 import org.bukkit.Bukkit;
 import org.bukkit.Difficulty;

src/main/java/de/butzlabben/world/util/PapiExtension.java

@@ -1,6 +1,6 @@
 package de.butzlabben.world.util;
 
-import de.butzlabben.world.WorldSystem;
+import de.butzlabben.WorldSystem;
 import de.butzlabben.world.config.DependenceConfig;
 import de.butzlabben.world.config.WorldConfig;
 import de.butzlabben.world.wrapper.SystemWorld;

src/main/java/de/butzlabben/world/util/VersionUtil.java

@@ -1,6 +1,5 @@
 package de.butzlabben.world.util;
 
-import de.butzlabben.world.WorldSystem;
 import org.bukkit.Bukkit;
 import org.bukkit.scheduler.BukkitTask;
 

src/main/java/de/butzlabben/world/wrapper/SystemWorld.java

@@ -2,7 +2,7 @@
         package de.butzlabben.world.wrapper;
 
         import com.google.common.base.Preconditions;
-        import de.butzlabben.world.WorldSystem;
+        import de.butzlabben.WorldSystem;
         import de.butzlabben.world.config.*;
         import de.butzlabben.world.event.WorldCreateEvent;
         import de.butzlabben.world.event.WorldLoadEvent;