diff --git a/api/build.gradle b/api/build.gradle new file mode 100644 index 000000000..127b1b648 --- /dev/null +++ b/api/build.gradle @@ -0,0 +1 @@ +apply from: '../publish.gradle' \ No newline at end of file diff --git a/shared/src/main/java/me/saiintbrisson/minecraft/ViewType.java b/api/src/main/java/me/saiintbrisson/minecraft/ViewType.java similarity index 100% rename from shared/src/main/java/me/saiintbrisson/minecraft/ViewType.java rename to api/src/main/java/me/saiintbrisson/minecraft/ViewType.java diff --git a/shared/src/main/java/me/saiintbrisson/minecraft/event/Event.java b/api/src/main/java/me/saiintbrisson/minecraft/event/Event.java similarity index 100% rename from shared/src/main/java/me/saiintbrisson/minecraft/event/Event.java rename to api/src/main/java/me/saiintbrisson/minecraft/event/Event.java diff --git a/shared/src/main/java/me/saiintbrisson/minecraft/event/EventBus.java b/api/src/main/java/me/saiintbrisson/minecraft/event/EventBus.java similarity index 100% rename from shared/src/main/java/me/saiintbrisson/minecraft/event/EventBus.java rename to api/src/main/java/me/saiintbrisson/minecraft/event/EventBus.java diff --git a/shared/src/main/java/me/saiintbrisson/minecraft/event/EventListener.java b/api/src/main/java/me/saiintbrisson/minecraft/event/EventListener.java similarity index 100% rename from shared/src/main/java/me/saiintbrisson/minecraft/event/EventListener.java rename to api/src/main/java/me/saiintbrisson/minecraft/event/EventListener.java diff --git a/shared/src/main/java/me/saiintbrisson/minecraft/event/EventSubscription.java b/api/src/main/java/me/saiintbrisson/minecraft/event/EventSubscription.java similarity index 100% rename from shared/src/main/java/me/saiintbrisson/minecraft/event/EventSubscription.java rename to api/src/main/java/me/saiintbrisson/minecraft/event/EventSubscription.java diff --git a/shared/src/main/java/me/saiintbrisson/minecraft/internal/ContainerModification.java b/api/src/main/java/me/saiintbrisson/minecraft/internal/ContainerModification.java similarity index 100% rename from shared/src/main/java/me/saiintbrisson/minecraft/internal/ContainerModification.java rename to api/src/main/java/me/saiintbrisson/minecraft/internal/ContainerModification.java diff --git a/shared/src/main/java/me/saiintbrisson/minecraft/internal/InitOnly.java b/api/src/main/java/me/saiintbrisson/minecraft/internal/InitOnly.java similarity index 77% rename from shared/src/main/java/me/saiintbrisson/minecraft/internal/InitOnly.java rename to api/src/main/java/me/saiintbrisson/minecraft/internal/InitOnly.java index ac89dea25..329de26fe 100644 --- a/shared/src/main/java/me/saiintbrisson/minecraft/internal/InitOnly.java +++ b/api/src/main/java/me/saiintbrisson/minecraft/internal/InitOnly.java @@ -6,8 +6,8 @@ import java.lang.annotation.Target; /** - * Marks a method that can be called only before view initialization, - * otherwise it will throw a {@link me.saiintbrisson.minecraft.exception.InitializationException}. + * Marks a method that can be called only before view initialization, otherwise it will throw a + * InitializationException. */ @Retention(RetentionPolicy.CLASS) @Target(ElementType.METHOD) diff --git a/shared/src/main/java/me/saiintbrisson/minecraft/Job.java b/api/src/main/java/me/saiintbrisson/minecraft/internal/Job.java similarity index 96% rename from shared/src/main/java/me/saiintbrisson/minecraft/Job.java rename to api/src/main/java/me/saiintbrisson/minecraft/internal/Job.java index 9600fb8c0..2e94a755a 100644 --- a/shared/src/main/java/me/saiintbrisson/minecraft/Job.java +++ b/api/src/main/java/me/saiintbrisson/minecraft/internal/Job.java @@ -1,4 +1,4 @@ -package me.saiintbrisson.minecraft; +package me.saiintbrisson.minecraft.internal; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/shared/src/main/java/me/saiintbrisson/minecraft/pipeline/Pipeline.java b/api/src/main/java/me/saiintbrisson/minecraft/pipeline/Pipeline.java similarity index 100% rename from shared/src/main/java/me/saiintbrisson/minecraft/pipeline/Pipeline.java rename to api/src/main/java/me/saiintbrisson/minecraft/pipeline/Pipeline.java diff --git a/shared/src/main/java/me/saiintbrisson/minecraft/pipeline/PipelineContext.java b/api/src/main/java/me/saiintbrisson/minecraft/pipeline/PipelineContext.java similarity index 100% rename from shared/src/main/java/me/saiintbrisson/minecraft/pipeline/PipelineContext.java rename to api/src/main/java/me/saiintbrisson/minecraft/pipeline/PipelineContext.java diff --git a/shared/src/main/java/me/saiintbrisson/minecraft/pipeline/PipelineInterceptor.java b/api/src/main/java/me/saiintbrisson/minecraft/pipeline/PipelineInterceptor.java similarity index 100% rename from shared/src/main/java/me/saiintbrisson/minecraft/pipeline/PipelineInterceptor.java rename to api/src/main/java/me/saiintbrisson/minecraft/pipeline/PipelineInterceptor.java diff --git a/shared/src/main/java/me/saiintbrisson/minecraft/pipeline/PipelinePhase.java b/api/src/main/java/me/saiintbrisson/minecraft/pipeline/PipelinePhase.java similarity index 100% rename from shared/src/main/java/me/saiintbrisson/minecraft/pipeline/PipelinePhase.java rename to api/src/main/java/me/saiintbrisson/minecraft/pipeline/PipelinePhase.java diff --git a/shared/src/test/java/me/saiintbrisson/minecraft/pipeline/PipelineTest.java b/api/src/test/java/me/saiintbrisson/minecraft/pipeline/PipelineTest.java similarity index 100% rename from shared/src/test/java/me/saiintbrisson/minecraft/pipeline/PipelineTest.java rename to api/src/test/java/me/saiintbrisson/minecraft/pipeline/PipelineTest.java diff --git a/bukkit-api/src/main/java/me/saiintbrisson/minecraft/ViewFrame.java b/bukkit-api/src/main/java/me/saiintbrisson/minecraft/ViewFrame.java index 7ed8584a7..bde20eb90 100644 --- a/bukkit-api/src/main/java/me/saiintbrisson/minecraft/ViewFrame.java +++ b/bukkit-api/src/main/java/me/saiintbrisson/minecraft/ViewFrame.java @@ -16,6 +16,7 @@ import lombok.ToString; import me.saiintbrisson.minecraft.feature.Feature; import me.saiintbrisson.minecraft.feature.FeatureInstaller; +import me.saiintbrisson.minecraft.internal.Job; import me.saiintbrisson.minecraft.logging.BukkitLogger; import org.apache.commons.lang.StringUtils; import org.bukkit.entity.Player; diff --git a/settings.gradle b/settings.gradle index 2cab4f3e6..19d8880b0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,4 +9,5 @@ include 'bom', 'feature-move-io', 'kotlin-dsl', 'shared', - 'test' + 'test', + 'api' diff --git a/shared/build.gradle b/shared/build.gradle index dbb2184a6..7b99c6c8d 100644 --- a/shared/build.gradle +++ b/shared/build.gradle @@ -1,9 +1,10 @@ apply from: '../publish.gradle' dependencies { + api projects.api + testImplementation projects.test testImplementation libs.mockito.core testImplementation libs.mockito.junit - testImplementation projects.test testRuntimeOnly libs.spigot.api } diff --git a/shared/src/main/java/me/saiintbrisson/minecraft/AbstractView.java b/shared/src/main/java/me/saiintbrisson/minecraft/AbstractView.java index 9195b0161..094017ba7 100644 --- a/shared/src/main/java/me/saiintbrisson/minecraft/AbstractView.java +++ b/shared/src/main/java/me/saiintbrisson/minecraft/AbstractView.java @@ -20,6 +20,7 @@ import lombok.ToString; import me.saiintbrisson.minecraft.exception.ContainerException; import me.saiintbrisson.minecraft.exception.InitializationException; +import me.saiintbrisson.minecraft.internal.Job; import me.saiintbrisson.minecraft.logging.Logger; import me.saiintbrisson.minecraft.pipeline.Pipeline; import me.saiintbrisson.minecraft.pipeline.PipelinePhase; diff --git a/shared/src/main/java/me/saiintbrisson/minecraft/PlatformViewFrame.java b/shared/src/main/java/me/saiintbrisson/minecraft/PlatformViewFrame.java index 3885ba246..f8963d768 100644 --- a/shared/src/main/java/me/saiintbrisson/minecraft/PlatformViewFrame.java +++ b/shared/src/main/java/me/saiintbrisson/minecraft/PlatformViewFrame.java @@ -4,6 +4,7 @@ import java.util.function.BiConsumer; import java.util.function.Function; import me.saiintbrisson.minecraft.feature.FeatureInstaller; +import me.saiintbrisson.minecraft.internal.Job; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/shared/src/main/java/me/saiintbrisson/minecraft/pipeline/interceptors/ScheduledUpdateInterceptor.java b/shared/src/main/java/me/saiintbrisson/minecraft/pipeline/interceptors/ScheduledUpdateInterceptor.java index e1c0d59c7..6ed3ce562 100644 --- a/shared/src/main/java/me/saiintbrisson/minecraft/pipeline/interceptors/ScheduledUpdateInterceptor.java +++ b/shared/src/main/java/me/saiintbrisson/minecraft/pipeline/interceptors/ScheduledUpdateInterceptor.java @@ -4,8 +4,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.RequiredArgsConstructor; -import me.saiintbrisson.minecraft.Job; import me.saiintbrisson.minecraft.ViewContext; +import me.saiintbrisson.minecraft.internal.Job; import me.saiintbrisson.minecraft.pipeline.PipelineContext; import me.saiintbrisson.minecraft.pipeline.PipelineInterceptor; import org.jetbrains.annotations.NotNull; diff --git a/shared/src/test/java/me/saiintbrisson/minecraft/UpdateJobTest.java b/shared/src/test/java/me/saiintbrisson/minecraft/UpdateJobTest.java index c87fb86e4..c226c8040 100644 --- a/shared/src/test/java/me/saiintbrisson/minecraft/UpdateJobTest.java +++ b/shared/src/test/java/me/saiintbrisson/minecraft/UpdateJobTest.java @@ -8,6 +8,7 @@ import static org.mockito.Mockito.when; import java.util.concurrent.atomic.AtomicBoolean; +import me.saiintbrisson.minecraft.internal.Job; import me.saiintbrisson.minecraft.test.TestViewFrame; import org.junit.jupiter.api.Test; diff --git a/shared/src/test/java/me/saiintbrisson/minecraft/pipeline/interceptors/ScheduledUpdateInterceptorTest.java b/shared/src/test/java/me/saiintbrisson/minecraft/pipeline/interceptors/ScheduledUpdateInterceptorTest.java index d447f717c..9bfc934b8 100644 --- a/shared/src/test/java/me/saiintbrisson/minecraft/pipeline/interceptors/ScheduledUpdateInterceptorTest.java +++ b/shared/src/test/java/me/saiintbrisson/minecraft/pipeline/interceptors/ScheduledUpdateInterceptorTest.java @@ -12,9 +12,9 @@ import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; import me.saiintbrisson.minecraft.AbstractView; -import me.saiintbrisson.minecraft.Job; import me.saiintbrisson.minecraft.ViewContext; import me.saiintbrisson.minecraft.Viewer; +import me.saiintbrisson.minecraft.internal.Job; import me.saiintbrisson.minecraft.pipeline.Pipeline; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/me/saiintbrisson/minecraft/test/TestViewFrame.java b/test/src/main/java/me/saiintbrisson/minecraft/test/TestViewFrame.java index af4965bee..2d102fa6b 100644 --- a/test/src/main/java/me/saiintbrisson/minecraft/test/TestViewFrame.java +++ b/test/src/main/java/me/saiintbrisson/minecraft/test/TestViewFrame.java @@ -8,7 +8,6 @@ import lombok.Getter; import lombok.Setter; import me.saiintbrisson.minecraft.AbstractView; -import me.saiintbrisson.minecraft.Job; import me.saiintbrisson.minecraft.PaginatedViewContext; import me.saiintbrisson.minecraft.PlatformViewFrame; import me.saiintbrisson.minecraft.ViewComponentFactory; @@ -16,6 +15,7 @@ import me.saiintbrisson.minecraft.ViewItem; import me.saiintbrisson.minecraft.Viewer; import me.saiintbrisson.minecraft.feature.Feature; +import me.saiintbrisson.minecraft.internal.Job; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable;