chore: Moved implementation classes in common package

xpdustry · May 18, 2024 · b8464e4 · b8464e4
1 parent 2422df2
commit b8464e4
Show file tree

Hide file tree

Showing 22 changed files with 36 additions and 34 deletions.
diff --git a/...-api/src/test/java/com/xpdustry/distributor/api/annotation/EventHandlerProcessorTest.java b/...-api/src/test/java/com/xpdustry/distributor/api/annotation/EventHandlerProcessorTest.java
@@ -27,8 +27,8 @@
 import com.xpdustry.distributor.api.test.TestPlugin;
 import com.xpdustry.distributor.api.test.TestScheduler;
 import com.xpdustry.distributor.api.util.Priority;
-import com.xpdustry.distributor.event.EventBusImpl;
-import com.xpdustry.distributor.scheduler.PluginSchedulerImpl;
+import com.xpdustry.distributor.common.event.EventBusImpl;
+import com.xpdustry.distributor.common.scheduler.PluginSchedulerImpl;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...n-api/src/test/java/com/xpdustry/distributor/api/annotation/TaskHandlerProcessorTest.java b/...n-api/src/test/java/com/xpdustry/distributor/api/annotation/TaskHandlerProcessorTest.java
@@ -26,7 +26,7 @@
 import com.xpdustry.distributor.api.scheduler.PluginScheduler;
 import com.xpdustry.distributor.api.test.ManageSchedulerExtension;
 import com.xpdustry.distributor.api.test.TestScheduler;
-import com.xpdustry.distributor.scheduler.PluginSchedulerImpl;
+import com.xpdustry.distributor.common.scheduler.PluginSchedulerImpl;
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;

diff --git a/...-common-api/src/test/java/com/xpdustry/distributor/api/test/ManageSchedulerExtension.java b/...-common-api/src/test/java/com/xpdustry/distributor/api/test/ManageSchedulerExtension.java
@@ -19,8 +19,8 @@
 package com.xpdustry.distributor.api.test;
 
 import com.xpdustry.distributor.api.scheduler.PluginScheduler;
-import com.xpdustry.distributor.scheduler.PluginSchedulerImpl;
-import com.xpdustry.distributor.scheduler.PluginTimeSource;
+import com.xpdustry.distributor.common.scheduler.PluginSchedulerImpl;
+import com.xpdustry.distributor.common.scheduler.PluginTimeSource;
 import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.Objects;

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.DistributorCommonPlugin"
+    main = "com.xpdustry.distributor.common.DistributorCommonPlugin"
     description = "Core classes of distributor."
     dependencies = listOf("distributor-logging")
 }
@@ -18,7 +18,7 @@ dependencies {
 }
 
 tasks.shadowJar {
-    val relocationPackage = "com.xpdustry.distributor.vanilla.shadow"
+    val relocationPackage = "com.xpdustry.distributor.common.shadow"
     relocate("org.fusesource.jansi", "$relocationPackage.jansi")
     minimize {
         exclude(dependency(projects.distributorCommonApi))

diff --git a/.../distributor/DistributorCommonPlugin.java → ...butor/common/DistributorCommonPlugin.java b/.../distributor/DistributorCommonPlugin.java → ...butor/common/DistributorCommonPlugin.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;
+package com.xpdustry.distributor.common;
 
 import arc.Core;
 import com.xpdustry.distributor.api.Distributor;
@@ -33,15 +33,15 @@
 import com.xpdustry.distributor.api.service.ServiceManager;
 import com.xpdustry.distributor.api.translation.TranslationSource;
 import com.xpdustry.distributor.api.translation.TranslationSourceRegistry;
-import com.xpdustry.distributor.audience.AudienceProviderImpl;
-import com.xpdustry.distributor.component.codec.AnsiEncoderImpl;
-import com.xpdustry.distributor.component.codec.MindustryDecoderImpl;
-import com.xpdustry.distributor.component.codec.MindustryEncoderImpl;
-import com.xpdustry.distributor.component.codec.PlainTextEncoderImpl;
-import com.xpdustry.distributor.event.EventBusImpl;
-import com.xpdustry.distributor.scheduler.PluginSchedulerImpl;
-import com.xpdustry.distributor.scheduler.PluginTimeSource;
-import com.xpdustry.distributor.service.ServiceManagerImpl;
+import com.xpdustry.distributor.common.audience.AudienceProviderImpl;
+import com.xpdustry.distributor.common.component.codec.AnsiEncoderImpl;
+import com.xpdustry.distributor.common.component.codec.MindustryDecoderImpl;
+import com.xpdustry.distributor.common.component.codec.MindustryEncoderImpl;
+import com.xpdustry.distributor.common.component.codec.PlainTextEncoderImpl;
+import com.xpdustry.distributor.common.event.EventBusImpl;
+import com.xpdustry.distributor.common.scheduler.PluginSchedulerImpl;
+import com.xpdustry.distributor.common.scheduler.PluginTimeSource;
+import com.xpdustry.distributor.common.service.ServiceManagerImpl;
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.function.Supplier;

diff --git a/...ibutor/audience/AudienceProviderImpl.java → ...common/audience/AudienceProviderImpl.java b/...ibutor/audience/AudienceProviderImpl.java → ...common/audience/AudienceProviderImpl.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.audience;
+package com.xpdustry.distributor.common.audience;
 
 import com.xpdustry.distributor.api.DistributorProvider;
 import com.xpdustry.distributor.api.audience.Audience;

diff --git a/.../distributor/audience/PlayerAudience.java → ...butor/common/audience/PlayerAudience.java b/.../distributor/audience/PlayerAudience.java → ...butor/common/audience/PlayerAudience.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.audience;
+package com.xpdustry.distributor.common.audience;
 
 import com.xpdustry.distributor.api.DistributorProvider;
 import com.xpdustry.distributor.api.audience.Audience;

diff --git a/.../distributor/audience/ServerAudience.java → ...butor/common/audience/ServerAudience.java b/.../distributor/audience/ServerAudience.java → ...butor/common/audience/ServerAudience.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.audience;
+package com.xpdustry.distributor.common.audience;
 
 import arc.util.Log;
 import com.xpdustry.distributor.api.DistributorProvider;

diff --git a/...codec/AbstractStringComponentEncoder.java → ...codec/AbstractStringComponentEncoder.java b/...codec/AbstractStringComponentEncoder.java → ...codec/AbstractStringComponentEncoder.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.component.codec;
+package com.xpdustry.distributor.common.component.codec;
 
 import com.xpdustry.distributor.api.DistributorProvider;
 import com.xpdustry.distributor.api.audience.Audience;

diff --git a/...utor/component/codec/AnsiEncoderImpl.java → ...mmon/component/codec/AnsiEncoderImpl.java b/...utor/component/codec/AnsiEncoderImpl.java → ...mmon/component/codec/AnsiEncoderImpl.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.component.codec;
+package com.xpdustry.distributor.common.component.codec;
 
 import arc.util.OS;
 import com.xpdustry.distributor.api.component.style.ComponentStyle;

diff --git a/...component/codec/MindustryDecoderImpl.java → ...component/codec/MindustryDecoderImpl.java b/...component/codec/MindustryDecoderImpl.java → ...component/codec/MindustryDecoderImpl.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.component.codec;
+package com.xpdustry.distributor.common.component.codec;
 
 import arc.graphics.Color;
 import arc.graphics.Colors;

diff --git a/...component/codec/MindustryEncoderImpl.java → ...component/codec/MindustryEncoderImpl.java b/...component/codec/MindustryEncoderImpl.java → ...component/codec/MindustryEncoderImpl.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.component.codec;
+package com.xpdustry.distributor.common.component.codec;
 
 import com.xpdustry.distributor.api.component.style.ComponentColor;
 import com.xpdustry.distributor.api.component.style.ComponentStyle;

diff --git a/...component/codec/PlainTextEncoderImpl.java → ...component/codec/PlainTextEncoderImpl.java b/...component/codec/PlainTextEncoderImpl.java → ...component/codec/PlainTextEncoderImpl.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.component.codec;
+package com.xpdustry.distributor.common.component.codec;
 
 import com.xpdustry.distributor.api.component.style.ComponentStyle;
 import com.xpdustry.distributor.api.key.Key;

diff --git a/...ustry/distributor/event/EventBusImpl.java → ...istributor/common/event/EventBusImpl.java b/...ustry/distributor/event/EventBusImpl.java → ...istributor/common/event/EventBusImpl.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.event;
+package com.xpdustry.distributor.common.event;
 
 import arc.Events;
 import arc.func.Cons;

diff --git a/...om/xpdustry/distributor/package-info.java → ...stry/distributor/common/package-info.java b/...om/xpdustry/distributor/package-info.java → ...stry/distributor/common/package-info.java
@@ -16,7 +16,7 @@
             TypeUseLocation.UPPER_BOUND,
             TypeUseLocation.OTHERWISE,
         })
-package com.xpdustry.distributor;
+package com.xpdustry.distributor.common;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.framework.qual.DefaultQualifier;

diff --git a/...ibutor/scheduler/PluginSchedulerImpl.java → ...common/scheduler/PluginSchedulerImpl.java b/...ibutor/scheduler/PluginSchedulerImpl.java → ...common/scheduler/PluginSchedulerImpl.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.scheduler;
+package com.xpdustry.distributor.common.scheduler;
 
 import com.xpdustry.distributor.api.plugin.MindustryPlugin;
 import com.xpdustry.distributor.api.plugin.PluginListener;

diff --git a/...distributor/scheduler/PluginTaskImpl.java → ...utor/common/scheduler/PluginTaskImpl.java b/...distributor/scheduler/PluginTaskImpl.java → ...utor/common/scheduler/PluginTaskImpl.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.scheduler;
+package com.xpdustry.distributor.common.scheduler;
 
 import com.xpdustry.distributor.api.plugin.MindustryPlugin;
 import com.xpdustry.distributor.api.scheduler.Cancellable;

diff --git a/...stributor/scheduler/PluginTimeSource.java → ...or/common/scheduler/PluginTimeSource.java b/...stributor/scheduler/PluginTimeSource.java → ...or/common/scheduler/PluginTimeSource.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.scheduler;
+package com.xpdustry.distributor.common.scheduler;
 
 import arc.util.Time;
 

diff --git a/...stributor/service/ServiceManagerImpl.java → ...or/common/service/ServiceManagerImpl.java b/...stributor/service/ServiceManagerImpl.java → ...or/common/service/ServiceManagerImpl.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.service;
+package com.xpdustry.distributor.common.service;
 
 import com.xpdustry.distributor.api.plugin.MindustryPlugin;
 import com.xpdustry.distributor.api.service.ServiceManager;

diff --git a/...onent/codec/MindustryDecoderImplTest.java → ...ommon/codec/MindustryDecoderImplTest.java b/...onent/codec/MindustryDecoderImplTest.java → ...ommon/codec/MindustryDecoderImplTest.java
@@ -16,11 +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.component.codec;
+package com.xpdustry.distributor.common.codec;
 
 import com.xpdustry.distributor.api.component.ListComponent;
 import com.xpdustry.distributor.api.component.style.ComponentColor;
 import com.xpdustry.distributor.api.metadata.MetadataContainer;
+import com.xpdustry.distributor.common.component.codec.MindustryDecoderImpl;
 import org.junit.jupiter.api.Test;
 
 import static com.xpdustry.distributor.api.component.TextComponent.text;

diff --git a/...onent/codec/MindustryEncoderImplTest.java → ...ommon/codec/MindustryEncoderImplTest.java b/...onent/codec/MindustryEncoderImplTest.java → ...ommon/codec/MindustryEncoderImplTest.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.component.codec;
+package com.xpdustry.distributor.common.codec;
 
 import com.xpdustry.distributor.api.Distributor;
 import com.xpdustry.distributor.api.DistributorProvider;
@@ -28,6 +28,7 @@
 import com.xpdustry.distributor.api.translation.Translation;
 import com.xpdustry.distributor.api.translation.TranslationArguments;
 import com.xpdustry.distributor.api.translation.TranslationSourceRegistry;
+import com.xpdustry.distributor.common.component.codec.MindustryEncoderImpl;
 import java.util.Locale;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;

diff --git a/.../src/test/java/com/xpdustry/distributor/api/permission/rank/RankPermissionReaderTest.java b/.../src/test/java/com/xpdustry/distributor/api/permission/rank/RankPermissionReaderTest.java
@@ -25,7 +25,7 @@
 import com.xpdustry.distributor.api.plugin.MindustryPlugin;
 import com.xpdustry.distributor.api.service.ServiceManager;
 import com.xpdustry.distributor.api.util.Priority;
-import com.xpdustry.distributor.service.ServiceManagerImpl;
+import com.xpdustry.distributor.common.service.ServiceManagerImpl;
 import java.util.List;
 import mindustry.gen.Player;
 import org.junit.jupiter.api.AfterEach;