generate unregistered tags

Author: Lulu13022002

paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/DamageTypeTagKeys.java

@@ -81,6 +81,13 @@ public final class DamageTypeTagKeys {
      */
     public static final TagKey<DamageType> BYPASSES_ARMOR = create(key("bypasses_armor"));
 
+    /**
+     * {@code #minecraft:bypasses_cooldown}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> BYPASSES_COOLDOWN = create(key("bypasses_cooldown"));
+
     /**
      * {@code #minecraft:bypasses_effects}
      *

paper-api/src/main/java/io/papermc/paper/registry/RegistryElement.java

@@ -6,16 +6,21 @@
 import org.jspecify.annotations.NullMarked;
 
 /**
- * An element in a registry which might be tied into it.
+ * An element of a registry which might or might not be registered.
  * <p>
- * For key-less element all the methods in this interface will return {@code false}
+ * For unregistered element, the equality methods exposed here will return {@code false}
+ * as there's no way to identify them with a key.
+ *
+ * @see RegistryKey
+ * @see org.bukkit.Registry
+ * @see org.bukkit.Registry#getKey(Keyed)
  */
 @NullMarked
 public interface RegistryElement<T> {
 
     /**
-     * Checks whether this element is equivalent to the
-     * given key extracted from this keyed type.
+     * Checks whether this element is identified by the
+     * given key extracted from this keyed.
      *
      * @param type the keyed to extract the key from
      * @return the result
@@ -25,8 +30,7 @@ default boolean is(Keyed type) {
     }
 
     /**
-     * Checks whether this element is equivalent to the
-     * given key type.
+     * Checks whether this element is identified by the given key.
      *
      * @param type the key
      * @return the result

paper-api/src/main/java/io/papermc/paper/registry/set/RegistrySet.java

@@ -41,7 +41,7 @@ static <T> RegistryValueSet<T> valueSet(final RegistryKey<T> registryKey, final
     /**
      * Creates a {@link RegistryKeySet} from registry-backed values.
      * <p>All values provided <b>must</b> have keys in the given registry.
-     * <!--For anonymous values, use {@link #valueSet(RegistryKey, Iterable)}--></p>
+     * For anonymous values, use {@link #valueSet(RegistryKey, Iterable)}.</p>
      * <p>If references to actual objects are not available yet, use {@link #keySet(RegistryKey, Iterable)} to
      * create an equivalent {@link RegistryKeySet} using just {@link TypedKey TypedKeys}.</p>
      *

paper-api/src/main/java/org/bukkit/GameEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit;
 
-import java.util.Collection;
 import io.papermc.paper.registry.RegistryElement;
+import java.util.Collection;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.key.KeyPattern;
 import org.jetbrains.annotations.NotNull;

paper-api/src/main/java/org/bukkit/block/BlockType.java

@@ -1,8 +1,8 @@
 package org.bukkit.block;
 
+import io.papermc.paper.registry.RegistryElement;
 import java.util.Collection;
 import java.util.function.Consumer;
-import io.papermc.paper.registry.RegistryElement;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.key.KeyPattern;
 import org.bukkit.Keyed;

paper-api/src/main/java/org/bukkit/entity/EntityType.java

@@ -41,7 +41,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-// todo RegistryElement
 public enum EntityType implements Keyed, Translatable, net.kyori.adventure.translation.Translatable, io.papermc.paper.world.flag.FeatureDependant { // Paper - translatable
 
     // Start generate - EntityType

paper-api/src/main/java/org/bukkit/entity/Villager.java

@@ -1,10 +1,10 @@
 package org.bukkit.entity;
 
 import com.google.common.base.Preconditions;
-import java.util.Locale;
-import java.util.Map; // Paper
-import java.util.UUID; // Paper
 import io.papermc.paper.registry.RegistryElement;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.key.KeyPattern;
 import org.bukkit.Keyed;

paper-generator/src/main/java/io/papermc/generator/registry/RegistryBootstrapper.java

@@ -22,13 +22,13 @@ public static void bootstrap(List<SourceGenerator> generators) {
         RegistryEntries.forEach(entry -> {
             generators.add(new GeneratedKeyType<>(PAPER_REGISTRY_PACKAGE + ".keys", entry));
             if (entry.registry().listTags().findAny().isPresent()) {
-                generators.add(new GeneratedTagKeyType(entry, PAPER_REGISTRY_PACKAGE + ".keys.tags"));
+                generators.add(new GeneratedTagKeyType<>(entry, PAPER_REGISTRY_PACKAGE + ".keys.tags"));
             }
         });
 
         // todo remove once entity type and potion are both a registry
-        generators.add(new GeneratedTagKeyType(RegistryEntries.byRegistryKey(Registries.ENTITY_TYPE), PAPER_REGISTRY_PACKAGE + ".keys.tags"));
-        generators.add(new GeneratedTagKeyType(RegistryEntries.byRegistryKey(Registries.POTION), PAPER_REGISTRY_PACKAGE + ".keys.tags"));
+        generators.add(new GeneratedTagKeyType<>(RegistryEntries.byRegistryKey(Registries.ENTITY_TYPE), PAPER_REGISTRY_PACKAGE + ".keys.tags"));
+        generators.add(new GeneratedTagKeyType<>(RegistryEntries.byRegistryKey(Registries.POTION), PAPER_REGISTRY_PACKAGE + ".keys.tags"));
     }
 
     public static void bootstrap(PatternSourceSetRewriter apiSourceSet, PatternSourceSetRewriter serverSourceSet) {

paper-generator/src/main/java/io/papermc/generator/registry/RegistryEntries.java

@@ -40,6 +40,7 @@
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.dialog.Dialogs;
 import net.minecraft.sounds.SoundEvents;
+import net.minecraft.tags.DamageTypeTags;
 import net.minecraft.world.damagesource.DamageTypes;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.ai.attributes.Attributes;
@@ -185,7 +186,7 @@ private static <T> RegistryEntry<T> inconsistentEntry(ResourceKey<? extends Regi
         entry(Registries.STRUCTURE, BuiltinStructures.class, Structure.class).delayed(),
         entry(Registries.TRIM_MATERIAL, TrimMaterials.class, TrimMaterial.class).allowDirect().delayed(),
         entry(Registries.TRIM_PATTERN, TrimPatterns.class, TrimPattern.class).allowDirect().delayed(),
-        entry(Registries.DAMAGE_TYPE, DamageTypes.class, DamageType.class).writableApiRegistryBuilder(DamageTypeRegistryEntry.Builder.class, "PaperDamageTypeRegistryEntry.PaperBuilder").delayed(),
+        entry(Registries.DAMAGE_TYPE, DamageTypes.class, DamageType.class).writableApiRegistryBuilder(DamageTypeRegistryEntry.Builder.class, "PaperDamageTypeRegistryEntry.PaperBuilder").unregisteredTags(List.of(DamageTypeTags.BYPASSES_COOLDOWN)).delayed(),
         entry(Registries.WOLF_VARIANT, WolfVariants.class, Wolf.Variant.class).writableApiRegistryBuilder(WolfVariantRegistryEntry.Builder.class, "PaperWolfVariantRegistryEntry.PaperBuilder").delayed(),
         entry(Registries.WOLF_SOUND_VARIANT, WolfSoundVariants.class, Wolf.SoundVariant.class),
         entry(Registries.ENCHANTMENT, Enchantments.class, Enchantment.class).writableApiRegistryBuilder(EnchantmentRegistryEntry.Builder.class, "PaperEnchantmentRegistryEntry.PaperBuilder").serializationUpdater("ENCHANTMENT_RENAME").delayed(),

paper-generator/src/main/java/io/papermc/generator/registry/RegistryEntry.java

@@ -9,13 +9,17 @@
 import java.lang.reflect.ParameterizedType;
 import java.util.Collections;
 import java.util.IdentityHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.stream.Stream;
 import javax.lang.model.SourceVersion;
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.tags.TagKey;
 import org.bukkit.Keyed;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
@@ -42,6 +46,7 @@ public final class RegistryEntry<T> {
     private String apiAccessName = ConstantDescs.INIT_NAME;
     private Optional<String> apiRegistryField = Optional.empty();
     private int genericArgCount = 0;
+    private @Nullable List<TagKey<T>> unregisteredTags;
 
     private @Nullable Map<ResourceKey<T>, String> fieldNames;
 
@@ -111,6 +116,11 @@ public RegistryEntry<T> serializationUpdater(String fieldName) {
         return this;
     }
 
+    public RegistryEntry<T> unregisteredTags(List<TagKey<T>> keys) {
+        this.unregisteredTags = keys;
+        return this;
+    }
+
     public boolean canAllowDirect() {
         return this.allowDirect;
     }
@@ -131,6 +141,23 @@ public Class<?> preloadClass() {
         return this.fieldRename;
     }
 
+    public void lookupTagKeys(Consumer<TagKey<T>> callback) {
+        this.registry().listTagIds().forEach(callback);
+
+        if (this.unregisteredTags != null) {
+            this.unregisteredTags.forEach(callback);
+        }
+    }
+
+    public Stream<TagKey<T>> tagKeys() {
+        Stream<TagKey<T>> keys = this.registry().listTagIds();
+
+        if (this.unregisteredTags != null) {
+            keys = Stream.concat(keys, this.unregisteredTags.stream());
+        }
+        return keys;
+    }
+
     public @Nullable Class<?> apiRegistryBuilder() {
         return this.apiRegistryBuilder;
     }