update generator

2 files changed, 56 insertions, 55 deletions

diff --git a/paper-api-generator/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/paper-api-generator/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java
index c7f171b77d..7ff40b6c33 100644
--- a/paper-api-generator/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+++ b/paper-api-generator/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java
@@ -1122,7 +1122,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
     )
     GoalKey<Mob> UNIVERSAL_ANGER_RESET = create("universal_anger_reset", Mob.class);
 
-    private static @NotNull GoalKey create(final @NotNull String key, final @NotNull Class clazz) {
-        return GoalKey.of(clazz, NamespacedKey.minecraft(key));
+    private static <T extends Mob> @NotNull GoalKey<T> create(final @NotNull String key,
+            final @NotNull Class<T> type) {
+        return GoalKey.of(type, NamespacedKey.minecraft(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 97ee8b7e15..26ce70c2ab 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
@@ -125,6 +125,13 @@ public final class GameEventKeys {
     public static final TypedKey<GameEvent> ELYTRA_GLIDE = create(key("elytra_glide"));
 
     /**
+     * {@code minecraft:entity_action}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameEvent> ENTITY_ACTION = create(key("entity_action"));
+
+    /**
      * {@code minecraft:entity_damage}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
@@ -167,13 +174,6 @@ public final class GameEventKeys {
     public static final TypedKey<GameEvent> ENTITY_PLACE = create(key("entity_place"));
 
     /**
-     * {@code minecraft:entity_action}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<GameEvent> ENTITY_ACTION = create(key("entity_action"));
-
-    /**
      * {@code minecraft:equip}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
@@ -286,165 +286,165 @@ public final class GameEventKeys {
     public static final TypedKey<GameEvent> PROJECTILE_SHOOT = create(key("projectile_shoot"));
 
     /**
-     * {@code minecraft:sculk_sensor_tendrils_clicking}
+     * {@code minecraft:resonate_1}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> SCULK_SENSOR_TENDRILS_CLICKING = create(key("sculk_sensor_tendrils_clicking"));
+    public static final TypedKey<GameEvent> RESONATE_1 = create(key("resonate_1"));
 
     /**
-     * {@code minecraft:shear}
+     * {@code minecraft:resonate_2}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> SHEAR = create(key("shear"));
+    public static final TypedKey<GameEvent> RESONATE_2 = create(key("resonate_2"));
 
     /**
-     * {@code minecraft:shriek}
+     * {@code minecraft:resonate_3}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> SHRIEK = create(key("shriek"));
+    public static final TypedKey<GameEvent> RESONATE_3 = create(key("resonate_3"));
 
     /**
-     * {@code minecraft:splash}
+     * {@code minecraft:resonate_4}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> SPLASH = create(key("splash"));
+    public static final TypedKey<GameEvent> RESONATE_4 = create(key("resonate_4"));
 
     /**
-     * {@code minecraft:step}
+     * {@code minecraft:resonate_5}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> STEP = create(key("step"));
+    public static final TypedKey<GameEvent> RESONATE_5 = create(key("resonate_5"));
 
     /**
-     * {@code minecraft:swim}
+     * {@code minecraft:resonate_6}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> SWIM = create(key("swim"));
+    public static final TypedKey<GameEvent> RESONATE_6 = create(key("resonate_6"));
 
     /**
-     * {@code minecraft:teleport}
+     * {@code minecraft:resonate_7}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> TELEPORT = create(key("teleport"));
+    public static final TypedKey<GameEvent> RESONATE_7 = create(key("resonate_7"));
 
     /**
-     * {@code minecraft:unequip}
+     * {@code minecraft:resonate_8}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> UNEQUIP = create(key("unequip"));
+    public static final TypedKey<GameEvent> RESONATE_8 = create(key("resonate_8"));
 
     /**
-     * {@code minecraft:resonate_1}
+     * {@code minecraft:resonate_9}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> RESONATE_1 = create(key("resonate_1"));
+    public static final TypedKey<GameEvent> RESONATE_9 = create(key("resonate_9"));
 
     /**
-     * {@code minecraft:resonate_2}
+     * {@code minecraft:resonate_10}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> RESONATE_2 = create(key("resonate_2"));
+    public static final TypedKey<GameEvent> RESONATE_10 = create(key("resonate_10"));
 
     /**
-     * {@code minecraft:resonate_3}
+     * {@code minecraft:resonate_11}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> RESONATE_3 = create(key("resonate_3"));
+    public static final TypedKey<GameEvent> RESONATE_11 = create(key("resonate_11"));
 
     /**
-     * {@code minecraft:resonate_4}
+     * {@code minecraft:resonate_12}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> RESONATE_4 = create(key("resonate_4"));
+    public static final TypedKey<GameEvent> RESONATE_12 = create(key("resonate_12"));
 
     /**
-     * {@code minecraft:resonate_5}
+     * {@code minecraft:resonate_13}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> RESONATE_5 = create(key("resonate_5"));
+    public static final TypedKey<GameEvent> RESONATE_13 = create(key("resonate_13"));
 
     /**
-     * {@code minecraft:resonate_6}
+     * {@code minecraft:resonate_14}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> RESONATE_6 = create(key("resonate_6"));
+    public static final TypedKey<GameEvent> RESONATE_14 = create(key("resonate_14"));
 
     /**
-     * {@code minecraft:resonate_7}
+     * {@code minecraft:resonate_15}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> RESONATE_7 = create(key("resonate_7"));
+    public static final TypedKey<GameEvent> RESONATE_15 = create(key("resonate_15"));
 
     /**
-     * {@code minecraft:resonate_8}
+     * {@code minecraft:sculk_sensor_tendrils_clicking}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> RESONATE_8 = create(key("resonate_8"));
+    public static final TypedKey<GameEvent> SCULK_SENSOR_TENDRILS_CLICKING = create(key("sculk_sensor_tendrils_clicking"));
 
     /**
-     * {@code minecraft:resonate_9}
+     * {@code minecraft:shear}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> RESONATE_9 = create(key("resonate_9"));
+    public static final TypedKey<GameEvent> SHEAR = create(key("shear"));
 
     /**
-     * {@code minecraft:resonate_10}
+     * {@code minecraft:shriek}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> RESONATE_10 = create(key("resonate_10"));
+    public static final TypedKey<GameEvent> SHRIEK = create(key("shriek"));
 
     /**
-     * {@code minecraft:resonate_11}
+     * {@code minecraft:splash}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> RESONATE_11 = create(key("resonate_11"));
+    public static final TypedKey<GameEvent> SPLASH = create(key("splash"));
 
     /**
-     * {@code minecraft:resonate_12}
+     * {@code minecraft:step}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> RESONATE_12 = create(key("resonate_12"));
+    public static final TypedKey<GameEvent> STEP = create(key("step"));
 
     /**
-     * {@code minecraft:resonate_13}
+     * {@code minecraft:swim}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> RESONATE_13 = create(key("resonate_13"));
+    public static final TypedKey<GameEvent> SWIM = create(key("swim"));
 
     /**
-     * {@code minecraft:resonate_14}
+     * {@code minecraft:teleport}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> RESONATE_14 = create(key("resonate_14"));
+    public static final TypedKey<GameEvent> TELEPORT = create(key("teleport"));
 
     /**
-     * {@code minecraft:resonate_15}
+     * {@code minecraft:unequip}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TypedKey<GameEvent> RESONATE_15 = create(key("resonate_15"));
+    public static final TypedKey<GameEvent> UNEQUIP = create(key("unequip"));
 
     private GameEventKeys() {
     }