Coderbot is more pedantic than -Wpedantic

Author: ramidzkh

patchwork-capabilities/README.md

@@ -14,10 +14,5 @@ MinecraftForge offers a capability API
   * [PlayerEntity](https://github.com/PatchworkMC/YarnForge/blob/04d384add800bc395f4934507721f72eb733389f/patches/minecraft/net/minecraft/entity/player/PlayerEntity.java.patch#L521-L529)
 
 ## Patcher
-Redirect all instance calls to `CapabilityProvider` to static interface calls to `CapabilityProxy`
-```
-INVOKEVIRTUAL net/minecraftforge/common/capabilities/CapabilityProvider ??? (???)???
- -> INVOKESTATIC com/patchworkmc/impl/capability/CapabilityProxy ??? (???)??? (itf)
-```
 `CapabilityInject` on methods require a `CapabilityRegisteredCallback` to be registered. `CapabilityInject` for fields
 requires a bridge callback method to be created, where the field is assigned from.

patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/CapabilityDispatcher.java

@@ -54,29 +54,29 @@ public final class CapabilityDispatcher implements INBTSerializable<CompoundTag>
 	private final String[] names;
 	private final List<Runnable> listeners;
 
-	public CapabilityDispatcher(Map<Identifier, ICapabilityProvider> providers, List<Runnable> listeners) {
-		this(providers, listeners, null);
+	public CapabilityDispatcher(Map<Identifier, ICapabilityProvider> capabilities, List<Runnable> listeners) {
+		this(capabilities, listeners, null);
 	}
 
 	@SuppressWarnings("unchecked")
-	public CapabilityDispatcher(Map<Identifier, ICapabilityProvider> providers, List<Runnable> listeners, @Nullable ICapabilityProvider parent) {
-		List<ICapabilityProvider> capabilities = Lists.newArrayList();
+	public CapabilityDispatcher(Map<Identifier, ICapabilityProvider> capabilities, List<Runnable> listeners, @Nullable ICapabilityProvider parent) {
+		List<ICapabilityProvider> providers = Lists.newArrayList();
 		List<INBTSerializable<Tag>> writers = Lists.newArrayList();
 		List<String> names = Lists.newArrayList();
 
 		// Parents go first!
 		if (parent != null) {
-			capabilities.add(parent);
+			providers.add(parent);
 
 			if (parent instanceof INBTSerializable) {
 				writers.add((INBTSerializable<Tag>) parent);
 				names.add("Parent");
 			}
 		}
 
-		for (Map.Entry<Identifier, ICapabilityProvider> entry : providers.entrySet()) {
+		for (Map.Entry<Identifier, ICapabilityProvider> entry : capabilities.entrySet()) {
 			ICapabilityProvider provider = entry.getValue();
-			capabilities.add(provider);
+			providers.add(provider);
 
 			if (provider instanceof INBTSerializable) {
 				writers.add((INBTSerializable<Tag>) provider);
@@ -85,7 +85,7 @@ public CapabilityDispatcher(Map<Identifier, ICapabilityProvider> providers, List
 		}
 
 		this.listeners = listeners;
-		this.providers = capabilities.toArray(new ICapabilityProvider[0]);
+		this.providers = providers.toArray(new ICapabilityProvider[0]);
 		this.writers = writers.toArray(new INBTSerializable[0]);
 		this.names = names.toArray(new String[0]);
 	}