move #registryType a bit

Author: MrHell228

src/main/java/org/spongepowered/api/adventure/ChatType.java

@@ -48,11 +48,6 @@ static Builder builder() {
         return Sponge.game().builderProvider().provide(Builder.class);
     }
 
-    @Override
-    default DefaultedRegistryType<ChatType> registryType() {
-        return RegistryTypes.CHAT_TYPE;
-    }
-
     /**
      * Gets the translation key that would be used
      * to display the chat message.
@@ -69,6 +64,11 @@ default DefaultedRegistryType<ChatType> registryType() {
      */
     Style style();
 
+    @Override
+    default DefaultedRegistryType<ChatType> registryType() {
+        return RegistryTypes.CHAT_TYPE;
+    }
+
     /**
      * A builder to create {@link ChatType}s.
      */

src/main/java/org/spongepowered/api/data/type/ArtType.java

@@ -44,11 +44,6 @@ static Builder builder() {
         return Sponge.game().builderProvider().provide(Builder.class);
     }
 
-    @Override
-    default DefaultedRegistryType<ArtType> registryType() {
-        return RegistryTypes.ART_TYPE;
-    }
-
     /**
      * Gets the height in blocks this art piece spans.
      *
@@ -63,6 +58,11 @@ default DefaultedRegistryType<ArtType> registryType() {
      */
     int width();
 
+    @Override
+    default DefaultedRegistryType<ArtType> registryType() {
+        return RegistryTypes.ART_TYPE;
+    }
+
     interface Builder extends org.spongepowered.api.util.Builder<ArtType, Builder>, CopyableBuilder<ArtType, Builder> {
 
         Builder dimensions(int width, int height);

src/main/java/org/spongepowered/api/effect/sound/music/MusicDisc.java

@@ -38,16 +38,16 @@
 @CatalogedBy(MusicDiscs.class)
 public interface MusicDisc extends Taggable<MusicDisc> {
 
-    @Override
-    default DefaultedRegistryType<MusicDisc> registryType() {
-        return RegistryTypes.MUSIC_DISC;
-    }
-
     /**
      * Gets the {@link SoundType} that is used
      * by this {@link MusicDisc}.
      *
      * @return The sound type
      */
     SoundType sound();
+
+    @Override
+    default DefaultedRegistryType<MusicDisc> registryType() {
+        return RegistryTypes.MUSIC_DISC;
+    }
 }

src/main/java/org/spongepowered/api/world/generation/carver/Carver.java

@@ -47,18 +47,18 @@ static Carver.Builder builder() {
         return Sponge.game().builderProvider().provide(Carver.Builder.class);
     }
 
-    @Override
-    default DefaultedRegistryType<Carver> registryType() {
-        return RegistryTypes.CARVER;
-    }
-
     /**
      * Returns the carver type
      *
      * @return The carver type
      */
     CarverType type();
 
+    @Override
+    default DefaultedRegistryType<Carver> registryType() {
+        return RegistryTypes.CARVER;
+    }
+
     /**
      * A builder to create {@link Carver}s.
      */

src/main/java/org/spongepowered/api/world/generation/config/noise/DensityFunction.java

@@ -34,11 +34,6 @@
 @CatalogedBy(DensityFunctions.class)
 public interface DensityFunction extends Taggable<DensityFunction>, DataPackSerializable {
 
-    @Override
-    default DefaultedRegistryType<DensityFunction> registryType() {
-        return RegistryTypes.DENSITY_FUNCTION;
-    }
-
     /**
      * Returns the minimum value possible.
      * @return The minimum value
@@ -68,4 +63,9 @@ default DefaultedRegistryType<DensityFunction> registryType() {
      * @return The noise value at given position
      */
     double compute(int x, int y, int z);
+
+    @Override
+    default DefaultedRegistryType<DensityFunction> registryType() {
+        return RegistryTypes.DENSITY_FUNCTION;
+    }
 }

src/main/java/org/spongepowered/api/world/generation/config/noise/Noise.java

@@ -49,11 +49,6 @@ static Noise.Builder builder() {
         return Sponge.game().builderProvider().provide(Noise.Builder.class);
     }
 
-    @Override
-    default DefaultedRegistryType<Noise> registryType() {
-        return RegistryTypes.NOISE;
-    }
-
     /**
      * Returns the first octave
      *
@@ -68,6 +63,11 @@ default DefaultedRegistryType<Noise> registryType() {
      */
     List<Double> amplitudes();
 
+    @Override
+    default DefaultedRegistryType<Noise> registryType() {
+        return RegistryTypes.NOISE;
+    }
+
     /**
      * A builder to create {@link Noise}s.
      */

src/main/java/org/spongepowered/api/world/generation/feature/Feature.java

@@ -52,11 +52,6 @@ static Feature.Builder builder() {
         return Sponge.game().builderProvider().provide(Feature.Builder.class);
     }
 
-    @Override
-    default DefaultedRegistryType<Feature> registryType() {
-        return RegistryTypes.FEATURE;
-    }
-
     /**
      * Returns the feature type.
      *
@@ -91,6 +86,11 @@ default DefaultedRegistryType<Feature> registryType() {
      */
     boolean place(ServerLocation location);
 
+    @Override
+    default DefaultedRegistryType<Feature> registryType() {
+        return RegistryTypes.FEATURE;
+    }
+
     /**
      * A builder to create {@link Feature}s.
      */

src/main/java/org/spongepowered/api/world/generation/feature/PlacedFeature.java

@@ -53,11 +53,6 @@ static PlacedFeature.Builder builder() {
         return Sponge.game().builderProvider().provide(PlacedFeature.Builder.class);
     }
 
-    @Override
-    default DefaultedRegistryType<PlacedFeature> registryType() {
-        return RegistryTypes.PLACED_FEATURE;
-    }
-
     /**
      * Returns the feature.
      *
@@ -91,6 +86,11 @@ default DefaultedRegistryType<PlacedFeature> registryType() {
      */
     boolean place(ServerLocation location);
 
+    @Override
+    default DefaultedRegistryType<PlacedFeature> registryType() {
+        return RegistryTypes.PLACED_FEATURE;
+    }
+
     /**
      * A builder to create {@link PlacedFeature}s.
      */

src/main/java/org/spongepowered/api/world/generation/structure/Structure.java

@@ -48,11 +48,6 @@
 @CatalogedBy(Structures.class)
 public interface Structure extends Taggable<Structure>, DataPackSerializable {
 
-    @Override
-    default DefaultedRegistryType<Structure> registryType() {
-        return RegistryTypes.STRUCTURE;
-    }
-
     /**
      * Places the structure at given position and world
      *
@@ -108,6 +103,11 @@ default DefaultedRegistryType<Structure> registryType() {
      */
     DataView toContainer();
 
+    @Override
+    default DefaultedRegistryType<Structure> registryType() {
+        return RegistryTypes.STRUCTURE;
+    }
+
     interface StructureNaturalSpawner {
 
         /**

src/main/java/org/spongepowered/api/world/generation/structure/StructureSet.java

@@ -39,11 +39,6 @@
 @CatalogedBy(StructureSets.class)
 public interface StructureSet extends Taggable<StructureSet>, DataPackSerializable {
 
-    @Override
-    default DefaultedRegistryType<StructureSet> registryType() {
-        return RegistryTypes.STRUCTURE_SET;
-    }
-
     /**
      * Creates a new {@link Builder} to create a {@link StructureSet}.
      *
@@ -67,6 +62,11 @@ static StructureSet.Builder builder() {
      */
     StructurePlacement placement();
 
+    @Override
+    default DefaultedRegistryType<StructureSet> registryType() {
+        return RegistryTypes.STRUCTURE_SET;
+    }
+
     /**
      * A builder to create {@link StructureSet}s.
      */