diff --git a/base/build.gradle b/base/build.gradle index dc64ad180..cf424ca64 100644 --- a/base/build.gradle +++ b/base/build.gradle @@ -3,6 +3,7 @@ plugins { } dependencies { + api 'org.jetbrains:annotations:24.0.1' api 'com.google.guava:guava:31.1-jre' api 'org.apache.commons:commons-lang3:3.12.0' api 'it.unimi.dsi:fastutil:8.5.12' diff --git a/base/src/main/java/engine/annotation/Beta.java b/base/src/main/java/engine/annotation/Beta.java deleted file mode 100644 index d44379f1d..000000000 --- a/base/src/main/java/engine/annotation/Beta.java +++ /dev/null @@ -1,13 +0,0 @@ -package engine.annotation; - -import java.lang.annotation.*; - -/** - * Annotate any beta code. - */ -@Retention(RetentionPolicy.CLASS) -@Target({ElementType.CONSTRUCTOR, ElementType.TYPE, ElementType.METHOD, - ElementType.FIELD, ElementType.PACKAGE, ElementType.MODULE}) -@Documented -public @interface Beta { -} diff --git a/base/src/main/java/engine/annotation/Experimental.java b/base/src/main/java/engine/annotation/Experimental.java deleted file mode 100644 index 4d92af2a7..000000000 --- a/base/src/main/java/engine/annotation/Experimental.java +++ /dev/null @@ -1,13 +0,0 @@ -package engine.annotation; - -import java.lang.annotation.*; - -/** - * Annotate any experimental code. - */ -@Retention(RetentionPolicy.CLASS) -@Target({ElementType.CONSTRUCTOR, ElementType.TYPE, ElementType.METHOD, - ElementType.FIELD, ElementType.PACKAGE, ElementType.MODULE}) -@Documented -public @interface Experimental { -} diff --git a/base/src/main/java/engine/annotation/Internal.java b/base/src/main/java/engine/annotation/Internal.java deleted file mode 100644 index bfe60771a..000000000 --- a/base/src/main/java/engine/annotation/Internal.java +++ /dev/null @@ -1,13 +0,0 @@ -package engine.annotation; - -import java.lang.annotation.*; - -/** - * Annotate any internal code. - */ -@Retention(RetentionPolicy.CLASS) -@Target({ElementType.CONSTRUCTOR, ElementType.TYPE, ElementType.METHOD, - ElementType.FIELD, ElementType.PACKAGE, ElementType.MODULE}) -@Documented -public @interface Internal { -} diff --git a/game-engine/src/main/java/engine/annotation/Debug.java b/game-engine/src/main/java/engine/annotation/Debug.java deleted file mode 100644 index 2040c150a..000000000 --- a/game-engine/src/main/java/engine/annotation/Debug.java +++ /dev/null @@ -1,9 +0,0 @@ -package engine.annotation; - -import java.lang.annotation.*; - -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.CONSTRUCTOR, ElementType.TYPE, ElementType.METHOD, ElementType.FIELD}) -@Documented -public @interface Debug { -} diff --git a/game-engine/src/main/java/engine/registry/RegistryManager.java b/game-engine/src/main/java/engine/registry/RegistryManager.java index 609bf1a96..9ba57c8a4 100644 --- a/game-engine/src/main/java/engine/registry/RegistryManager.java +++ b/game-engine/src/main/java/engine/registry/RegistryManager.java @@ -1,6 +1,6 @@ package engine.registry; -import engine.annotation.Internal; +import org.jetbrains.annotations.ApiStatus; import java.util.Collection; import java.util.Optional; @@ -21,7 +21,7 @@ public interface RegistryManager { * @deprecated Provide for {@link engine.event.mod.ModRegistrationEvent.Construction}. Waiting to remove. */ @Deprecated - @Internal + @ApiStatus.Internal > void addRegistry(Class type, Supplier> supplier); /**