OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-26 22:40:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

generator fix

Browse source
This commit is contained in:
Jason Penilla 2024-04-25 19:09:21 -07:00
parent 31ad90b018
commit d2ef0622c9
No known key found for this signature in database
GPG key ID: 0E75A301420E48F8
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
paper-api-generator/generated/io/papermc/paper/registry/keys/BiomeKeys.java
View file

@ -250,7 +250,7 @@ public final class BiomeKeys {
* @apiNote This field is version-dependant and may be removed in future Minecraft versions * @apiNote This field is version-dependant and may be removed in future Minecraft versions
*/ */
@ApiStatus.Experimental @ApiStatus.Experimental
@MinecraftExperimental("update 1.21") @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
public static final TypedKey<Biome> MANGROVE_SWAMP = create(key("mangrove_swamp")); public static final TypedKey<Biome> MANGROVE_SWAMP = create(key("mangrove_swamp"));
/** /**
@ -406,7 +406,7 @@ public final class BiomeKeys {
* @apiNote This field is version-dependant and may be removed in future Minecraft versions * @apiNote This field is version-dependant and may be removed in future Minecraft versions
*/ */
@ApiStatus.Experimental @ApiStatus.Experimental
@MinecraftExperimental("update 1.21") @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
public static final TypedKey<Biome> SWAMP = create(key("swamp")); public static final TypedKey<Biome> SWAMP = create(key("swamp"));
/** /**

2
paper-api-generator/generated/io/papermc/paper/registry/keys/StructureKeys.java
View file

@ -229,7 +229,7 @@ public final class StructureKeys {
* @apiNote This field is version-dependant and may be removed in future Minecraft versions * @apiNote This field is version-dependant and may be removed in future Minecraft versions
*/ */
@ApiStatus.Experimental @ApiStatus.Experimental
@MinecraftExperimental("update 1.21") @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
public static final TypedKey<Structure> TRIAL_CHAMBERS = create(key("trial_chambers")); public static final TypedKey<Structure> TRIAL_CHAMBERS = create(key("trial_chambers"));
/** /**

4
paper-api-generator/generated/io/papermc/paper/registry/keys/TrimPatternKeys.java
View file

@ -33,7 +33,7 @@ public final class TrimPatternKeys {
* @apiNote This field is version-dependant and may be removed in future Minecraft versions * @apiNote This field is version-dependant and may be removed in future Minecraft versions
*/ */
@ApiStatus.Experimental @ApiStatus.Experimental
@MinecraftExperimental("update 1.21") @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
public static final TypedKey<TrimPattern> BOLT = create(key("bolt")); public static final TypedKey<TrimPattern> BOLT = create(key("bolt"));
/** /**
@ -63,7 +63,7 @@ public final class TrimPatternKeys {
* @apiNote This field is version-dependant and may be removed in future Minecraft versions * @apiNote This field is version-dependant and may be removed in future Minecraft versions
*/ */
@ApiStatus.Experimental @ApiStatus.Experimental
@MinecraftExperimental("update 1.21") @MinecraftExperimental(MinecraftExperimental.Requires.UPDATE_1_21)
public static final TypedKey<TrimPattern> FLOW = create(key("flow")); public static final TypedKey<TrimPattern> FLOW = create(key("flow"));
/** /**

6
paper-api-generator/src/main/java/io/papermc/generator/types/GeneratedKeyType.java
View file

@ -130,15 +130,15 @@ public class GeneratedKeyType<T, A> extends SimpleGenerator {
.initializer("$N(key($S))", createMethod.build(), keyPath) .initializer("$N(key($S))", createMethod.build(), keyPath)
.addJavadoc(Javadocs.getVersionDependentField("{@code $L}"), key.location().toString()); .addJavadoc(Javadocs.getVersionDependentField("{@code $L}"), key.location().toString());
if (experimental.contains(key)) { if (experimental.contains(key)) {
fieldBuilder.addAnnotations(experimentalAnnotations("update 1.21")); fieldBuilder.addAnnotations(experimentalAnnotations("MinecraftExperimental.Requires.UPDATE_1_21"));
} else { } else {
allExperimental = false; allExperimental = false;
} }
typeBuilder.addField(fieldBuilder.build()); typeBuilder.addField(fieldBuilder.build());
} }
if (allExperimental) { if (allExperimental) {
typeBuilder.addAnnotations(experimentalAnnotations("update 1.21")); typeBuilder.addAnnotations(experimentalAnnotations("MinecraftExperimental.Requires.UPDATE_1_21"));
createMethod.addAnnotations(experimentalAnnotations("update 1.21")); createMethod.addAnnotations(experimentalAnnotations("MinecraftExperimental.Requires.UPDATE_1_21"));
} }
return typeBuilder.addMethod(createMethod.build()).build(); return typeBuilder.addMethod(createMethod.build()).build();
} }

2
paper-api-generator/src/main/java/io/papermc/generator/utils/Annotations.java
View file

@ -16,7 +16,7 @@ public final class Annotations {
return List.of( return List.of(
AnnotationSpec.builder(ApiStatus.Experimental.class).build(), AnnotationSpec.builder(ApiStatus.Experimental.class).build(),
AnnotationSpec.builder(MinecraftExperimental.class) AnnotationSpec.builder(MinecraftExperimental.class)
.addMember("value", "$S", version) .addMember("value", "$L", version)
.build() .build()
); );
} }

6
patches/api/0442-add-missing-Experimental-annotations.patch
View file

@ -832,14 +832,14 @@ index 375172e05a78611deb3003f780867516cb6cd1a4..b31a8ff47e28440b5e91ddd2fe3f07fd
MUSIC_CREATIVE("music.creative"), MUSIC_CREATIVE("music.creative"),
MUSIC_CREDITS("music.credits"), MUSIC_CREDITS("music.credits"),
diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
index cb5890e0e7bccfee2ba32dd4776f1ae1fdd539e8..7f1dc4288c2d324281e11dc582b6f4ef54bde632 100644 index cb5890e0e7bccfee2ba32dd4776f1ae1fdd539e8..511980c6d190fb80e23d0015dee5ee170bb673ac 100644
--- a/src/main/java/org/bukkit/Tag.java --- a/src/main/java/org/bukkit/Tag.java
+++ b/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java
@@ -1234,6 +1234,7 @@ public interface Tag<T extends Keyed> extends Keyed { @@ -1234,6 +1234,7 @@ public interface Tag<T extends Keyed> extends Keyed {
/** /**
* Vanilla tag representing entities which deflect projectiles. * Vanilla tag representing entities which deflect projectiles.
*/ */
+ @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation + @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental(value = MinecraftExperimental.Requires.UPDATE_1_21) // Paper - add missing annotation
Tag<EntityType> ENTITY_TYPES_DEFLECTS_PROJECTILES = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("deflects_projectiles"), EntityType.class); Tag<EntityType> ENTITY_TYPES_DEFLECTS_PROJECTILES = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("deflects_projectiles"), EntityType.class);
/** /**
* Vanilla tag representing entities which deflect arrows. * Vanilla tag representing entities which deflect arrows.
@ -847,7 +847,7 @@ index cb5890e0e7bccfee2ba32dd4776f1ae1fdd539e8..7f1dc4288c2d324281e11dc582b6f4ef
/** /**
* Vanilla tag representing entities which can turn in boats. * Vanilla tag representing entities which can turn in boats.
*/ */
+ @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation + @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental(value = MinecraftExperimental.Requires.UPDATE_1_21) // Paper - add missing annotation
Tag<EntityType> ENTITY_TYPES_CAN_TURN_IN_BOATS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("can_turn_in_boats"), EntityType.class); Tag<EntityType> ENTITY_TYPES_CAN_TURN_IN_BOATS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("can_turn_in_boats"), EntityType.class);
/** /**
* Vanilla tag representing all entities sensitive to illager enchantments. * Vanilla tag representing all entities sensitive to illager enchantments.