diff --git a/res/plugin.yml b/res/plugin.yml index a49e5c3..9c5e69b 100755 --- a/res/plugin.yml +++ b/res/plugin.yml @@ -1,6 +1,6 @@ name: RedLib main: redempt.redlib.RedLib -version: 2022-09-25 01:04 +version: 2023-12-22 19:59 author: Redempt api-version: 1.13 load: STARTUP diff --git a/src/redempt/redlib/config/annotations/Comment.java b/src/redempt/redlib/config/annotations/Comment.java index 3e46e77..43a0a03 100644 --- a/src/redempt/redlib/config/annotations/Comment.java +++ b/src/redempt/redlib/config/annotations/Comment.java @@ -1,10 +1,6 @@ package redempt.redlib.config.annotations; -import java.lang.annotation.ElementType; -import java.lang.annotation.Repeatable; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * Used to denote comments which should be applied to a config path. Only supported in 1.18.1+ @@ -13,6 +9,7 @@ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.PARAMETER}) @Repeatable(Comments.class) +@Inherited public @interface Comment { String value(); diff --git a/src/redempt/redlib/config/annotations/Comments.java b/src/redempt/redlib/config/annotations/Comments.java index 94093e4..700d38a 100644 --- a/src/redempt/redlib/config/annotations/Comments.java +++ b/src/redempt/redlib/config/annotations/Comments.java @@ -1,9 +1,6 @@ package redempt.redlib.config.annotations; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * A wrapper for multiple {@link Comment} annotations @@ -11,6 +8,7 @@ */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.PARAMETER}) +@Inherited public @interface Comments { Comment[] value(); diff --git a/src/redempt/redlib/config/annotations/ConfigMappable.java b/src/redempt/redlib/config/annotations/ConfigMappable.java index 84711a6..82b8989 100644 --- a/src/redempt/redlib/config/annotations/ConfigMappable.java +++ b/src/redempt/redlib/config/annotations/ConfigMappable.java @@ -1,10 +1,6 @@ package redempt.redlib.config.annotations; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * Indicates that a class can be automatically serialized to config diff --git a/src/redempt/redlib/config/annotations/ConfigName.java b/src/redempt/redlib/config/annotations/ConfigName.java index 8209e74..85d09be 100644 --- a/src/redempt/redlib/config/annotations/ConfigName.java +++ b/src/redempt/redlib/config/annotations/ConfigName.java @@ -1,10 +1,6 @@ package redempt.redlib.config.annotations; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * Specifies the name that should be used to access and set a value in config @@ -13,6 +9,7 @@ @Target({ElementType.FIELD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME) @Documented +@Inherited public @interface ConfigName { String value(); diff --git a/src/redempt/redlib/config/annotations/ConfigPath.java b/src/redempt/redlib/config/annotations/ConfigPath.java index 12106cf..ff17570 100644 --- a/src/redempt/redlib/config/annotations/ConfigPath.java +++ b/src/redempt/redlib/config/annotations/ConfigPath.java @@ -1,10 +1,6 @@ package redempt.redlib.config.annotations; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * Indicates that a field should be populated with the last element of the path to its location in config @@ -13,5 +9,6 @@ @Target({ElementType.FIELD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME) @Documented +@Inherited public @interface ConfigPath { } diff --git a/src/redempt/redlib/config/annotations/ConfigPostInit.java b/src/redempt/redlib/config/annotations/ConfigPostInit.java index 28cc5b2..70d154d 100644 --- a/src/redempt/redlib/config/annotations/ConfigPostInit.java +++ b/src/redempt/redlib/config/annotations/ConfigPostInit.java @@ -1,10 +1,6 @@ package redempt.redlib.config.annotations; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * Indicates that a method should be run when an object is deserialized from config @@ -13,5 +9,6 @@ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) @Documented +@Inherited public @interface ConfigPostInit { }