Phase 533 update

IdealisticAI · Mar 15, 2024 · d999d04 · d999d04
1 parent 2b2ac03
commit d999d04
Show file tree

Hide file tree

Showing 196 changed files with 3,248 additions and 2,906 deletions.
diff --git a/src/main/java/com/vagdedes/spartan/Register.java b/src/main/java/com/vagdedes/spartan/Register.java
@@ -1,18 +1,17 @@
 package com.vagdedes.spartan;
 
-import com.vagdedes.spartan.configuration.Config;
-import com.vagdedes.spartan.functionality.important.MultiVersion;
+import com.vagdedes.spartan.functionality.command.CommandExecution;
+import com.vagdedes.spartan.functionality.command.CommandTab;
+import com.vagdedes.spartan.functionality.connection.DiscordMemberCount;
+import com.vagdedes.spartan.functionality.connection.Piracy;
+import com.vagdedes.spartan.functionality.connection.PlayerLimitPerIP;
+import com.vagdedes.spartan.functionality.identifiers.simple.VehicleAccess;
+import com.vagdedes.spartan.functionality.management.Cache;
+import com.vagdedes.spartan.functionality.management.Config;
 import com.vagdedes.spartan.functionality.notifications.AwarenessNotifications;
 import com.vagdedes.spartan.functionality.notifications.SuspicionNotifications;
-import com.vagdedes.spartan.functionality.protections.PlayerLimitPerIP;
-import com.vagdedes.spartan.functionality.protections.ReconnectCooldown;
-import com.vagdedes.spartan.handlers.connection.DiscordMemberCount;
-import com.vagdedes.spartan.handlers.connection.Piracy;
-import com.vagdedes.spartan.handlers.identifiers.simple.VehicleAccess;
-import com.vagdedes.spartan.handlers.stability.Cache;
-import com.vagdedes.spartan.interfaces.commands.CommandExecution;
-import com.vagdedes.spartan.interfaces.commands.CommandTab;
-import com.vagdedes.spartan.interfaces.listeners.*;
+import com.vagdedes.spartan.functionality.server.MultiVersion;
+import com.vagdedes.spartan.listeners.*;
 import com.vagdedes.spartan.utils.server.NetworkUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.event.Listener;
@@ -64,7 +63,6 @@ public void onEnable() {
         // Base
         Config.settings.runOnLogin();
         PlayerLimitPerIP.cache();
-        ReconnectCooldown.loadCooldowns();
         VehicleAccess.run();
         SuspicionNotifications.run();
 

diff --git a/src/main/java/com/vagdedes/spartan/abstraction/DetectionExecutor.java b/src/main/java/com/vagdedes/spartan/abstraction/DetectionExecutor.java
diff --git a/src/main/java/com/vagdedes/spartan/abstraction/PatternFamily.java b/src/main/java/com/vagdedes/spartan/abstraction/PatternFamily.java
diff --git a/...s/spartan/objects/system/CancelCause.java → ...partan/abstraction/check/CancelCause.java b/...s/spartan/objects/system/CancelCause.java → ...partan/abstraction/check/CancelCause.java
@@ -1,6 +1,6 @@
-package com.vagdedes.spartan.objects.system;
+package com.vagdedes.spartan.abstraction.check;
 
-import com.vagdedes.spartan.handlers.stability.TPS;
+import com.vagdedes.spartan.functionality.server.TPS;
 
 public class CancelCause {
 

diff --git a/...agdedes/spartan/objects/system/Check.java → ...edes/spartan/abstraction/check/Check.java b/...agdedes/spartan/objects/system/Check.java → ...edes/spartan/abstraction/check/Check.java
@@ -1,15 +1,15 @@
-package com.vagdedes.spartan.objects.system;
+package com.vagdedes.spartan.abstraction.check;
 
 import com.vagdedes.spartan.Register;
-import com.vagdedes.spartan.configuration.Config;
+import com.vagdedes.spartan.abstraction.profiling.PlayerEvidence;
+import com.vagdedes.spartan.abstraction.replicates.SpartanPlayer;
+import com.vagdedes.spartan.functionality.connection.cloud.CloudBase;
+import com.vagdedes.spartan.functionality.management.Config;
 import com.vagdedes.spartan.functionality.notifications.AwarenessNotifications;
-import com.vagdedes.spartan.functionality.synchronicity.cloud.CloudFeature;
-import com.vagdedes.spartan.handlers.stability.ResearchEngine;
-import com.vagdedes.spartan.handlers.stability.TPS;
-import com.vagdedes.spartan.handlers.stability.TestServer;
-import com.vagdedes.spartan.objects.profiling.PlayerEvidence;
-import com.vagdedes.spartan.objects.replicates.SpartanPlayer;
-import com.vagdedes.spartan.system.SpartanBukkit;
+import com.vagdedes.spartan.functionality.performance.ResearchEngine;
+import com.vagdedes.spartan.functionality.server.SpartanBukkit;
+import com.vagdedes.spartan.functionality.server.TPS;
+import com.vagdedes.spartan.functionality.server.TestServer;
 import com.vagdedes.spartan.utils.math.AlgebraUtils;
 import com.vagdedes.spartan.utils.server.ConfigUtils;
 import me.vagdedes.spartan.api.CheckSilentToggleEvent;
@@ -306,7 +306,7 @@ public Check(Enums.HackType hackType, Map<Integer, Integer> maxCancelledViolatio
                 silents_config = getOption("silent_worlds", "exampleSilentWorld1, exampleSilentWorld2", false).toString();
 
         // Separator
-        ResearchEngine.DataType[] dataTypes = ResearchEngine.getDynamicUsableDataTypes(false);
+        Enums.DataType[] dataTypes = ResearchEngine.getDynamicUsableDataTypes(false);
         this.enabled = new boolean[ResearchEngine.usableDataTypes.length];
 
         if (legacy) {
@@ -316,7 +316,7 @@ public Check(Enums.HackType hackType, Map<Integer, Integer> maxCancelledViolatio
                             optionValue instanceof Double || optionValue instanceof Float ? ((double) optionValue) > 0.0 :
                                     Boolean.parseBoolean(optionValue.toString().toLowerCase());
 
-            for (ResearchEngine.DataType dataType : dataTypes) {
+            for (Enums.DataType dataType : dataTypes) {
                 this.enabled[dataType.ordinal()] = boolValue;
             }
         } else {
@@ -327,7 +327,7 @@ public Check(Enums.HackType hackType, Map<Integer, Integer> maxCancelledViolatio
                 setOption("enabled", null);
             }
 
-            for (ResearchEngine.DataType dataType : dataTypes) {
+            for (Enums.DataType dataType : dataTypes) {
                 Object optionValue = getOption(
                         "enabled." + dataType.lowerCase,
                         hasOldOption ? oldOptionValue : true,
@@ -490,11 +490,11 @@ public void clearConfigurationCache() {
 
     // Separator
 
-    public boolean isEnabled(ResearchEngine.DataType dataType, String world, SpartanPlayer player) {
-        ResearchEngine.DataType[] dataTypes = ResearchEngine.getDynamicUsableDataTypes(false);
+    public boolean isEnabled(Enums.DataType dataType, String world, SpartanPlayer player) {
+        Enums.DataType[] dataTypes = ResearchEngine.getDynamicUsableDataTypes(false);
 
         if (dataType == null) {
-            for (ResearchEngine.DataType type : dataTypes) {
+            for (Enums.DataType type : dataTypes) {
                 if (this.enabled[type.ordinal()]) {
                     return true;
                 }
@@ -507,17 +507,17 @@ public boolean isEnabled(ResearchEngine.DataType dataType, String world, Spartan
                 && (player == null || player.getViolations(hackType).getDisableCause() == null);
     }
 
-    public void setEnabled(ResearchEngine.DataType dataType, boolean b) {
-        ResearchEngine.DataType[] dataTypes;
+    public void setEnabled(Enums.DataType dataType, boolean b) {
+        Enums.DataType[] dataTypes;
 
         if (dataType == null) {
             dataTypes = ResearchEngine.getDynamicUsableDataTypes(false);
         } else {
             dataTypes = null;
 
-            for (ResearchEngine.DataType type : ResearchEngine.getDynamicUsableDataTypes(false)) {
+            for (Enums.DataType type : ResearchEngine.getDynamicUsableDataTypes(false)) {
                 if (type == dataType) {
-                    dataTypes = new ResearchEngine.DataType[]{dataType};
+                    dataTypes = new Enums.DataType[]{dataType};
                     break;
                 }
             }
@@ -526,7 +526,7 @@ public void setEnabled(ResearchEngine.DataType dataType, boolean b) {
                 return;
             }
         }
-        for (ResearchEngine.DataType type : dataTypes) {
+        for (Enums.DataType type : dataTypes) {
             int ordinal = type.ordinal();
 
             if (enabled[ordinal] != b) {
@@ -543,7 +543,7 @@ public void setEnabled(ResearchEngine.DataType dataType, boolean b) {
                     this.enabled[ordinal] = b;
 
                     if (b) {
-                        CloudFeature.refresh(true);
+                        CloudBase.refresh(true);
                     } else {
                         clearConfigurationCache();
 
@@ -880,7 +880,7 @@ public int getProblematicDetections() {
         }
     }
 
-    public void setMaxCancelledViolations(ResearchEngine.DataType dataType, Map<Integer, Double> map) {
+    public void setMaxCancelledViolations(Enums.DataType dataType, Map<Integer, Double> map) {
         synchronized (maxCancelledViolations) {
             if (!map.isEmpty()) {
                 for (Map.Entry<Integer, Double> entry : map.entrySet()) {
@@ -903,7 +903,7 @@ public Map<Integer, Integer> copyMaxCancelledViolations() {
         return maxCancelledViolations;
     }
 
-    public int getMaxCancelledViolations(ResearchEngine.DataType dataType, int hash) {
+    public int getMaxCancelledViolations(Enums.DataType dataType, int hash) {
         synchronized (maxCancelledViolations) {
             return maxCancelledViolations.getOrDefault(
                     (dataType.hashCode() * SpartanBukkit.hashCodeMultiplier) + hash,

diff --git a/...es/spartan/abstraction/CheckExecutor.java → ...rtan/abstraction/check/CheckExecutor.java b/...es/spartan/abstraction/CheckExecutor.java → ...rtan/abstraction/check/CheckExecutor.java
@@ -1,6 +1,6 @@
-package com.vagdedes.spartan.abstraction;
+package com.vagdedes.spartan.abstraction.check;
 
-import com.vagdedes.spartan.objects.replicates.SpartanPlayer;
+import com.vagdedes.spartan.abstraction.replicates.SpartanPlayer;
 import me.vagdedes.spartan.system.Enums;
 
 public abstract class CheckExecutor extends DetectionExecutor {