Checkstyle fixes to patchwork-registries, checkstyle now fully passes!

coderbot16 · coderbot16 · commit 62ef3060eb61 · 2019-12-27T11:31:42.000-08:00
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/api/registries/ObjectHolderRegistry.java b/patchwork-registries/src/main/java/com/patchworkmc/api/registries/ObjectHolderRegistry.java
@@ -19,12 +19,17 @@
 
 package com.patchworkmc.api.registries;
 
-import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Consumer;
+
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
-import java.util.*;
-import java.util.function.Consumer;
+import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
 
 import com.patchworkmc.impl.registries.RegistryClassMapping;
 
@@ -41,13 +46,13 @@ private ObjectHolderRegistry() {
 	public <T> void register(Class<T> clazz, String namespace, String name, Consumer<T> consumer) {
 		Identifier registryId = RegistryClassMapping.getIdentifier(clazz);
 
-		if(registryId == null) {
+		if (registryId == null) {
 			throw new IllegalArgumentException("Could not add ObjectHolderRegistry mapping for class with unknown registry: " + clazz);
 		}
 
-		Registry<T> registry = (Registry<T>)Registry.REGISTRIES.get(registryId);
+		Registry<T> registry = (Registry<T>) Registry.REGISTRIES.get(registryId);
 
-		if(registry == null) {
+		if (registry == null) {
 			throw new NullPointerException("Vanilla registry " + registryId + " is not registered???");
 		}
 
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/impl/registries/ExtendedForgeRegistryEntry.java b/patchwork-registries/src/main/java/com/patchworkmc/impl/registries/ExtendedForgeRegistryEntry.java
@@ -19,27 +19,28 @@
 
 package com.patchworkmc.impl.registries;
 
-import net.minecraft.util.Identifier;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.registries.IForgeRegistryEntry;
 
+import net.minecraft.util.Identifier;
+
 public interface ExtendedForgeRegistryEntry<V> extends IForgeRegistryEntry<V> {
 	default IForgeRegistryEntry setRegistryName(String full) {
 		String activeNamespace = ModLoadingContext.get().getActiveNamespace();
 
-		if(activeNamespace == null || activeNamespace.equals("minecraft")) {
+		if (activeNamespace == null || activeNamespace.equals("minecraft")) {
 			System.err.println("Currently active namespace is minecraft while registering item: " + full);
 		}
 
 		Identifier identifier;
 
-		if(full.contains(":")) {
+		if (full.contains(":")) {
 			identifier = new Identifier(full);
 		} else {
 			identifier = new Identifier(activeNamespace, full);
 		}
 
-		if(!identifier.getNamespace().equals(activeNamespace)) {
+		if (!identifier.getNamespace().equals(activeNamespace)) {
 			System.err.printf("Potentially Dangerous alternative prefix `%s` for name `%s`, expected `%s`. This could be a intended override, but in most cases indicates a broken mod.\n", identifier.getNamespace(), identifier.getPath(), activeNamespace);
 		}
 
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/impl/registries/RegistryClassMapping.java b/patchwork-registries/src/main/java/com/patchworkmc/impl/registries/RegistryClassMapping.java
@@ -44,7 +44,7 @@
 public class RegistryClassMapping {
 	private static final Map<Identifier, Class> ID_TO_CLASS = new HashMap<>();
 	private static final Map<Class, Identifier> CLASS_TO_ID = new HashMap<>();
-	
+
 	static {
 		register(new Identifier("minecraft", "block"), Block.class);
 		register(new Identifier("minecraft", "item"), Item.class);
@@ -103,7 +103,7 @@ public static Identifier getIdentifier(Class<?> clazz) {
 
 		Class<?> superclass = clazz.getSuperclass();
 
-		if(superclass == null || superclass == Object.class) {
+		if (superclass == null || superclass == Object.class) {
 			return null;
 		} else {
 			return getIdentifier(superclass);
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBiome.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBiome.java
@@ -19,13 +19,14 @@
 
 package com.patchworkmc.mixin.registries;
 
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.world.biome.Biome;
 import net.minecraftforge.registries.IForgeRegistryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.world.biome.Biome;
+
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
 
 @Mixin(Biome.class)
@@ -41,7 +42,7 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.BIOME.getId((Biome)(Object)this);
+		Identifier current = Registry.BIOME.getId((Biome) (Object) this);
 		Identifier set = registryName;
 
 		return current != null ? current : set;
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBlock.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBlock.java
@@ -19,13 +19,14 @@
 
 package com.patchworkmc.mixin.registries;
 
-import net.minecraft.block.Block;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
 import net.minecraftforge.registries.IForgeRegistryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
+import net.minecraft.block.Block;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
 
 @Mixin(Block.class)
@@ -41,10 +42,10 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.BLOCK.getId((Block)(Object)this);
+		Identifier current = Registry.BLOCK.getId((Block) (Object) this);
 		Identifier set = registryName;
 
-		if(set == null) {
+		if (set == null) {
 			set = Registry.BLOCK.getDefaultId();
 		}
 
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinFeature.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinFeature.java
@@ -19,13 +19,14 @@
 
 package com.patchworkmc.mixin.registries;
 
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.world.gen.feature.Feature;
 import net.minecraftforge.registries.IForgeRegistryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.world.gen.feature.Feature;
+
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
 
 @Mixin(Feature.class)
@@ -41,7 +42,7 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.FEATURE.getId((Feature)(Object)this);
+		Identifier current = Registry.FEATURE.getId((Feature) (Object) this);
 		Identifier set = registryName;
 
 		return current != null ? current : set;
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinItem.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinItem.java
@@ -19,13 +19,14 @@
 
 package com.patchworkmc.mixin.registries;
 
-import net.minecraft.item.Item;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
 import net.minecraftforge.registries.IForgeRegistryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
+import net.minecraft.item.Item;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
 
 @Mixin(Item.class)
@@ -41,10 +42,10 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.ITEM.getId((Item)(Object)this);
+		Identifier current = Registry.ITEM.getId((Item) (Object) this);
 		Identifier set = registryName;
 
-		if(set == null) {
+		if (set == null) {
 			set = Registry.ITEM.getDefaultId();
 		}
 
diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSurfaceBuilder.java b/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSurfaceBuilder.java
@@ -19,13 +19,14 @@
 
 package com.patchworkmc.mixin.registries;
 
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder;
 import net.minecraftforge.registries.IForgeRegistryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder;
+
 import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry;
 
 @Mixin(SurfaceBuilder.class)
@@ -41,7 +42,7 @@ public IForgeRegistryEntry setRegistryName(Identifier name) {
 	}
 
 	public Identifier getRegistryName() {
-		Identifier current = Registry.SURFACE_BUILDER.getId((SurfaceBuilder)(Object)this);
+		Identifier current = Registry.SURFACE_BUILDER.getId((SurfaceBuilder) (Object) this);
 		Identifier set = registryName;
 
 		return current != null ? current : set;
diff --git a/patchwork-registries/src/main/java/net/minecraftforge/event/RegistryEvent.java b/patchwork-registries/src/main/java/net/minecraftforge/event/RegistryEvent.java
@@ -19,11 +19,12 @@
 
 package net.minecraftforge.event;
 
-import net.minecraft.util.Identifier;
 import net.minecraftforge.eventbus.api.GenericEvent;
 import net.minecraftforge.registries.IForgeRegistry;
 import net.minecraftforge.registries.IForgeRegistryEntry;
 
+import net.minecraft.util.Identifier;
+
 public class RegistryEvent<T> extends GenericEvent<T> {
 	// Required for post() to work
 	public RegistryEvent() {
diff --git a/patchwork-registries/src/main/java/net/minecraftforge/registries/ForgeRegistry.java b/patchwork-registries/src/main/java/net/minecraftforge/registries/ForgeRegistry.java
@@ -19,16 +19,24 @@
 
 package net.minecraftforge.registries;
 
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.DefaultedRegistry;
-import net.minecraft.util.registry.Registry;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.MarkerManager;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.DefaultedRegistry;
+import net.minecraft.util.registry.Registry;
 
 public class ForgeRegistry<V extends IForgeRegistryEntry<V>> implements IForgeRegistry<V> {
 	public static Marker REGISTRIES = MarkerManager.getMarker("REGISTRIES");
diff --git a/patchwork-registries/src/main/java/net/minecraftforge/registries/ForgeRegistryEntry.java b/patchwork-registries/src/main/java/net/minecraftforge/registries/ForgeRegistryEntry.java
@@ -38,6 +38,6 @@ public final Identifier getRegistryName() {
 
 	@Override
 	public Class<V> getRegistryType() {
-		return (Class<V>)getClass();
+		return (Class<V>) getClass();
 	}
 }
diff --git a/patchwork-registries/src/main/java/net/minecraftforge/registries/IForgeRegistry.java b/patchwork-registries/src/main/java/net/minecraftforge/registries/IForgeRegistry.java
@@ -19,12 +19,12 @@
 
 package net.minecraftforge.registries;
 
-import net.minecraft.util.Identifier;
-
 import java.util.Collection;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import net.minecraft.util.Identifier;
+
 /**
  * Main interface for the registry system. Use this to query the registry system.
  *
@@ -61,10 +61,10 @@ public interface IForgeRegistry<V extends IForgeRegistryEntry<V>> extends Iterab
 	 * Retrieve the slave map of type T from the registry.
 	 * Slave maps are maps which are dependent on registry content in some way.
 	 *
-	 * @param slaveMapName The name of the slavemap
+	 * @param slaveMapName The name of the slave map
 	 * @param type         The type
 	 * @param <T>          Type to return
-	 * @return The slavemap if present
+	 * @return The slave map if present
 	 */
 	<T> T getSlaveMap(Identifier slaveMapName, Class<T> type);
 
@@ -112,9 +112,6 @@ interface DummyFactory<V extends IForgeRegistryEntry<V>> {
 		V createDummy(Identifier key);
 	}
 
-	/**
-	 *
-	 */
 	interface MissingFactory<V extends IForgeRegistryEntry<V>> {
 		V createMissing(Identifier key, boolean isNetwork);
 	}
diff --git a/patchwork-registries/src/main/java/net/minecraftforge/registries/IForgeRegistryEntry.java b/patchwork-registries/src/main/java/net/minecraftforge/registries/IForgeRegistryEntry.java
@@ -23,32 +23,29 @@
 
 public interface IForgeRegistryEntry<V> {
 	/**
-	 * A unique identifier for this entry, if this entry is registered already it will return it's official registry name.
-	 * Otherwise it will return the name set in setRegistryName().
-	 * If neither are valid null is returned.
+	 * A unique {@link Identifier} for this entry, if this entry is registered already it will return it's official {@link Identifier}.
+	 * Otherwise it will return the name set in {@link #setRegistryName(Identifier)}. If neither are valid {@code null} is returned.
 	 *
-	 * @return Unique identifier or null.
+	 * @return the unique {@link Identifier} or {@code null}.
 	 */
 	Identifier getRegistryName();
 
 	/**
-	 * The supplied name will be prefixed with the currently active mod's modId.
-	 * If the supplied name already has a prefix that is different, it will be used and a warning will be logged.
-	 * <p>
-	 * If a name already exists, or this Item is already registered in a registry, then an IllegalStateException is thrown.
-	 * <p>
-	 * Returns 'this' to allow for chaining.
+	 * The supplied {@link Identifier} will be prefixed with the currently active mod's modId.
+	 * If the supplied {@link Identifier} already has a prefix that is different, it will be used and a warning will be logged.
 	 *
-	 * @param name Unique registry name
-	 * @return This instance
+	 * <p>If a name already exists, or this Item is already registered in a registry, then an IllegalStateException is thrown.</p>
+	 *
+	 * @param name the unique {@link Identifier}
+	 * @return this instance, to allow for chaining
 	 */
 	IForgeRegistryEntry setRegistryName(Identifier name);
 
 	/**
 	 * Determines the type for this entry, used to look up the correct registry in the global registries list as there can only be one
-	 * registry per concrete class.
+	 * {@link net.minecraft.util.registry.Registry} per concrete {@link Class}.
 	 *
-	 * @return Root registry type.
+	 * @return the root registry type
 	 */
 	Class<V> getRegistryType();
 }
diff --git a/patchwork-registries/src/main/java/net/minecraftforge/registries/RegistryManager.java b/patchwork-registries/src/main/java/net/minecraftforge/registries/RegistryManager.java
diff --git a/patchwork-registries/src/main/resources/patchwork-registries.mixins.json b/patchwork-registries/src/main/resources/patchwork-registries.mixins.json
