nuke RegistryValue, add overloads that take RegistrtHolder

Author: MrHell228

src/main/java/org/spongepowered/api/data/Keys.java

@@ -252,7 +252,6 @@
 import org.spongepowered.api.projectile.source.ProjectileSource;
 import org.spongepowered.api.raid.Raid;
 import org.spongepowered.api.raid.RaidWave;
-import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.statistic.Statistic;
 import org.spongepowered.api.tag.Tag;
 import org.spongepowered.api.util.Axis;
@@ -809,7 +808,7 @@ public final class Keys {
      * a {@link Player} uses the item. Can be used in tandem with the {@link #COOLDOWN} key
      * to apply a cooldown to said group. A group will differentiate a cooldown from the default
      * {@link ItemStackLike ItemStack} cooldown based on the
-     * {@link ItemType#key(DefaultedRegistryType) ResourceKey}.
+     * {@link ItemType#registryKey() ResourceKey}.
      */
     public static final Key<Value<ResourceKey>> COOLDOWN_GROUP = Keys.key(ResourceKey.sponge("cooldown_group"), ResourceKey.class);
 

src/main/java/org/spongepowered/api/registry/DefaultedRegistryValue.java

@@ -26,13 +26,16 @@
 
 import org.spongepowered.api.ResourceKey;
 
+import java.util.Objects;
 import java.util.Optional;
 
 /**
- * A {@link RegistryValue} that usually resides in a single {@link RegistryType}
+ * A Utility marker that assists in getting a {@link ResourceKey} for values
+ * that generally can be within a single {@link DefaultedRegistryType defaulted registry}
  * and therefore this registry can be considered as "default".
  */
-public interface DefaultedRegistryValue<T extends DefaultedRegistryValue<T>> extends RegistryValue<T> {
+@SuppressWarnings("unchecked")
+public interface DefaultedRegistryValue<T extends DefaultedRegistryValue<T>> {
 
     /**
      * Gets the default {@link RegistryType} for
@@ -50,7 +53,20 @@ public interface DefaultedRegistryValue<T extends DefaultedRegistryValue<T>> ext
      * this object in the default {@link #registryType()}
      */
     default ResourceKey registryKey() {
-        return this.key(this.registryType());
+        return this.registryType().get().valueKey((T) this);
+    }
+
+    /**
+     * Returns the {@link ResourceKey} associated with
+     * this object in the default {@link #registryType()}
+     * for the given {@link RegistryHolder}.
+     *
+     * @return The {@link ResourceKey} associated with
+     * this object in the default {@link #registryType()}
+     * for the given {@link RegistryHolder}
+     */
+    default ResourceKey registryKey(final RegistryHolder holder) {
+        return Objects.requireNonNull(holder, "holder").registry(this.registryType()).valueKey((T) this);
     }
 
     /**
@@ -61,7 +77,20 @@ default ResourceKey registryKey() {
      * this object in the default {@link #registryType()}, if found
      */
     default Optional<ResourceKey> findRegistryKey() {
-        return this.findKey(this.registryType());
+        return this.registryType().find().flatMap(r -> r.findValueKey((T) this));
+    }
+
+    /**
+     * Returns the {@link ResourceKey} associated with
+     * this object in the default {@link #registryType()}.
+     * for the given {@link RegistryHolder}, if found.
+     *
+     * @return The {@link ResourceKey} associated with
+     * this object in the default {@link #registryType()}
+     * for the given {@link RegistryHolder}, if found
+     */
+    default Optional<ResourceKey> findRegistryKey(final RegistryHolder holder) {
+        return Objects.requireNonNull(holder, "holder").findRegistry(this.registryType()).flatMap(r -> r.findValueKey((T) this));
     }
 
     /**
@@ -72,6 +101,20 @@ default Optional<ResourceKey> findRegistryKey() {
      * this object in the default {@link #registryType()}
      */
     default DefaultedRegistryReference<T> asDefaultedReference() {
-        return this.asDefaultedReference(this.registryType());
+        return RegistryKey.of(this.registryType(), this.registryKey()).asDefaultedReference(this.registryType().defaultHolder());
+    }
+
+    /**
+     * Returns the {@link DefaultedRegistryReference} for
+     * this object in the default {@link #registryType()}
+     * for the given {@link RegistryHolder}.
+     *
+     * @return The {@link DefaultedRegistryReference} for
+     * this object in the default {@link #registryType()}
+     * for the given {@link RegistryHolder}
+     */
+    default DefaultedRegistryReference<T> asDefaultedReference(final RegistryHolder holder) {
+        Objects.requireNonNull(holder, "holder");
+        return RegistryKey.of(this.registryType(), this.registryKey(holder)).asDefaultedReference(() -> holder);
     }
 }

src/main/java/org/spongepowered/api/registry/RegistryValue.java

@@ -25,11 +25,13 @@
 package org.spongepowered.api.tag;
 
 import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.registry.RegistryHolder;
 
-import java.util.Collection;
+import java.util.Objects;
+import java.util.stream.Stream;
 
 /**
- * A {@link DefaultedRegistryValue} that may be included in one or more {@link Tag} collections.
+ * A type that may be included in one or more {@link Tag} collections.
  */
 @SuppressWarnings("unchecked")
 public interface Taggable<T extends Taggable<T>> extends DefaultedRegistryValue<T> {
@@ -38,10 +40,21 @@ public interface Taggable<T extends Taggable<T>> extends DefaultedRegistryValue<
      * Gets all {@link Tag}s that have been associated
      * with this object in the default {@link #registryType()}.
      *
-     * @return THe {@link Collection} of {@link Tag}s
+     * @return THe {@link Stream} of {@link Tag}s
      */
-    default Collection<Tag<T>> tags() {
-        return this.registryType().get().tags().filter(this::is).toList();
+    default Stream<Tag<T>> tags() {
+        return this.registryType().get().tags().filter(this::is);
+    }
+
+    /**
+     * Gets all {@link Tag}s that have been associated
+     * with this object in the default {@link #registryType()}
+     * for the given {@link RegistryHolder}.
+     *
+     * @return THe {@link Stream} of {@link Tag}s
+     */
+    default Stream<Tag<T>> tags(final RegistryHolder holder) {
+        return Objects.requireNonNull(holder, "holder").registry(this.registryType()).tags().filter(tag -> this.is(holder, tag));
     }
 
     /**
@@ -55,4 +68,18 @@ default Collection<Tag<T>> tags() {
     default boolean is(final Tag<T> tag) {
         return this.registryType().get().taggedValues(tag).contains((T) this);
     }
+
+    /**
+     * Returns whether the given {@link Tag} is associated with
+     * this object in the default {@link #registryType()}
+     * for the given {@link RegistryHolder}.
+     *
+     * @param tag The tag
+     * @return true if the given {@link Tag} is associated with
+     * this object in the default {@link #registryType()}
+     * for the given {@link RegistryHolder}
+     */
+    default boolean is(final RegistryHolder holder, final Tag<T> tag) {
+        return Objects.requireNonNull(holder, "holder").registry(this.registryType()).taggedValues(tag).contains((T) this);
+    }
 }