Be aware of methods which may have overrides

ramidzkh · ramidzkh · commit b05b46d06806 · 2020-02-29T12:02:39.000+11:00
diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/BlockEntityMixin.java b/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/BlockEntityMixin.java
@@ -46,25 +46,25 @@ public CapabilityProvider<BlockEntity> getCapabilityProvider() {
 
 	@Inject(method = "<init>", at = @At("RETURN"))
 	private void initializeCapabilities(CallbackInfo callbackInfo) {
-		provider.gatherCapabilities();
+		gatherCapabilities();
 	}
 
 	@Inject(method = "writeIdentifyingData", at = @At("RETURN"))
 	private void serializeCapabilities(CompoundTag compoundTag, CallbackInfoReturnable<CompoundTag> callbackInfoReturnable) {
-		if (provider.getCapabilities() != null) {
-			compoundTag.put("ForgeCaps", provider.serializeCaps());
+		if (getCapabilities() != null) {
+			compoundTag.put("ForgeCaps", serializeCaps());
 		}
 	}
 
 	@Inject(method = "fromTag", at = @At("RETURN"))
 	private void deserializeCapabilities(CompoundTag compoundTag, CallbackInfo callbackInfo) {
-		if (provider.getCapabilities() != null && compoundTag.containsKey("ForgeCaps")) {
-			provider.deserializeCaps(compoundTag.getCompound("ForgeCaps"));
+		if (getCapabilities() != null && compoundTag.containsKey("ForgeCaps")) {
+			deserializeCaps(compoundTag.getCompound("ForgeCaps"));
 		}
 	}
 
 	@Inject(method = "invalidate", at = @At("RETURN"))
 	private void invalidate(CallbackInfo callbackInfo) {
-		provider.invalidateCaps();
+		invalidateCaps();
 	}
 }
diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ChunkSerializerMixin.java b/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ChunkSerializerMixin.java
@@ -60,15 +60,15 @@ private static WorldChunk newWorldChunk(
 		CompoundTag level = compoundTag.getCompound("Level");
 
 		if (level.containsKey("ForgeCaps")) {
-			((CapabilityProviderHolder) chunk).getCapabilityProvider().deserializeCaps(level.getCompound("ForgeCaps"));
+			((CapabilityProviderHolder) chunk).deserializeCaps(level.getCompound("ForgeCaps"));
 		}
 
 		return chunk;
 	}
 
 	@Inject(method = "serialize", slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;saveToTag(Lnet/minecraft/nbt/CompoundTag;)Z"), to = @At(value = "INVOKE", target = "Lnet/minecraft/world/chunk/ProtoChunk;getEntities()Ljava/util/List;")), at = @At(value = "JUMP", opcode = Opcodes.GOTO, ordinal = 2), locals = LocalCapture.CAPTURE_FAILHARD)
 	private static void serializeCapabilities(ServerWorld serverWorld, Chunk chunk, CallbackInfoReturnable<CompoundTag> callbackInfoReturnable, ChunkPos chunkPos, CompoundTag compoundTag, CompoundTag level) {
-		CompoundTag tag = ((CapabilityProviderHolder) chunk).getCapabilityProvider().serializeCaps();
+		CompoundTag tag = ((CapabilityProviderHolder) chunk).serializeCaps();
 
 		if (tag != null) {
 			level.put("ForgeCaps", tag);
diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ClientWorldMixin.java b/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ClientWorldMixin.java
@@ -34,6 +34,6 @@ public abstract class ClientWorldMixin implements CapabilityProviderHolder {
 	@Inject(method = "<init>", at = @At("TAIL"))
 	private void initializeCapabilities(CallbackInfo callbackInfo) {
 		// TODO: Requires Dimension API (IForgeDimension)
-		getCapabilityProvider().gatherCapabilities(null);
+		gatherCapabilities(null);
 	}
 }
diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/EntityMixin.java b/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/EntityMixin.java
@@ -50,12 +50,12 @@ public CapabilityProvider<Entity> getCapabilityProvider() {
 
 	@Inject(method = "<init>", at = @At("RETURN"))
 	private void initializeCapabilities(CallbackInfo callbackInfo) {
-		provider.gatherCapabilities();
+		gatherCapabilities();
 	}
 
 	@Inject(method = "toTag", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;writeCustomDataToTag(Lnet/minecraft/nbt/CompoundTag;)V"))
 	private void serializeCapabilities(CompoundTag tag, CallbackInfoReturnable<CompoundTag> callbackInfoReturnable) {
-		CompoundTag compoundTag = provider.serializeCaps();
+		CompoundTag compoundTag = serializeCaps();
 
 		if (compoundTag != null) {
 			tag.put("ForgeCaps", compoundTag);
@@ -65,13 +65,13 @@ private void serializeCapabilities(CompoundTag tag, CallbackInfoReturnable<Compo
 	@Inject(method = "fromTag", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;readCustomDataFromTag(Lnet/minecraft/nbt/CompoundTag;)V"))
 	private void deserializeCapabilities(CompoundTag tag, CallbackInfo callbackInfo) {
 		if (tag.containsKey("ForgeCaps")) {
-			provider.deserializeCaps(tag.getCompound("ForgeCaps"));
+			deserializeCaps(tag.getCompound("ForgeCaps"));
 		}
 	}
 
 	@Inject(method = "remove", at = @At("RETURN"))
 	private void onRemoved(CallbackInfo callback) {
-		provider.invalidateCaps();
+		invalidateCaps();
 	}
 
 	// "well, my approach is that if that becomes an issue, we'll fix it"
@@ -80,7 +80,7 @@ public void remove(boolean keep) {
 		removed = true;
 
 		if (!keep) {
-			provider.invalidateCaps();
+			invalidateCaps();
 		}
 	}
 }
diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ItemStackMixin.java b/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ItemStackMixin.java
@@ -48,22 +48,22 @@ public CapabilityProvider<ItemStack> getCapabilityProvider() {
 	@Inject(method = "<init>(Lnet/minecraft/item/ItemConvertible;I)V", at = @At("RETURN"))
 	private void initializeCapabilities(CallbackInfo callbackInfo) {
 		// TODO: Fix when IForgeItem is available. This shouldn't be too much of an issue now as the method would return null by default
-		provider.gatherCapabilities(null);
+		gatherCapabilities(null);
 	}
 
 	@Inject(method = "<init>(Lnet/minecraft/nbt/CompoundTag;)V", at = @At("RETURN"))
 	private void deserializeCapabilities(CompoundTag tag, CallbackInfo callbackInfo) {
 		// TODO: See above TODO
-		provider.gatherCapabilities(null);
+		gatherCapabilities(null);
 
 		if (tag.containsKey("ForgeCaps")) {
-			provider.deserializeCaps(tag.getCompound("ForgeCaps"));
+			deserializeCaps(tag.getCompound("ForgeCaps"));
 		}
 	}
 
 	@Inject(method = "toTag", at = @At(value = "RETURN"))
 	private void serializeCapabilities(CompoundTag tag, CallbackInfoReturnable<CompoundTag> callbackInfoReturnable) {
-		CompoundTag compoundTag = provider.serializeCaps();
+		CompoundTag compoundTag = serializeCaps();
 
 		if (compoundTag != null && !compoundTag.isEmpty()) {
 			tag.put("ForgeCaps", compoundTag);
@@ -72,11 +72,11 @@ private void serializeCapabilities(CompoundTag tag, CallbackInfoReturnable<Compo
 
 	@Redirect(method = "isEqualIgnoreDamage", at = @At(value = "INVOKE", target = "Lnet/minecraft/nbt/CompoundTag;equals(Ljava/lang/Object;)Z"))
 	private boolean equals(CompoundTag a, Object b, ItemStack stack) {
-		return a.equals(b) && provider.areCapsCompatible(((ItemStackMixin) (Object) stack).provider);
+		return a.equals(b) && areCapsCompatible(((ItemStackMixin) (Object) stack).provider);
 	}
 
 	@Redirect(method = "areTagsEqual", at = @At(value = "INVOKE", target = "Lnet/minecraft/nbt/CompoundTag;equals(Ljava/lang/Object;)Z"))
 	private static boolean equals(CompoundTag a, Object b, ItemStack left, ItemStack right) {
-		return a.equals(b) && ((ItemStackMixin) (Object) left).provider.areCapsCompatible(((ItemStackMixin) (Object) right).provider);
+		return a.equals(b) && ((ItemStackMixin) (Object) left).areCapsCompatible(((ItemStackMixin) (Object) right).provider);
 	}
 }
diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ServerWorldMixin.java b/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ServerWorldMixin.java
@@ -34,6 +34,6 @@ public abstract class ServerWorldMixin implements CapabilityProviderHolder {
 	@Inject(method = "<init>", at = @At("TAIL"))
 	private void initializeCapabilities(CallbackInfo callbackInfo) {
 		// TODO: Requires Dimension API (IForgeDimension)
-		getCapabilityProvider().gatherCapabilities(null);
+		gatherCapabilities(null);
 	}
 }
diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/WorldChunkMixin.java b/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/WorldChunkMixin.java
@@ -44,6 +44,6 @@ public CapabilityProvider<WorldChunk> getCapabilityProvider() {
 
 	@Inject(method = "<init>", at = @At("RETURN"))
 	private void initializeCapabilities(CallbackInfo callbackInfo) {
-		provider.gatherCapabilities();
+		gatherCapabilities();
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -46,25 +46,25 @@ public CapabilityProvider<BlockEntity> getCapabilityProvider() {`
`46`	`46`
`47`	`47`	`@Inject(method = "<init>", at = @At("RETURN"))`
`48`	`48`	`private void initializeCapabilities(CallbackInfo callbackInfo) {`
`49`		`- provider.gatherCapabilities();`
	`49`	`+ gatherCapabilities();`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@Inject(method = "writeIdentifyingData", at = @At("RETURN"))`
`53`	`53`	`private void serializeCapabilities(CompoundTag compoundTag, CallbackInfoReturnable<CompoundTag> callbackInfoReturnable) {`
`54`		`- if (provider.getCapabilities() != null) {`
`55`		`- compoundTag.put("ForgeCaps", provider.serializeCaps());`
	`54`	`+ if (getCapabilities() != null) {`
	`55`	`+ compoundTag.put("ForgeCaps", serializeCaps());`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`@Inject(method = "fromTag", at = @At("RETURN"))`
`60`	`60`	`private void deserializeCapabilities(CompoundTag compoundTag, CallbackInfo callbackInfo) {`
`61`		`- if (provider.getCapabilities() != null && compoundTag.containsKey("ForgeCaps")) {`
`62`		`- provider.deserializeCaps(compoundTag.getCompound("ForgeCaps"));`
	`61`	`+ if (getCapabilities() != null && compoundTag.containsKey("ForgeCaps")) {`
	`62`	`+ deserializeCaps(compoundTag.getCompound("ForgeCaps"));`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`@Inject(method = "invalidate", at = @At("RETURN"))`
`67`	`67`	`private void invalidate(CallbackInfo callbackInfo) {`
`68`		`- provider.invalidateCaps();`
	`68`	`+ invalidateCaps();`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,15 +60,15 @@ private static WorldChunk newWorldChunk(`
`60`	`60`	`CompoundTag level = compoundTag.getCompound("Level");`
`61`	`61`
`62`	`62`	`if (level.containsKey("ForgeCaps")) {`
`63`		`- ((CapabilityProviderHolder) chunk).getCapabilityProvider().deserializeCaps(level.getCompound("ForgeCaps"));`
	`63`	`+ ((CapabilityProviderHolder) chunk).deserializeCaps(level.getCompound("ForgeCaps"));`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`return chunk;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`@Inject(method = "serialize", slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;saveToTag(Lnet/minecraft/nbt/CompoundTag;)Z"), to = @At(value = "INVOKE", target = "Lnet/minecraft/world/chunk/ProtoChunk;getEntities()Ljava/util/List;")), at = @At(value = "JUMP", opcode = Opcodes.GOTO, ordinal = 2), locals = LocalCapture.CAPTURE_FAILHARD)`
`70`	`70`	`private static void serializeCapabilities(ServerWorld serverWorld, Chunk chunk, CallbackInfoReturnable<CompoundTag> callbackInfoReturnable, ChunkPos chunkPos, CompoundTag compoundTag, CompoundTag level) {`
`71`		`- CompoundTag tag = ((CapabilityProviderHolder) chunk).getCapabilityProvider().serializeCaps();`
	`71`	`+ CompoundTag tag = ((CapabilityProviderHolder) chunk).serializeCaps();`
`72`	`72`
`73`	`73`	`if (tag != null) {`
`74`	`74`	`level.put("ForgeCaps", tag);`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,6 @@ public abstract class ClientWorldMixin implements CapabilityProviderHolder {`
`34`	`34`	`@Inject(method = "<init>", at = @At("TAIL"))`
`35`	`35`	`private void initializeCapabilities(CallbackInfo callbackInfo) {`
`36`	`36`	`// TODO: Requires Dimension API (IForgeDimension)`
`37`		`- getCapabilityProvider().gatherCapabilities(null);`
	`37`	`+ gatherCapabilities(null);`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,12 +50,12 @@ public CapabilityProvider<Entity> getCapabilityProvider() {`
`50`	`50`
`51`	`51`	`@Inject(method = "<init>", at = @At("RETURN"))`
`52`	`52`	`private void initializeCapabilities(CallbackInfo callbackInfo) {`
`53`		`- provider.gatherCapabilities();`
	`53`	`+ gatherCapabilities();`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Inject(method = "toTag", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;writeCustomDataToTag(Lnet/minecraft/nbt/CompoundTag;)V"))`
`57`	`57`	`private void serializeCapabilities(CompoundTag tag, CallbackInfoReturnable<CompoundTag> callbackInfoReturnable) {`
`58`		`- CompoundTag compoundTag = provider.serializeCaps();`
	`58`	`+ CompoundTag compoundTag = serializeCaps();`
`59`	`59`
`60`	`60`	`if (compoundTag != null) {`
`61`	`61`	`tag.put("ForgeCaps", compoundTag);`
`@@ -65,13 +65,13 @@ private void serializeCapabilities(CompoundTag tag, CallbackInfoReturnable<Compo`
`65`	`65`	`@Inject(method = "fromTag", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;readCustomDataFromTag(Lnet/minecraft/nbt/CompoundTag;)V"))`
`66`	`66`	`private void deserializeCapabilities(CompoundTag tag, CallbackInfo callbackInfo) {`
`67`	`67`	`if (tag.containsKey("ForgeCaps")) {`
`68`		`- provider.deserializeCaps(tag.getCompound("ForgeCaps"));`
	`68`	`+ deserializeCaps(tag.getCompound("ForgeCaps"));`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@Inject(method = "remove", at = @At("RETURN"))`
`73`	`73`	`private void onRemoved(CallbackInfo callback) {`
`74`		`- provider.invalidateCaps();`
	`74`	`+ invalidateCaps();`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`// "well, my approach is that if that becomes an issue, we'll fix it"`
`@@ -80,7 +80,7 @@ public void remove(boolean keep) {`
`80`	`80`	`removed = true;`
`81`	`81`
`82`	`82`	`if (!keep) {`
`83`		`- provider.invalidateCaps();`
	`83`	`+ invalidateCaps();`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,22 +48,22 @@ public CapabilityProvider<ItemStack> getCapabilityProvider() {`
`48`	`48`	`@Inject(method = "<init>(Lnet/minecraft/item/ItemConvertible;I)V", at = @At("RETURN"))`
`49`	`49`	`private void initializeCapabilities(CallbackInfo callbackInfo) {`
`50`	`50`	`// TODO: Fix when IForgeItem is available. This shouldn't be too much of an issue now as the method would return null by default`
`51`		`- provider.gatherCapabilities(null);`
	`51`	`+ gatherCapabilities(null);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Inject(method = "<init>(Lnet/minecraft/nbt/CompoundTag;)V", at = @At("RETURN"))`
`55`	`55`	`private void deserializeCapabilities(CompoundTag tag, CallbackInfo callbackInfo) {`
`56`	`56`	`// TODO: See above TODO`
`57`		`- provider.gatherCapabilities(null);`
	`57`	`+ gatherCapabilities(null);`
`58`	`58`
`59`	`59`	`if (tag.containsKey("ForgeCaps")) {`
`60`		`- provider.deserializeCaps(tag.getCompound("ForgeCaps"));`
	`60`	`+ deserializeCaps(tag.getCompound("ForgeCaps"));`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`@Inject(method = "toTag", at = @At(value = "RETURN"))`
`65`	`65`	`private void serializeCapabilities(CompoundTag tag, CallbackInfoReturnable<CompoundTag> callbackInfoReturnable) {`
`66`		`- CompoundTag compoundTag = provider.serializeCaps();`
	`66`	`+ CompoundTag compoundTag = serializeCaps();`
`67`	`67`
`68`	`68`	`if (compoundTag != null && !compoundTag.isEmpty()) {`
`69`	`69`	`tag.put("ForgeCaps", compoundTag);`
`@@ -72,11 +72,11 @@ private void serializeCapabilities(CompoundTag tag, CallbackInfoReturnable<Compo`
`72`	`72`
`73`	`73`	`@Redirect(method = "isEqualIgnoreDamage", at = @At(value = "INVOKE", target = "Lnet/minecraft/nbt/CompoundTag;equals(Ljava/lang/Object;)Z"))`
`74`	`74`	`private boolean equals(CompoundTag a, Object b, ItemStack stack) {`
`75`		`- return a.equals(b) && provider.areCapsCompatible(((ItemStackMixin) (Object) stack).provider);`
	`75`	`+ return a.equals(b) && areCapsCompatible(((ItemStackMixin) (Object) stack).provider);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`@Redirect(method = "areTagsEqual", at = @At(value = "INVOKE", target = "Lnet/minecraft/nbt/CompoundTag;equals(Ljava/lang/Object;)Z"))`
`79`	`79`	`private static boolean equals(CompoundTag a, Object b, ItemStack left, ItemStack right) {`
`80`		`- return a.equals(b) && ((ItemStackMixin) (Object) left).provider.areCapsCompatible(((ItemStackMixin) (Object) right).provider);`
	`80`	`+ return a.equals(b) && ((ItemStackMixin) (Object) left).areCapsCompatible(((ItemStackMixin) (Object) right).provider);`
`81`	`81`	`}`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,6 @@ public CapabilityProvider<WorldChunk> getCapabilityProvider() {`
`44`	`44`
`45`	`45`	`@Inject(method = "<init>", at = @At("RETURN"))`
`46`	`46`	`private void initializeCapabilities(CallbackInfo callbackInfo) {`
`47`		`- provider.gatherCapabilities();`
	`47`	`+ gatherCapabilities();`
`48`	`48`	`}`
`49`	`49`	`}`