PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 16:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixup mixin warnings

Browse source
This commit is contained in:
Matthew Messinger 2018-08-25 22:54:06 -04:00
parent e38856aee7
commit 8b779f57b2
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo$1.java
View file

@ -20,9 +20,14 @@ import java.util.concurrent.CompletableFuture;
@Mixin(targets = "net.minecraft.client.network.NetworkPlayerInfo$1") @Mixin(targets = "net.minecraft.client.network.NetworkPlayerInfo$1")
public abstract class MixinNetworkPlayerInfo$1 implements SkinManager.SkinAvailableCallback { public abstract class MixinNetworkPlayerInfo$1 implements SkinManager.SkinAvailableCallback {
@Shadow(aliases = {"this$0", "field_177224_a", "a"}) @Final private NetworkPlayerInfo player; @Shadow(remap = false, aliases = {"this$0", "field_177224_a", "a"}) @Final private NetworkPlayerInfo player;
@Inject(method = "skinAvailable", at = @At(value = "HEAD")) @Inject(method = "skinAvailable("
+ "Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;"
+ "Lnet/minecraft/util/ResourceLocation;"
+ "Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;"
+ ")V",
at = @At(value = "HEAD"))
private void skinAvailable(MinecraftProfileTexture.Type typeIn, ResourceLocation location, MinecraftProfileTexture profileTexture, private void skinAvailable(MinecraftProfileTexture.Type typeIn, ResourceLocation location, MinecraftProfileTexture profileTexture,
CallbackInfo ci) { CallbackInfo ci) {
CompletableFuture.runAsync(Runnables.doNothing()) CompletableFuture.runAsync(Runnables.doNothing())

10
src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java
View file

@ -33,12 +33,14 @@ public abstract class MixinNetworkPlayerInfo implements INetworkPlayerInfo {
@Shadow private String skinType; @Shadow private String skinType;
@SuppressWarnings("InvalidMemberReference") // mc-dev bug? @SuppressWarnings("InvalidMemberReference") // mc-dev bug?
@Redirect( @Redirect(method = {
method = {
"getLocationSkin", "getLocationSkin",
"getLocationCape", "getLocationCape",
"getLocationElytra" "getLocationElytra"
}, at = @At(value = "INVOKE", target = "Ljava/util/Map;get(Ljava/lang/Object;)Ljava/lang/Object;")) },
at = @At(value = "INVOKE",
target = "Ljava/util/Map;get(Ljava/lang/Object;)Ljava/lang/Object;",
remap = false))
// synthetic // synthetic
private Object getSkin(Map<Type, ResourceLocation> playerTextures, Object key) { private Object getSkin(Map<Type, ResourceLocation> playerTextures, Object key) {
return getSkin(playerTextures, (Type) key); return getSkin(playerTextures, (Type) key);
@ -49,7 +51,7 @@ public abstract class MixinNetworkPlayerInfo implements INetworkPlayerInfo {
return getResourceLocation(type).orElseGet(() -> playerTextures.get(type)); return getResourceLocation(type).orElseGet(() -> playerTextures.get(type));
} }
@Redirect(method = "getSkinType()Ljava/lang/String;", @Redirect(method = "getSkinType",
at = @At(value = "FIELD", target = "Lnet/minecraft/client/network/NetworkPlayerInfo;skinType:Ljava/lang/String;")) at = @At(value = "FIELD", target = "Lnet/minecraft/client/network/NetworkPlayerInfo;skinType:Ljava/lang/String;"))
private String getTextureModel(NetworkPlayerInfo self) { private String getTextureModel(NetworkPlayerInfo self) {
return getProfileTexture(Type.SKIN).map(profile -> { return getProfileTexture(Type.SKIN).map(profile -> {