Reduce API surface and remove some defaulted methods

Author: aromaa

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

@@ -37,7 +37,7 @@
  *
  * @param <T> The type
  */
-public interface RegistryKey<T> extends Comparable<RegistryKey<?>> {
+public interface RegistryKey<T> {
 
     static <T> RegistryKey<T> of(final RegistryType<T> registry, final ResourceKey location) {
         return Sponge.game().factoryProvider().provide(Factory.class).of(Objects.requireNonNull(registry, "registry"),
@@ -59,16 +59,6 @@ static <T> RegistryKey<T> of(final RegistryType<T> registry, final ResourceKey l
      */
     ResourceKey location();
 
-    @Override
-    default int compareTo(final RegistryKey<?> registryKey) {
-        final int registry = this.registry().compareTo(registryKey.registry());
-        if (registry != 0) {
-            return registry;
-        }
-
-        return this.location().compareTo(registryKey.location());
-    }
-
     /**
      * Generates a utility {@link RegistryReference reference} used to assist in querying a value from this key
      *

src/main/java/org/spongepowered/api/tag/DefaultedTag.java

@@ -29,7 +29,6 @@
 import org.spongepowered.api.registry.RegistryHolder;
 import org.spongepowered.api.registry.ValueNotFoundException;
 
-import java.util.Objects;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
@@ -45,12 +44,12 @@ static <T> DefaultedTag<T> of(final DefaultedRegistryType<T> registryType, final
     Supplier<RegistryHolder> defaultHolder();
 
     /**
-     * Returns the {@link Stream} of values tagged by this tag in the {@link #defaultHolder()}.
+     * Returns the {@link Stream} of values tagged by this tag.
      *
      * <p>Great care needs to be made in calling this method with any uncertainty as to
-     * if the {@link #registry()} will exist in the {@link #defaultHolder()}. Should the
-     * key lack a value, a {@link ValueNotFoundException} will be thrown. Therefore, it
-     * is advised to call {@link #findValues()} instead.</p>
+     * if the {@link #registry()} will exist in the holder. Should the key lack a value,
+     * a {@link ValueNotFoundException} will be thrown. Therefore, it is advised to call
+     * {@link #findValues()} instead.</p>
      *
      * @return The {@link Stream} of values
      */
@@ -59,7 +58,7 @@ default Stream<T> values() {
     }
 
     /**
-     * Returns the {@link Stream} of values tagged by this tag in the {@link #defaultHolder()}
+     * Returns the {@link Stream} of values tagged by this tag in the holder
      * if it contains this tag's {@link #registry()}, or {@link Stream#empty()} otherwise.
      *
      * @return The {@link Stream} of values
@@ -69,12 +68,10 @@ default Stream<T> findValues() {
     }
 
     /**
-     * Returns whether this tag is associated with the given value in the {@link #defaultHolder()}.
+     * Returns whether this tag is associated with the given value.
      *
      * @param value The value
-     * @return true if this tag is associated with the given value in the {@link #defaultHolder()}
+     * @return true if this tag is associated with the given value
      */
-    default boolean contains(final T value) {
-        return this.findValues().anyMatch(Objects.requireNonNull(value, "value")::equals);
-    }
+    boolean contains(T value);
 }

src/main/java/org/spongepowered/api/tag/Tag.java

@@ -50,7 +50,7 @@
  *     {@link BlockTypeTags#LOGS_THAT_BURN}</li>
  * </ul>
  */
-public interface Tag<T> extends ResourceKeyed, Comparable<Tag<?>> {
+public interface Tag<T> extends ResourceKeyed {
 
     static <T> Tag<T> of(final RegistryType<T> registryType, final ResourceKey key) {
         return Sponge.game().factoryProvider().provide(Tag.Factory.class).of(registryType, key);
@@ -63,16 +63,6 @@ static <T> Tag<T> of(final RegistryType<T> registryType, final ResourceKey key)
      */
     RegistryType<T> registry();
 
-    @Override
-    default int compareTo(final Tag<?> tag) {
-        final int registry = this.registry().compareTo(tag.registry());
-        if (registry != 0) {
-            return registry;
-        }
-
-        return this.key().compareTo(tag.key());
-    }
-
     DefaultedTag<T> asDefaultedTag(Supplier<RegistryHolder> holder);
 
     DefaultedTag<T> asScopedTag();

src/main/java/org/spongepowered/api/tag/Taggable.java

@@ -26,55 +26,29 @@
 
 import org.spongepowered.api.registry.DefaultedRegistryType;
 import org.spongepowered.api.registry.DefaultedRegistryValue;
-import org.spongepowered.api.registry.Registry;
-import org.spongepowered.api.registry.RegistryHolder;
 
-import java.util.Objects;
 import java.util.stream.Stream;
 
 /**
  * A type that may be included in one or more {@link Tag} collections.
  */
-@SuppressWarnings("unchecked")
 public interface Taggable<T extends Taggable<T>> extends DefaultedRegistryValue {
 
     /**
      * Gets all {@link Tag}s that have been associated with this object in the given registry.
      *
      * @return The {@link Stream} of {@link Tag}s.
      */
-    default Stream<Tag<T>> tags(final DefaultedRegistryType<T> registryType) {
-        final Registry<T> registry = Objects.requireNonNull(registryType, "registryType").get();
-        return registry.tags().filter(tag -> this.is(registry, tag));
-    }
-
-    /**
-     * Returns whether the given tag is associated with this object in the given registry holder.
-     *
-     * @param tag The tag
-     * @return true if the given tag is associated with this object in the given registry holder
-     */
-    default boolean is(final RegistryHolder registryHolder, final Tag<T> tag) {
-        return registryHolder.findRegistry(tag.registry()).map(r -> this.is(r, tag)).orElse(false);
-    }
-
-    /**
-     * Returns whether the given tag is associated with this object in the given registry.
-     *
-     * @param tag The tag
-     * @return true if the given tag is associated with this object in the given registry
-     */
-    default boolean is(final Registry<T> registry, final Tag<T> tag) {
-        return registry.taggedValues(tag).anyMatch(this::equals);
-    }
+    Stream<Tag<T>> tags(DefaultedRegistryType<T> registryType);
 
     /**
      * Returns whether the given tag is associated with this object.
      *
      * @param tag The tag
      * @return true if the given tag is associated with this object
      */
-    default boolean is(final DefaultedTag<T> tag) {
+    @SuppressWarnings("unchecked")
+    default boolean is(DefaultedTag<T> tag) {
         return tag.contains((T) this);
     }
 }