From 2b04a0a41245198cde92122ec3587b97154e158c Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Thu, 31 Oct 2024 20:35:06 -0700 Subject: bunch more general fixes --- .../papermc/paper/registry/keys/AttributeKeys.java | 259 +++++++++++++++++++++ .../io/papermc/paper/registry/keys/FluidKeys.java | 70 ++++++ .../papermc/paper/registry/keys/GameEventKeys.java | 9 +- .../main/java/io/papermc/generator/Generators.java | 6 +- 4 files changed, 342 insertions(+), 2 deletions(-) create mode 100644 paper-api-generator/generated/io/papermc/paper/registry/keys/AttributeKeys.java create mode 100644 paper-api-generator/generated/io/papermc/paper/registry/keys/FluidKeys.java (limited to 'paper-api-generator') diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/AttributeKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/AttributeKeys.java new file mode 100644 index 0000000000..563ddf0af4 --- /dev/null +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/AttributeKeys.java @@ -0,0 +1,259 @@ +package io.papermc.paper.registry.keys; + +import static net.kyori.adventure.key.Key.key; + +import io.papermc.paper.generated.GeneratedFrom; +import io.papermc.paper.registry.RegistryKey; +import io.papermc.paper.registry.TypedKey; +import net.kyori.adventure.key.Key; +import org.bukkit.attribute.Attribute; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.jetbrains.annotations.ApiStatus; + +/** + * Vanilla keys for {@link RegistryKey#ATTRIBUTE}. + * + * @apiNote The fields provided here are a direct representation of + * what is available from the vanilla game source. They may be + * changed (including removals) on any Minecraft version + * bump, so cross-version compatibility is not provided on the + * same level as it is on most of the other API. + */ +@SuppressWarnings({ + "unused", + "SpellCheckingInspection" +}) +@GeneratedFrom("1.21.3") +@ApiStatus.Experimental +public final class AttributeKeys { + /** + * {@code minecraft:armor} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey ARMOR = create(key("armor")); + + /** + * {@code minecraft:armor_toughness} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey ARMOR_TOUGHNESS = create(key("armor_toughness")); + + /** + * {@code minecraft:attack_damage} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey ATTACK_DAMAGE = create(key("attack_damage")); + + /** + * {@code minecraft:attack_knockback} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey ATTACK_KNOCKBACK = create(key("attack_knockback")); + + /** + * {@code minecraft:attack_speed} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey ATTACK_SPEED = create(key("attack_speed")); + + /** + * {@code minecraft:block_break_speed} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey BLOCK_BREAK_SPEED = create(key("block_break_speed")); + + /** + * {@code minecraft:block_interaction_range} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey BLOCK_INTERACTION_RANGE = create(key("block_interaction_range")); + + /** + * {@code minecraft:burning_time} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey BURNING_TIME = create(key("burning_time")); + + /** + * {@code minecraft:entity_interaction_range} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey ENTITY_INTERACTION_RANGE = create(key("entity_interaction_range")); + + /** + * {@code minecraft:explosion_knockback_resistance} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey EXPLOSION_KNOCKBACK_RESISTANCE = create(key("explosion_knockback_resistance")); + + /** + * {@code minecraft:fall_damage_multiplier} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey FALL_DAMAGE_MULTIPLIER = create(key("fall_damage_multiplier")); + + /** + * {@code minecraft:flying_speed} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey FLYING_SPEED = create(key("flying_speed")); + + /** + * {@code minecraft:follow_range} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey FOLLOW_RANGE = create(key("follow_range")); + + /** + * {@code minecraft:gravity} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey GRAVITY = create(key("gravity")); + + /** + * {@code minecraft:jump_strength} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey JUMP_STRENGTH = create(key("jump_strength")); + + /** + * {@code minecraft:knockback_resistance} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey KNOCKBACK_RESISTANCE = create(key("knockback_resistance")); + + /** + * {@code minecraft:luck} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey LUCK = create(key("luck")); + + /** + * {@code minecraft:max_absorption} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey MAX_ABSORPTION = create(key("max_absorption")); + + /** + * {@code minecraft:max_health} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey MAX_HEALTH = create(key("max_health")); + + /** + * {@code minecraft:mining_efficiency} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey MINING_EFFICIENCY = create(key("mining_efficiency")); + + /** + * {@code minecraft:movement_efficiency} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey MOVEMENT_EFFICIENCY = create(key("movement_efficiency")); + + /** + * {@code minecraft:movement_speed} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey MOVEMENT_SPEED = create(key("movement_speed")); + + /** + * {@code minecraft:oxygen_bonus} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey OXYGEN_BONUS = create(key("oxygen_bonus")); + + /** + * {@code minecraft:safe_fall_distance} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey SAFE_FALL_DISTANCE = create(key("safe_fall_distance")); + + /** + * {@code minecraft:scale} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey SCALE = create(key("scale")); + + /** + * {@code minecraft:sneaking_speed} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey SNEAKING_SPEED = create(key("sneaking_speed")); + + /** + * {@code minecraft:spawn_reinforcements} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey SPAWN_REINFORCEMENTS = create(key("spawn_reinforcements")); + + /** + * {@code minecraft:step_height} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey STEP_HEIGHT = create(key("step_height")); + + /** + * {@code minecraft:submerged_mining_speed} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey SUBMERGED_MINING_SPEED = create(key("submerged_mining_speed")); + + /** + * {@code minecraft:sweeping_damage_ratio} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey SWEEPING_DAMAGE_RATIO = create(key("sweeping_damage_ratio")); + + /** + * {@code minecraft:tempt_range} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey TEMPT_RANGE = create(key("tempt_range")); + + /** + * {@code minecraft:water_movement_efficiency} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey WATER_MOVEMENT_EFFICIENCY = create(key("water_movement_efficiency")); + + private AttributeKeys() { + } + + private static @NonNull TypedKey create(final @NonNull Key key) { + return TypedKey.create(RegistryKey.ATTRIBUTE, key); + } +} diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/FluidKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/FluidKeys.java new file mode 100644 index 0000000000..673b816854 --- /dev/null +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/FluidKeys.java @@ -0,0 +1,70 @@ +package io.papermc.paper.registry.keys; + +import static net.kyori.adventure.key.Key.key; + +import io.papermc.paper.generated.GeneratedFrom; +import io.papermc.paper.registry.RegistryKey; +import io.papermc.paper.registry.TypedKey; +import net.kyori.adventure.key.Key; +import org.bukkit.Fluid; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.jetbrains.annotations.ApiStatus; + +/** + * Vanilla keys for {@link RegistryKey#FLUID}. + * + * @apiNote The fields provided here are a direct representation of + * what is available from the vanilla game source. They may be + * changed (including removals) on any Minecraft version + * bump, so cross-version compatibility is not provided on the + * same level as it is on most of the other API. + */ +@SuppressWarnings({ + "unused", + "SpellCheckingInspection" +}) +@GeneratedFrom("1.21.3") +@ApiStatus.Experimental +public final class FluidKeys { + /** + * {@code minecraft:empty} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey EMPTY = create(key("empty")); + + /** + * {@code minecraft:flowing_lava} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey FLOWING_LAVA = create(key("flowing_lava")); + + /** + * {@code minecraft:flowing_water} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey FLOWING_WATER = create(key("flowing_water")); + + /** + * {@code minecraft:lava} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey LAVA = create(key("lava")); + + /** + * {@code minecraft:water} + * + * @apiNote This field is version-dependant and may be removed in future Minecraft versions + */ + public static final TypedKey WATER = create(key("water")); + + private FluidKeys() { + } + + private static @NonNull TypedKey create(final @NonNull Key key) { + return TypedKey.create(RegistryKey.FLUID, key); + } +} diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/GameEventKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/GameEventKeys.java index d3751e33e2..80beed3ca2 100644 --- a/paper-api-generator/generated/io/papermc/paper/registry/keys/GameEventKeys.java +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/GameEventKeys.java @@ -449,7 +449,14 @@ public final class GameEventKeys { private GameEventKeys() { } - private static @NonNull TypedKey create(final @NonNull Key key) { + /** + * Creates a key for {@link GameEvent} in the registry {@code minecraft:game_event}. + * + * @param key the value's key in the registry + * @return a new typed key + */ + @ApiStatus.Experimental + public static @NonNull TypedKey create(final @NonNull Key key) { return TypedKey.create(RegistryKey.GAME_EVENT, key); } } diff --git a/paper-api-generator/src/main/java/io/papermc/generator/Generators.java b/paper-api-generator/src/main/java/io/papermc/generator/Generators.java index c46e0b2b61..0ff8225f51 100644 --- a/paper-api-generator/src/main/java/io/papermc/generator/Generators.java +++ b/paper-api-generator/src/main/java/io/papermc/generator/Generators.java @@ -8,9 +8,11 @@ import io.papermc.paper.registry.RegistryKey; import net.minecraft.core.Registry; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; +import org.bukkit.Fluid; import org.bukkit.GameEvent; import org.bukkit.JukeboxSong; import org.bukkit.MusicInstrument; +import org.bukkit.attribute.Attribute; import org.bukkit.block.Biome; import org.bukkit.block.BlockType; import org.bukkit.block.banner.PatternType; @@ -33,7 +35,7 @@ public interface Generators { SourceGenerator[] API = { // built-ins - simpleKey("GameEventKeys", GameEvent.class, Registries.GAME_EVENT, RegistryKey.GAME_EVENT, false), + simpleKey("GameEventKeys", GameEvent.class, Registries.GAME_EVENT, RegistryKey.GAME_EVENT, true), simpleKey("StructureTypeKeys", StructureType.class, Registries.STRUCTURE_TYPE, RegistryKey.STRUCTURE_TYPE, false), simpleKey("InstrumentKeys", MusicInstrument.class, Registries.INSTRUMENT, RegistryKey.INSTRUMENT, false), simpleKey("MobEffectKeys", PotionEffectType.class, Registries.MOB_EFFECT, RegistryKey.MOB_EFFECT, false), @@ -45,6 +47,8 @@ public interface Generators { simpleKey("VillagerTypeKeys", Villager.Type.class, Registries.VILLAGER_TYPE, RegistryKey.VILLAGER_TYPE, false), simpleKey("MapDecorationTypeKeys", MapCursor.Type.class, Registries.MAP_DECORATION_TYPE, RegistryKey.MAP_DECORATION_TYPE, false), simpleKey("MenuTypeKeys", MenuType.class, Registries.MENU, RegistryKey.MENU, false), + simpleKey("AttributeKeys", Attribute.class, Registries.ATTRIBUTE, RegistryKey.ATTRIBUTE, false), + simpleKey("FluidKeys", Fluid.class, Registries.FLUID, RegistryKey.FLUID, false), // data-driven simpleKey("BiomeKeys", Biome.class, Registries.BIOME, RegistryKey.BIOME, true), -- cgit v1.2.3