chore: Removed redundant common package + smol changes

xpdustry · Apr 4, 2024 · 35093a0 · 35093a0
1 parent 978e8c9
commit 35093a0
Show file tree

Hide file tree

Showing 88 changed files with 176 additions and 180 deletions.
diff --git a/...command-cloud/src/main/java/com/xpdustry/distributor/command/cloud/ArcCommandManager.java b/...command-cloud/src/main/java/com/xpdustry/distributor/command/cloud/ArcCommandManager.java
@@ -19,15 +19,15 @@
 package com.xpdustry.distributor.command.cloud;
 
 import arc.util.CommandHandler;
+import com.xpdustry.distributor.DistributorProvider;
+import com.xpdustry.distributor.command.CommandSender;
 import com.xpdustry.distributor.command.cloud.parser.ContentParser;
 import com.xpdustry.distributor.command.cloud.parser.PlayerInfoParser;
 import com.xpdustry.distributor.command.cloud.parser.PlayerParser;
 import com.xpdustry.distributor.command.cloud.parser.TeamParser;
 import com.xpdustry.distributor.command.cloud.specifier.AllTeams;
-import com.xpdustry.distributor.common.DistributorProvider;
-import com.xpdustry.distributor.common.command.CommandSender;
-import com.xpdustry.distributor.common.plugin.MindustryPlugin;
-import com.xpdustry.distributor.common.plugin.PluginAware;
+import com.xpdustry.distributor.plugin.MindustryPlugin;
+import com.xpdustry.distributor.plugin.PluginAware;
 import io.leangen.geantyref.TypeToken;
 import java.text.MessageFormat;
 import java.util.Objects;

diff --git a/...nd-cloud/src/main/java/com/xpdustry/distributor/command/cloud/ArcRegistrationHandler.java b/...nd-cloud/src/main/java/com/xpdustry/distributor/command/cloud/ArcRegistrationHandler.java
@@ -20,7 +20,7 @@
 
 import arc.struct.ObjectMap;
 import arc.util.CommandHandler;
-import com.xpdustry.distributor.common.collection.ArcCollections;
+import com.xpdustry.distributor.collection.ArcCollections;
 import java.lang.reflect.Field;
 import java.util.HashSet;
 import java.util.Set;

diff --git a/...ommand-cloud/src/main/java/com/xpdustry/distributor/command/cloud/CloudCommandFacade.java b/...ommand-cloud/src/main/java/com/xpdustry/distributor/command/cloud/CloudCommandFacade.java
@@ -19,12 +19,12 @@
 package com.xpdustry.distributor.command.cloud;
 
 import arc.util.CommandHandler;
-import com.xpdustry.distributor.common.command.CommandElement;
-import com.xpdustry.distributor.common.command.CommandFacade;
-import com.xpdustry.distributor.common.command.CommandHelp;
-import com.xpdustry.distributor.common.command.CommandSender;
-import com.xpdustry.distributor.common.command.DescriptionFacade;
-import com.xpdustry.distributor.common.plugin.MindustryPlugin;
+import com.xpdustry.distributor.command.CommandElement;
+import com.xpdustry.distributor.command.CommandFacade;
+import com.xpdustry.distributor.command.CommandHelp;
+import com.xpdustry.distributor.command.CommandSender;
+import com.xpdustry.distributor.command.DescriptionFacade;
+import com.xpdustry.distributor.plugin.MindustryPlugin;
 import java.util.ArrayList;
 import java.util.List;
 import mindustry.gen.Player;

diff --git a/...command-cloud/src/main/java/com/xpdustry/distributor/command/cloud/DescriptionMapper.java b/...command-cloud/src/main/java/com/xpdustry/distributor/command/cloud/DescriptionMapper.java
@@ -18,7 +18,7 @@
  */
 package com.xpdustry.distributor.command.cloud;
 
-import com.xpdustry.distributor.common.command.DescriptionFacade;
+import com.xpdustry.distributor.command.DescriptionFacade;
 import org.incendo.cloud.description.Description;
 
 @FunctionalInterface

diff --git a/...mmand-cloud/src/main/java/com/xpdustry/distributor/command/cloud/parser/PlayerLookup.java b/...mmand-cloud/src/main/java/com/xpdustry/distributor/command/cloud/parser/PlayerLookup.java
@@ -19,8 +19,8 @@
 package com.xpdustry.distributor.command.cloud.parser;
 
 import arc.util.Strings;
-import com.xpdustry.distributor.common.collection.ArcCollections;
-import com.xpdustry.distributor.common.player.MUUID;
+import com.xpdustry.distributor.collection.ArcCollections;
+import com.xpdustry.distributor.player.MUUID;
 import java.text.Normalizer;
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/...mmand-cloud/src/main/java/com/xpdustry/distributor/command/cloud/parser/PlayerParser.java b/...mmand-cloud/src/main/java/com/xpdustry/distributor/command/cloud/parser/PlayerParser.java
@@ -19,8 +19,8 @@
 package com.xpdustry.distributor.command.cloud.parser;
 
 import arc.Core;
+import com.xpdustry.distributor.collection.ArcCollections;
 import com.xpdustry.distributor.command.cloud.ArcCommandContextKeys;
-import com.xpdustry.distributor.common.collection.ArcCollections;
 import java.util.concurrent.CompletableFuture;
 import mindustry.gen.Groups;
 import mindustry.gen.Player;

diff --git a/distributor-common/build.gradle.kts b/distributor-common/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 distributorModule {
     identifier = "distributor-common"
     display = "DistributorCommon"
-    main = "com.xpdustry.distributor.common.DistributorCommonPlugin"
+    main = "com.xpdustry.distributor.DistributorCommonPlugin"
     description = "Core classes of distributor."
     dependencies = listOf("distributor-logging")
 }

diff --git a/...ustry/distributor/common/Distributor.java → ...com/xpdustry/distributor/Distributor.java b/...ustry/distributor/common/Distributor.java → ...com/xpdustry/distributor/Distributor.java
@@ -16,14 +16,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common;
-
-import com.xpdustry.distributor.common.command.CommandFacadeManager;
-import com.xpdustry.distributor.common.event.EventManager;
-import com.xpdustry.distributor.common.localization.LocalizationSourceManager;
-import com.xpdustry.distributor.common.permission.PermissionManager;
-import com.xpdustry.distributor.common.scheduler.PluginScheduler;
-import com.xpdustry.distributor.common.service.ServiceManager;
+package com.xpdustry.distributor;
+
+import com.xpdustry.distributor.command.CommandFacadeManager;
+import com.xpdustry.distributor.event.EventManager;
+import com.xpdustry.distributor.localization.LocalizationSourceManager;
+import com.xpdustry.distributor.permission.PermissionManager;
+import com.xpdustry.distributor.scheduler.PluginScheduler;
+import com.xpdustry.distributor.service.ServiceManager;
 
 public interface Distributor {
 

diff --git a/...butor/common/DistributorCommonPlugin.java → .../distributor/DistributorCommonPlugin.java b/...butor/common/DistributorCommonPlugin.java → .../distributor/DistributorCommonPlugin.java
@@ -16,17 +16,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common;
+package com.xpdustry.distributor;
 
-import com.xpdustry.distributor.common.command.CommandFacadeManager;
-import com.xpdustry.distributor.common.event.EventManager;
-import com.xpdustry.distributor.common.localization.LocalizationSourceManager;
-import com.xpdustry.distributor.common.permission.PermissionManager;
-import com.xpdustry.distributor.common.plugin.AbstractMindustryPlugin;
-import com.xpdustry.distributor.common.scheduler.PluginScheduler;
-import com.xpdustry.distributor.common.scheduler.PluginTimeSource;
-import com.xpdustry.distributor.common.service.ServiceManager;
-import com.xpdustry.distributor.common.util.Priority;
+import com.xpdustry.distributor.command.CommandFacadeManager;
+import com.xpdustry.distributor.event.EventManager;
+import com.xpdustry.distributor.localization.LocalizationSourceManager;
+import com.xpdustry.distributor.permission.PermissionManager;
+import com.xpdustry.distributor.plugin.AbstractMindustryPlugin;
+import com.xpdustry.distributor.scheduler.PluginScheduler;
+import com.xpdustry.distributor.scheduler.PluginTimeSource;
+import com.xpdustry.distributor.service.ServiceManager;
+import com.xpdustry.distributor.util.Priority;
 import java.util.Objects;
 import org.jspecify.annotations.Nullable;
 

diff --git a/...n/DistributorInitializationException.java → ...r/DistributorInitializationException.java b/...n/DistributorInitializationException.java → ...r/DistributorInitializationException.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common;
+package com.xpdustry.distributor;
 
 /**
  * This exception is thrown when the distributor fails to initialize.

diff --git a/...stributor/common/DistributorProvider.java → ...stry/distributor/DistributorProvider.java b/...stributor/common/DistributorProvider.java → ...stry/distributor/DistributorProvider.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common;
+package com.xpdustry.distributor;
 
 import org.jspecify.annotations.Nullable;
 

diff --git a/...butor/common/annotation/EventHandler.java → .../distributor/annotation/EventHandler.java b/...butor/common/annotation/EventHandler.java → .../distributor/annotation/EventHandler.java
@@ -16,16 +16,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.annotation;
+package com.xpdustry.distributor.annotation;
 
-import com.xpdustry.distributor.common.util.Priority;
+import com.xpdustry.distributor.event.EventManager;
+import com.xpdustry.distributor.util.Priority;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Marks a method as an event handler, meaning it will be called by a {@link com.xpdustry.distributor.common.event.EventManager} when its corresponding event is
+ * Marks a method as an event handler, meaning it will be called by a {@link EventManager} when its corresponding event is
  * posted.
  * <br>
  * The annotated method must have exactly one parameter, which is the event class.

diff --git a/...common/plugin/PluginAnnotationParser.java → ...or/annotation/PluginAnnotationParser.java b/...common/plugin/PluginAnnotationParser.java → ...or/annotation/PluginAnnotationParser.java
@@ -16,11 +16,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.plugin;
+package com.xpdustry.distributor.annotation;
 
 public interface PluginAnnotationParser {
 
-    static PluginAnnotationParser noop(final MindustryPlugin plugin) {
+    static PluginAnnotationParser noop() {
         return object -> {};
     }
 

diff --git a/...ibutor/common/annotation/TaskHandler.java → ...y/distributor/annotation/TaskHandler.java b/...ibutor/common/annotation/TaskHandler.java → ...y/distributor/annotation/TaskHandler.java
@@ -16,11 +16,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.annotation;
+package com.xpdustry.distributor.annotation;
 
-import com.xpdustry.distributor.common.scheduler.Cancellable;
-import com.xpdustry.distributor.common.scheduler.MindustryTimeUnit;
-import com.xpdustry.distributor.common.scheduler.PluginScheduler;
+import com.xpdustry.distributor.scheduler.Cancellable;
+import com.xpdustry.distributor.scheduler.MindustryTimeUnit;
+import com.xpdustry.distributor.scheduler.PluginScheduler;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...distributor/common/util/package-info.java → .../distributor/annotation/package-info.java b/...distributor/common/util/package-info.java → .../distributor/annotation/package-info.java
@@ -1,4 +1,4 @@
 @NullMarked
-package com.xpdustry.distributor.common.util;
+package com.xpdustry.distributor.annotation;
 
 import org.jspecify.annotations.NullMarked;
diff --git a/...tor/common/collection/ArcCollections.java → ...istributor/collection/ArcCollections.java b/...tor/common/collection/ArcCollections.java → ...istributor/collection/ArcCollections.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.collection;
+package com.xpdustry.distributor.collection;
 
 import arc.struct.ObjectMap;
 import arc.struct.ObjectSet;

diff --git a/...istributor/common/collection/ArcList.java → ...ustry/distributor/collection/ArcList.java b/...istributor/common/collection/ArcList.java → ...ustry/distributor/collection/ArcList.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.collection;
+package com.xpdustry.distributor.collection;
 
 import arc.struct.Seq;
 import java.io.Serial;

diff --git a/...distributor/common/collection/ArcMap.java → ...dustry/distributor/collection/ArcMap.java b/...distributor/common/collection/ArcMap.java → ...dustry/distributor/collection/ArcMap.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.collection;
+package com.xpdustry.distributor.collection;
 
 import arc.struct.ObjectMap;
 import java.io.Serial;

diff --git a/...distributor/common/collection/ArcSet.java → ...dustry/distributor/collection/ArcSet.java b/...distributor/common/collection/ArcSet.java → ...dustry/distributor/collection/ArcSet.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.collection;
+package com.xpdustry.distributor.collection;
 
 import arc.struct.ObjectSet;
 import java.io.Serial;

diff --git a/...istributor/common/event/package-info.java → .../distributor/collection/package-info.java b/...istributor/common/event/package-info.java → .../distributor/collection/package-info.java
@@ -1,4 +1,4 @@
 @NullMarked
-package com.xpdustry.distributor.common.event;
+package com.xpdustry.distributor.collection;
 
 import org.jspecify.annotations.NullMarked;
diff --git a/...utor/common/command/ArcCommandFacade.java → ...distributor/command/ArcCommandFacade.java b/...utor/common/command/ArcCommandFacade.java → ...distributor/command/ArcCommandFacade.java
@@ -16,10 +16,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.command;
+package com.xpdustry.distributor.command;
 
 import arc.util.CommandHandler;
-import com.xpdustry.distributor.common.plugin.MindustryPlugin;
+import com.xpdustry.distributor.plugin.MindustryPlugin;
 import java.util.List;
 import org.jspecify.annotations.Nullable;
 

diff --git a/...ibutor/common/command/CommandElement.java → ...y/distributor/command/CommandElement.java b/...ibutor/common/command/CommandElement.java → ...y/distributor/command/CommandElement.java
@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.command;
+package com.xpdustry.distributor.command;
 
-import com.xpdustry.distributor.common.internal.DistributorDataClass;
+import com.xpdustry.distributor.internal.DistributorDataClass;
 import java.util.Collection;
 import org.immutables.value.Value;
 

diff --git a/...ributor/common/command/CommandFacade.java → ...ry/distributor/command/CommandFacade.java b/...ributor/common/command/CommandFacade.java → ...ry/distributor/command/CommandFacade.java
@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.command;
+package com.xpdustry.distributor.command;
 
-import com.xpdustry.distributor.common.plugin.MindustryPlugin;
+import com.xpdustry.distributor.plugin.MindustryPlugin;
 import org.jspecify.annotations.Nullable;
 
 public interface CommandFacade {

diff --git a/.../common/command/CommandFacadeManager.java → ...ributor/command/CommandFacadeManager.java b/.../common/command/CommandFacadeManager.java → ...ributor/command/CommandFacadeManager.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.command;
+package com.xpdustry.distributor.command;
 
 import arc.util.CommandHandler;
 

diff --git a/...mon/command/CommandFacadeManagerImpl.java → ...tor/command/CommandFacadeManagerImpl.java b/...mon/command/CommandFacadeManagerImpl.java → ...tor/command/CommandFacadeManagerImpl.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.command;
+package com.xpdustry.distributor.command;
 
 import arc.util.CommandHandler;
 

diff --git a/...stributor/common/command/CommandHelp.java → ...stry/distributor/command/CommandHelp.java b/...stributor/common/command/CommandHelp.java → ...stry/distributor/command/CommandHelp.java
@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.command;
+package com.xpdustry.distributor.command;
 
-import com.xpdustry.distributor.common.internal.DistributorDataClass;
+import com.xpdustry.distributor.internal.DistributorDataClass;
 import java.util.List;
 import org.immutables.value.Value;
 

diff --git a/...ributor/common/command/CommandSender.java → ...ry/distributor/command/CommandSender.java b/...ributor/common/command/CommandSender.java → ...ry/distributor/command/CommandSender.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.command;
+package com.xpdustry.distributor.command;
 
 import java.util.Locale;
 import mindustry.gen.Player;

diff --git a/...tor/common/command/DescriptionFacade.java → ...istributor/command/DescriptionFacade.java b/...tor/common/command/DescriptionFacade.java → ...istributor/command/DescriptionFacade.java
@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.command;
+package com.xpdustry.distributor.command;
 
-import com.xpdustry.distributor.common.internal.DistributorDataClass;
+import com.xpdustry.distributor.internal.DistributorDataClass;
 import java.util.Locale;
 import org.immutables.value.Value;
 

diff --git a/...n/command/LocalizedDescriptionFacade.java → ...r/command/LocalizedDescriptionFacade.java b/...n/command/LocalizedDescriptionFacade.java → ...r/command/LocalizedDescriptionFacade.java
@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.command;
+package com.xpdustry.distributor.command;
 
-import com.xpdustry.distributor.common.DistributorProvider;
+import com.xpdustry.distributor.DistributorProvider;
 import java.util.Locale;
 
 record LocalizedDescriptionFacade(String key, Locale defaultLocale) implements DescriptionFacade {

diff --git a/...r/common/command/PlayerCommandSender.java → ...tributor/command/PlayerCommandSender.java b/...r/common/command/PlayerCommandSender.java → ...tributor/command/PlayerCommandSender.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.command;
+package com.xpdustry.distributor.command;
 
 import java.util.Locale;
 import mindustry.gen.Player;

diff --git a/...r/common/command/ServerCommandSender.java → ...tributor/command/ServerCommandSender.java b/...r/common/command/ServerCommandSender.java → ...tributor/command/ServerCommandSender.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.distributor.common.command;
+package com.xpdustry.distributor.command;
 
 import arc.util.Log;
 import java.util.Locale;

diff --git a/...stributor/common/plugin/package-info.java → ...try/distributor/command/package-info.java b/...stributor/common/plugin/package-info.java → ...try/distributor/command/package-info.java
@@ -1,4 +1,4 @@
 @NullMarked
-package com.xpdustry.distributor.common.plugin;
+package com.xpdustry.distributor.command;
 
 import org.jspecify.annotations.NullMarked;
diff --git a/...ributor-common/src/main/java/com/xpdustry/distributor/common/annotation/package-info.java b/...ributor-common/src/main/java/com/xpdustry/distributor/common/annotation/package-info.java
diff --git a/...ributor-common/src/main/java/com/xpdustry/distributor/common/collection/package-info.java b/...ributor-common/src/main/java/com/xpdustry/distributor/common/collection/package-info.java
diff --git a/distributor-common/src/main/java/com/xpdustry/distributor/common/command/package-info.java b/distributor-common/src/main/java/com/xpdustry/distributor/common/command/package-info.java
diff --git a/distributor-common/src/main/java/com/xpdustry/distributor/common/internal/package-info.java b/distributor-common/src/main/java/com/xpdustry/distributor/common/internal/package-info.java