chore(common): core to common (again...)

xpdustry · Mar 27, 2024 · 86d036b · 86d036b
1 parent b55b814
commit 86d036b
Show file tree

Hide file tree

Showing 69 changed files with 115 additions and 115 deletions.
diff --git a/distributor-command-cloud/build.gradle.kts b/distributor-command-cloud/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.distributorCore)
+    compileOnly(projects.distributorCommon)
     api(libs.cloud.core)
     compileOnly(libs.bundles.mindustry)
 }
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
@@ -29,10 +29,10 @@
 import com.xpdustry.distributor.command.cloud.parser.content.UnitParser;
 import com.xpdustry.distributor.command.cloud.parser.content.WeatherParser;
 import com.xpdustry.distributor.command.cloud.specifier.AllTeams;
-import com.xpdustry.distributor.core.DistributorProvider;
-import com.xpdustry.distributor.core.command.CommandSender;
-import com.xpdustry.distributor.core.plugin.MindustryPlugin;
-import com.xpdustry.distributor.core.plugin.PluginAware;
+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 io.leangen.geantyref.TypeToken;
 import java.text.MessageFormat;
 import mindustry.game.Team;

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.core.collection.ArcCollections;
+import com.xpdustry.distributor.common.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.core.command.CommandDescription;
-import com.xpdustry.distributor.core.command.CommandElement;
-import com.xpdustry.distributor.core.command.CommandFacade;
-import com.xpdustry.distributor.core.command.CommandHelp;
-import com.xpdustry.distributor.core.command.CommandSender;
-import com.xpdustry.distributor.core.plugin.MindustryPlugin;
+import com.xpdustry.distributor.common.command.CommandDescription;
+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.plugin.MindustryPlugin;
 import java.util.ArrayList;
 import java.util.List;
 import mindustry.gen.Player;

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.core.collection.ArcCollections;
-import com.xpdustry.distributor.core.player.MUUID;
+import com.xpdustry.distributor.common.collection.ArcCollections;
+import com.xpdustry.distributor.common.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
@@ -20,7 +20,7 @@
 
 import arc.Core;
 import com.xpdustry.distributor.command.cloud.ArcCommandContextKeys;
-import com.xpdustry.distributor.core.collection.ArcCollections;
+import com.xpdustry.distributor.common.collection.ArcCollections;
 import java.util.concurrent.CompletableFuture;
 import mindustry.gen.Groups;
 import mindustry.gen.Player;

diff --git a/distributor-core/build.gradle.kts → distributor-common/build.gradle.kts b/distributor-core/build.gradle.kts → distributor-common/build.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 }
 
 distributorModule {
-    identifier = "distributor-core"
-    display = "DistributorCore"
-    main = "com.xpdustry.distributor.core.DistributorCorePlugin"
+    identifier = "distributor-common"
+    display = "DistributorCommon"
+    main = "com.xpdustry.distributor.common.DistributorCommonPlugin"
     description = "Core classes of distributor."
 }
 

diff --git a/...pdustry/distributor/core/Distributor.java → ...ustry/distributor/common/Distributor.java b/...pdustry/distributor/core/Distributor.java → ...ustry/distributor/common/Distributor.java
@@ -16,12 +16,12 @@
  * 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.core;
+package com.xpdustry.distributor.common;
 
-import com.xpdustry.distributor.core.command.CommandFacade;
-import com.xpdustry.distributor.core.localization.MultiLocalizationSource;
-import com.xpdustry.distributor.core.permission.PermissionManager;
-import com.xpdustry.distributor.core.service.ServiceManager;
+import com.xpdustry.distributor.common.command.CommandFacade;
+import com.xpdustry.distributor.common.localization.MultiLocalizationSource;
+import com.xpdustry.distributor.common.permission.PermissionManager;
+import com.xpdustry.distributor.common.service.ServiceManager;
 
 public interface Distributor {
 

diff --git a/...stributor/core/DistributorCorePlugin.java → ...butor/common/DistributorCommonPlugin.java b/...stributor/core/DistributorCorePlugin.java → ...butor/common/DistributorCommonPlugin.java
@@ -16,18 +16,18 @@
  * 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.core;
+package com.xpdustry.distributor.common;
 
-import com.xpdustry.distributor.core.command.CommandFacade;
-import com.xpdustry.distributor.core.localization.MultiLocalizationSource;
-import com.xpdustry.distributor.core.permission.PermissionManager;
-import com.xpdustry.distributor.core.plugin.AbstractMindustryPlugin;
-import com.xpdustry.distributor.core.service.ServiceManager;
-import com.xpdustry.distributor.core.util.Priority;
+import com.xpdustry.distributor.common.command.CommandFacade;
+import com.xpdustry.distributor.common.localization.MultiLocalizationSource;
+import com.xpdustry.distributor.common.permission.PermissionManager;
+import com.xpdustry.distributor.common.plugin.AbstractMindustryPlugin;
+import com.xpdustry.distributor.common.service.ServiceManager;
+import com.xpdustry.distributor.common.util.Priority;
 import java.util.Objects;
 import org.jspecify.annotations.Nullable;
 
-public final class DistributorCorePlugin extends AbstractMindustryPlugin implements Distributor {
+public final class DistributorCommonPlugin extends AbstractMindustryPlugin implements Distributor {
 
     private final ServiceManager services = ServiceManager.simple();
     private final MultiLocalizationSource source = MultiLocalizationSource.create();

diff --git a/...e/DistributorInitializationException.java → ...n/DistributorInitializationException.java b/...e/DistributorInitializationException.java → ...n/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.core;
+package com.xpdustry.distributor.common;
 
 /**
  * This exception is thrown when the distributor fails to initialize.

diff --git a/...distributor/core/DistributorProvider.java → ...stributor/common/DistributorProvider.java b/...distributor/core/DistributorProvider.java → ...stributor/common/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.core;
+package com.xpdustry.distributor.common;
 
 import org.jspecify.annotations.Nullable;
 

diff --git a/...tributor/core/annotation/TaskHandler.java → ...ibutor/common/annotation/TaskHandler.java b/...tributor/core/annotation/TaskHandler.java → ...ibutor/common/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.core.annotation;
+package com.xpdustry.distributor.common.annotation;
 
-import com.xpdustry.distributor.core.scheduler.Cancellable;
-import com.xpdustry.distributor.core.scheduler.MindustryTimeUnit;
-import com.xpdustry.distributor.core.scheduler.PluginScheduler;
+import com.xpdustry.distributor.common.scheduler.Cancellable;
+import com.xpdustry.distributor.common.scheduler.MindustryTimeUnit;
+import com.xpdustry.distributor.common.scheduler.PluginScheduler;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...butor/core/collection/ArcCollections.java → ...tor/common/collection/ArcCollections.java b/...butor/core/collection/ArcCollections.java → ...tor/common/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.core.collection;
+package com.xpdustry.distributor.common.collection;
 
 import arc.struct.ObjectMap;
 import arc.struct.ObjectSet;

diff --git a/.../distributor/core/collection/ArcList.java → ...istributor/common/collection/ArcList.java b/.../distributor/core/collection/ArcList.java → ...istributor/common/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.core.collection;
+package com.xpdustry.distributor.common.collection;
 
 import arc.struct.Seq;
 import java.io.Serial;

diff --git a/...y/distributor/core/collection/ArcMap.java → ...distributor/common/collection/ArcMap.java b/...y/distributor/core/collection/ArcMap.java → ...distributor/common/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.core.collection;
+package com.xpdustry.distributor.common.collection;
 
 import arc.struct.ObjectMap;
 import java.io.Serial;

diff --git a/...y/distributor/core/collection/ArcSet.java → ...distributor/common/collection/ArcSet.java b/...y/distributor/core/collection/ArcSet.java → ...distributor/common/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.core.collection;
+package com.xpdustry.distributor.common.collection;
 
 import arc.struct.ObjectSet;
 import java.io.Serial;

diff --git a/...ributor/core/collection/package-info.java → ...butor/common/collection/package-info.java b/...ributor/core/collection/package-info.java → ...butor/common/collection/package-info.java
@@ -1,4 +1,4 @@
 @NullMarked
-package com.xpdustry.distributor.core.collection;
+package com.xpdustry.distributor.common.collection;
 
 import org.jspecify.annotations.NullMarked;
diff --git a/...ibutor/core/command/ArcCommandFacade.java → ...utor/common/command/ArcCommandFacade.java b/...ibutor/core/command/ArcCommandFacade.java → ...utor/common/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.core.command;
+package com.xpdustry.distributor.common.command;
 
 import arc.util.CommandHandler;
-import com.xpdustry.distributor.core.plugin.MindustryPlugin;
+import com.xpdustry.distributor.common.plugin.MindustryPlugin;
 import java.util.List;
 import org.jspecify.annotations.Nullable;
 

diff --git a/...utor/core/command/CommandDescription.java → ...or/common/command/CommandDescription.java b/...utor/core/command/CommandDescription.java → ...or/common/command/CommandDescription.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.core.command;
+package com.xpdustry.distributor.common.command;
 
 public interface CommandDescription {
 

diff --git a/...tributor/core/command/CommandElement.java → ...ibutor/common/command/CommandElement.java b/...tributor/core/command/CommandElement.java → ...ibutor/common/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.core.command;
+package com.xpdustry.distributor.common.command;
 
-import com.xpdustry.distributor.core.internal.GeneratedDataClass;
+import com.xpdustry.distributor.common.internal.GeneratedDataClass;
 import java.util.Collection;
 import org.immutables.value.Value;
 

diff --git a/...stributor/core/command/CommandFacade.java → ...ributor/common/command/CommandFacade.java b/...stributor/core/command/CommandFacade.java → ...ributor/common/command/CommandFacade.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.core.command;
+package com.xpdustry.distributor.common.command;
 
 import arc.util.CommandHandler;
-import com.xpdustry.distributor.core.plugin.MindustryPlugin;
+import com.xpdustry.distributor.common.plugin.MindustryPlugin;
 import org.jspecify.annotations.Nullable;
 
 public interface CommandFacade {

diff --git a/...distributor/core/command/CommandHelp.java → ...stributor/common/command/CommandHelp.java b/...distributor/core/command/CommandHelp.java → ...stributor/common/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.core.command;
+package com.xpdustry.distributor.common.command;
 
-import com.xpdustry.distributor.core.internal.GeneratedDataClass;
+import com.xpdustry.distributor.common.internal.GeneratedDataClass;
 import java.util.List;
 import org.immutables.value.Value;
 

diff --git a/...stributor/core/command/CommandSender.java → ...ributor/common/command/CommandSender.java b/...stributor/core/command/CommandSender.java → ...ributor/common/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.core.command;
+package com.xpdustry.distributor.common.command;
 
 import java.util.Locale;
 import mindustry.gen.Player;

diff --git a/...tor/core/command/PlayerCommandSender.java → ...r/common/command/PlayerCommandSender.java b/...tor/core/command/PlayerCommandSender.java → ...r/common/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.core.command;
+package com.xpdustry.distributor.common.command;
 
 import java.util.Locale;
 import mindustry.gen.Player;

diff --git a/...tor/core/command/ServerCommandSender.java → ...r/common/command/ServerCommandSender.java b/...tor/core/command/ServerCommandSender.java → ...r/common/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.core.command;
+package com.xpdustry.distributor.common.command;
 
 import arc.util.Log;
 import java.util.Locale;

diff --git a/...e/command/SimpleCommandFacadeFactory.java → ...n/command/SimpleCommandFacadeFactory.java b/...e/command/SimpleCommandFacadeFactory.java → ...n/command/SimpleCommandFacadeFactory.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.core.command;
+package com.xpdustry.distributor.common.command;
 
 import arc.util.CommandHandler;
 

diff --git a/...tributor/core/scheduler/package-info.java → ...tributor/common/command/package-info.java b/...tributor/core/scheduler/package-info.java → ...tributor/common/command/package-info.java
@@ -1,4 +1,4 @@
 @NullMarked
-package com.xpdustry.distributor.core.scheduler;
+package com.xpdustry.distributor.common.command;
 
 import org.jspecify.annotations.NullMarked;
diff --git a/...tor/core/internal/GeneratedDataClass.java → ...r/common/internal/GeneratedDataClass.java b/...tor/core/internal/GeneratedDataClass.java → ...r/common/internal/GeneratedDataClass.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.core.internal;
+package com.xpdustry.distributor.common.internal;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...core/localization/LocalizationSource.java → ...mmon/localization/LocalizationSource.java b/...core/localization/LocalizationSource.java → ...mmon/localization/LocalizationSource.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.core.localization;
+package com.xpdustry.distributor.common.localization;
 
 import java.text.MessageFormat;
 import java.util.Locale;

diff --git a/...alization/LocalizationSourceRegistry.java → ...alization/LocalizationSourceRegistry.java b/...alization/LocalizationSourceRegistry.java → ...alization/LocalizationSourceRegistry.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.core.localization;
+package com.xpdustry.distributor.common.localization;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/...ation/LocalizationSourceRegistryImpl.java → ...ation/LocalizationSourceRegistryImpl.java b/...ation/LocalizationSourceRegistryImpl.java → ...ation/LocalizationSourceRegistryImpl.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.core.localization;
+package com.xpdustry.distributor.common.localization;
 
 import java.text.MessageFormat;
 import java.util.Locale;

diff --git a/...localization/MultiLocalizationSource.java → ...localization/MultiLocalizationSource.java b/...localization/MultiLocalizationSource.java → ...localization/MultiLocalizationSource.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.core.localization;
+package com.xpdustry.distributor.common.localization;
 
 /**
  * A mutable localization source that delegates the localization lookup to other sources in FIFO order.

diff --git a/...lization/MultiLocalizationSourceImpl.java → ...lization/MultiLocalizationSourceImpl.java b/...lization/MultiLocalizationSourceImpl.java → ...lization/MultiLocalizationSourceImpl.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.core.localization;
+package com.xpdustry.distributor.common.localization;
 
 import java.text.MessageFormat;
 import java.util.ArrayDeque;

diff --git a/...ocalization/RouterLocalizationSource.java → ...ocalization/RouterLocalizationSource.java b/...ocalization/RouterLocalizationSource.java → ...ocalization/RouterLocalizationSource.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.core.localization;
+package com.xpdustry.distributor.common.localization;
 
 import java.text.MessageFormat;
 import java.util.Locale;

diff --git a/...dustry/distributor/core/package-info.java → ...stry/distributor/common/package-info.java b/...dustry/distributor/core/package-info.java → ...stry/distributor/common/package-info.java
@@ -1,4 +1,4 @@
 @NullMarked
-package com.xpdustry.distributor.core;
+package com.xpdustry.distributor.common;
 
 import org.jspecify.annotations.NullMarked;
diff --git a/.../core/permission/EmptyPermissionTree.java → ...ommon/permission/EmptyPermissionTree.java b/.../core/permission/EmptyPermissionTree.java → ...ommon/permission/EmptyPermissionTree.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.core.permission;
+package com.xpdustry.distributor.common.permission;
 
 import java.util.Collections;
 import java.util.Map;

diff --git a/...e/permission/ImmutablePermissionTree.java → ...n/permission/ImmutablePermissionTree.java b/...e/permission/ImmutablePermissionTree.java → ...n/permission/ImmutablePermissionTree.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.core.permission;
+package com.xpdustry.distributor.common.permission;
 
 import java.util.Map;