PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-25 22:07:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

You don't need to do this

Browse source 
# Conflicts:
#	src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java
This commit is contained in:
Sollace 2018-09-03 14:17:46 +02:00
parent 74c1e6ffe1
commit e03343b8ae
3 changed files with 32 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java
View file

@ -160,6 +160,16 @@ public final class HDSkinManager implements IResourceManagerReloadListener {
return skins.getUnchecked(profile);
}
public void fetchAndLoadSkins(GameProfile profile, SkinManager.SkinAvailableCallback callback) {
loadProfileTextures(profile).thenAcceptAsync(m -> m.forEach((type, pp) -> {
loadTexture(type, pp, (typeIn, location, profileTexture) -> {
parseSkin(profile, typeIn, location, profileTexture);
callback.skinAvailable(typeIn, location, profileTexture);
});
}), Minecraft.getMinecraft()::addScheduledTask);
}
public ResourceLocation loadTexture(Type type, MinecraftProfileTexture texture, @Nullable SkinManager.SkinAvailableCallback callback) {
String skinDir = type.toString().toLowerCase() + "s/";
@ -295,10 +305,13 @@ public final class HDSkinManager implements IResourceManagerReloadListener {
// grab the metadata object via reflection. Object is live.
Map<String, String> metadata = ProfileTextureUtil.getMetadata(texture);
boolean wasNull = metadata == null;
if (wasNull) {
metadata = new HashMap<>();
}
for (ISkinParser parser : skinParsers) {
try {
parser.parse(profile, type, resource, metadata);
@ -306,6 +319,7 @@ public final class HDSkinManager implements IResourceManagerReloadListener {
logger.error("Exception thrown while parsing skin: ", t);
}
}
if (wasNull && !metadata.isEmpty()) {
ProfileTextureUtil.setMetadata(texture, metadata);
}

9
src/hdskins/java/com/voxelmodpack/hdskins/INetworkPlayerInfo.java
View file

@ -1,16 +1,7 @@
package com.voxelmodpack.hdskins;
import com.mojang.authlib.minecraft.MinecraftProfileTexture;
import net.minecraft.util.ResourceLocation;
import java.util.Optional;
public interface INetworkPlayerInfo {
Optional<ResourceLocation> getResourceLocation(MinecraftProfileTexture.Type type);
Optional<MinecraftProfileTexture> getProfileTexture(MinecraftProfileTexture.Type type);
void reloadTextures();
void setSkinType(String type);

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

@ -5,6 +5,7 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture;
import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
import com.voxelmodpack.hdskins.HDSkinManager;
import com.voxelmodpack.hdskins.INetworkPlayerInfo;
import net.minecraft.client.Minecraft;
import net.minecraft.client.network.NetworkPlayerInfo;
import net.minecraft.util.ResourceLocation;
@ -18,8 +19,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
@Mixin(NetworkPlayerInfo.class)
public abstract class MixinNetworkPlayerInfo implements INetworkPlayerInfo {
@ -34,14 +33,8 @@ public abstract class MixinNetworkPlayerInfo implements INetworkPlayerInfo {
@Shadow private Map<Type, ResourceLocation> playerTextures;
@SuppressWarnings("InvalidMemberReference") // mc-dev bug?
@Redirect(method = {
"getLocationSkin",
"getLocationCape",
"getLocationElytra"
},
at = @At(value = "INVOKE",
target = "Ljava/util/Map;get(Ljava/lang/Object;)Ljava/lang/Object;",
remap = false))
@Redirect(method = { "getLocationSkin", "getLocationCape", "getLocationElytra" },
at = @At(value = "INVOKE", target = "Ljava/util/Map;get(Ljava/lang/Object;)Ljava/lang/Object;", remap = false))
// synthetic
private Object getSkin(Map<Type, ResourceLocation> playerTextures, Object key) {
return getSkin(playerTextures, (Type) key);
@ -49,16 +42,23 @@ public abstract class MixinNetworkPlayerInfo implements INetworkPlayerInfo {
// with generics
private ResourceLocation getSkin(Map<Type, ResourceLocation> playerTextures, Type type) {
return getResourceLocation(type).orElseGet(() -> playerTextures.get(type));
if (this.customTextures.containsKey(type)) {
return this.customTextures.get(type);
}
return playerTextures.get(type);
}
@Redirect(method = "getSkinType",
at = @At(value = "FIELD", target = "Lnet/minecraft/client/network/NetworkPlayerInfo;skinType:Ljava/lang/String;"))
private String getTextureModel(NetworkPlayerInfo self) {
return getProfileTexture(Type.SKIN).map(profile -> {
String model = profile.getMetadata("model");
if (customProfiles.containsKey(Type.SKIN)) {
String model = customProfiles.get(Type.SKIN).getMetadata("model");
return model != null ? model : "default";
}).orElse(this.skinType);
}
return skinType;
}
@Inject(method = "loadPlayerTextures",
@ -69,26 +69,10 @@ public abstract class MixinNetworkPlayerInfo implements INetworkPlayerInfo {
+ "Z)V",
shift = At.Shift.BEFORE))
private void onLoadTexture(CallbackInfo ci) {
HDSkinManager.INSTANCE.loadProfileTextures(this.gameProfile)
.thenAcceptAsync(m -> m.forEach((type, profile) -> {
HDSkinManager.INSTANCE.loadTexture(type, profile, (typeIn, location, profileTexture) -> {
CompletableFuture.runAsync(() -> {
HDSkinManager.INSTANCE.parseSkin(gameProfile, typeIn, location, profileTexture);
});
HDSkinManager.INSTANCE.fetchAndLoadSkins(gameProfile, (type, location, profileTexture) -> {
customTextures.put(type, location);
customProfiles.put(type, profileTexture);
});
}), Minecraft.getMinecraft()::addScheduledTask);
}
@Override
public Optional<ResourceLocation> getResourceLocation(Type type) {
return Optional.ofNullable(this.customTextures.get(type));
}
@Override
public Optional<MinecraftProfileTexture> getProfileTexture(Type type) {
return Optional.ofNullable(this.customProfiles.get(type));
}
@Override