mirror of
https://github.com/xfl03/MCCustomSkinLoader.git
synced 2026-11-21 03:22:20 +00:00
Fix skull loading lag for Minecraft 1.13.2 or older version. (#91)
This commit is contained in:
1 parent
ad846f37a2
commit
fdceb08a2c
5 files changed
+61
-26
No files matched your search
@@ -166,12 +166,15 @@ public class CustomSkinLoader {
|
||||
UserProfile profile=profileCache.getProfile(credential);
|
||||
return ModelManager0.fromUserProfile(profile);
|
||||
}
|
||||
//profileCache.setLoading(username, true);
|
||||
Thread loadThread= new Thread(() -> {
|
||||
loadProfile0(gameProfile);//Load in thread
|
||||
});
|
||||
loadThread.setName(username + "'s skull");
|
||||
threadPool.execute(loadThread);
|
||||
if (!profileCache.isLoading(credential)) {
|
||||
profileCache.setLoading(credential, true);
|
||||
threadPool.execute(() -> {
|
||||
String tempName = Thread.currentThread().getName();
|
||||
Thread.currentThread().setName(username + "'s skull");
|
||||
loadProfile0(gameProfile);//Load in thread
|
||||
Thread.currentThread().setName(tempName);
|
||||
});
|
||||
}
|
||||
return Maps.newHashMap();
|
||||
}
|
||||
|
||||
|
||||
@@ -25,6 +25,10 @@ public class ProfileCache {
|
||||
public boolean isExist(String username){
|
||||
return cachedProfiles.containsKey(username.toLowerCase());
|
||||
}
|
||||
public boolean isLoading(String username) {
|
||||
CachedProfile cp=cachedProfiles.get(username.toLowerCase());
|
||||
return cp != null && cp.loading;
|
||||
}
|
||||
public boolean isReady(String username){
|
||||
CachedProfile cp=cachedProfiles.get(username.toLowerCase());
|
||||
return cp != null && (cp.loading || cp.expiryTime > TimeUtil.getCurrentUnixTimestamp());
|
||||
|
||||
@@ -35,6 +35,25 @@ function initializeCoreMod() {
|
||||
return cn;
|
||||
}
|
||||
},
|
||||
'TileEntitySkullTransformer': {
|
||||
'target': {
|
||||
'type': 'CLASS',
|
||||
'names': function (target) {
|
||||
return ['net/minecraft/tileentity/TileEntitySkull', 'net/minecraft/tileentity/SkullTileEntity'];
|
||||
}
|
||||
},
|
||||
'transformer': function (cn) {
|
||||
cn.methods.forEach(function (mn) {
|
||||
if (mn.name === 'func_174884_b') {
|
||||
var il = new InsnList();
|
||||
il.add(new VarInsnNode(Opcodes.ALOAD, 0));
|
||||
il.add(new InsnNode(Opcodes.ARETURN));
|
||||
mn.instructions.insert(il);
|
||||
}
|
||||
});
|
||||
return cn;
|
||||
}
|
||||
},
|
||||
|
||||
// For 1.13+
|
||||
'AbstractTextureTransformer': {
|
||||
@@ -101,23 +120,6 @@ function initializeCoreMod() {
|
||||
});
|
||||
return cn;
|
||||
}
|
||||
},
|
||||
'SkullTileEntityTransformer': {
|
||||
'target': {
|
||||
'type': 'CLASS',
|
||||
'name': 'net/minecraft/tileentity/SkullTileEntity'
|
||||
},
|
||||
'transformer': function (cn) {
|
||||
cn.methods.forEach(function (mn) {
|
||||
if (mn.name === 'func_174884_b') {
|
||||
var il = new InsnList();
|
||||
il.add(new VarInsnNode(Opcodes.ALOAD, 0));
|
||||
il.add(new InsnNode(Opcodes.ARETURN));
|
||||
mn.instructions.insert(il);
|
||||
}
|
||||
});
|
||||
return cn;
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -5,10 +5,9 @@ import customskinloader.forge.transformer.FakeInterfacesTransformer;
|
||||
import customskinloader.forge.transformer.PlayerTabTransformer;
|
||||
import customskinloader.forge.transformer.SkinManagerTransformer;
|
||||
import customskinloader.forge.transformer.SpectatorMenuTransformer;
|
||||
|
||||
import customskinloader.forge.transformer.TileEntitySkullTransformer;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
|
||||
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
@@ -29,7 +28,8 @@ public class LaunchWrapper implements IClassTransformer {
|
||||
new SkinManagerTransformer.LoadProfileTexturesTransformer(),
|
||||
new SkinManagerTransformer.LoadSkinFromCacheTransformer(),
|
||||
new PlayerTabTransformer.ScoreObjectiveTransformer(),
|
||||
new SpectatorMenuTransformer.PlayerMenuObjectTransformer()
|
||||
new SpectatorMenuTransformer.PlayerMenuObjectTransformer(),
|
||||
new TileEntitySkullTransformer.UpdateGameProfileTransformer()
|
||||
};
|
||||
private TransformerManager transformerManager = new TransformerManager(CLASS_TRANSFORMERS, TRANFORMERS);
|
||||
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
package customskinloader.forge.transformer;
|
||||
|
||||
import customskinloader.forge.TransformerManager;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
import org.objectweb.asm.tree.ClassNode;
|
||||
import org.objectweb.asm.tree.InsnList;
|
||||
import org.objectweb.asm.tree.InsnNode;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
import org.objectweb.asm.tree.VarInsnNode;
|
||||
|
||||
public class TileEntitySkullTransformer {
|
||||
@TransformerManager.TransformTarget(
|
||||
className = "net.minecraft.tileentity.TileEntitySkull",
|
||||
methodNames = {"updateGameProfile", "func_174884_b"},
|
||||
desc = "(Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile;"
|
||||
)
|
||||
public static class UpdateGameProfileTransformer implements TransformerManager.IMethodTransformer {
|
||||
@Override
|
||||
public void transform(ClassNode cn, MethodNode mn) {
|
||||
InsnList il = new InsnList();
|
||||
il.add(new VarInsnNode(Opcodes.ALOAD, 0));
|
||||
il.add(new InsnNode(Opcodes.ARETURN));
|
||||
mn.instructions.insert(il);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user