Support ModLauncher

This commit is contained in:
xfl03 authored and Alexander Xia committed 2018-08-26 07:04:25 +08:00
1 parent db6b54732e
commit b7b59c0b85
13 files changed
+131 -44019

No files matched your search

-43962
View File
File diff suppressed because it is too large. Load diff
+1
View File
@@ -5,6 +5,7 @@
"releaseTime": "2013-01-02T21:10:00+08:00",
"time": "2013-01-02T21:10:00+08:00",
"type": "release",
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type} --tweakClass customskinloader.tweaker.Tweaker",
"arguments": {
"game": [
"--tweakClass",
@@ -87,7 +87,7 @@ public class Config {
}catch (Exception e){
CustomSkinLoader.logger.warning("Exception occurs while parsing version: "+e.toString());
}
if(config.version==null || configVersion==0f || floatVersion > configVersion){
if(floatVersion > configVersion){
CustomSkinLoader.logger.info("Config File is out of date: "+config.version);
config.version=CustomSkinLoader.CustomSkinLoader_VERSION;
writeConfig(config,true);
@@ -46,7 +46,7 @@ public class SkinSiteProfile {
ssp.type="Legacy";
ssp.checkPNG=false;
ssp.skin=skin;
ssp.model="default";
ssp.model="auto";
ssp.cape=cape;
ssp.elytra=elytra;
return ssp;
@@ -17,7 +17,6 @@ import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.resources.DefaultPlayerSkin;
import net.minecraft.client.resources.SkinManager;
import net.minecraft.client.resources.SkinManager.SkinAvailableCallback;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StringUtils;
@@ -31,7 +30,7 @@ public class FakeClientPlayer {
if (ito == null || !(ito instanceof ThreadDownloadImageData)) {
//if Legacy Skin for username not loaded yet
SkinManager skinman = Minecraft.getMinecraft().getSkinManager();
UUID offlineUUID = EntityPlayer.getOfflineUUID(username);
UUID offlineUUID = getOfflineUUID(username);
GameProfile offlineProfile = new GameProfile(offlineUUID, username);
//Load Default Skin
@@ -53,6 +52,10 @@ public class FakeClientPlayer {
//CustomSkinLoader.logger.debug("FakeClientPlayer/getLocationSkin "+username);
return new ResourceLocation("skins/legacy-" + StringUtils.stripControlCodes(username));
}
public static UUID getOfflineUUID(String username)
{
return UUID.nameUUIDFromBytes(("OfflinePlayer:" + username).getBytes());
}
public static Map<ResourceLocation, ITextureObject> textureCache = Maps.newHashMap();
@@ -82,6 +85,5 @@ public class FakeClientPlayer {
CustomSkinLoader.logger.debug("Legacy Texture (" + resourceLocationIn + ") Loaded as " +
ito.toString() + " (" + location + ")");
}
}
}
@@ -7,12 +7,12 @@ import java.util.ArrayList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import net.minecraft.client.Minecraft;
import org.apache.commons.lang3.StringUtils;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.minecraft.MinecraftSessionService;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureManager;
/**
@@ -25,10 +25,10 @@ public class MinecraftUtil {
return Minecraft.getMinecraft().gameDir;
}
public static MinecraftSessionService getSessionService(){
return net.minecraft.client.Minecraft.getMinecraft().getSessionService();
return Minecraft.getMinecraft().getSessionService();
}
public static TextureManager getTextureManager(){
return net.minecraft.client.Minecraft.getMinecraft().getTextureManager();
return Minecraft.getMinecraft().getTextureManager();
}
private static ArrayList<String> minecraftVersion=new ArrayList<String>();
@@ -66,7 +66,7 @@ public class MinecraftUtil {
// (domain|ip)(:port)
public static String getServerAddress(){
net.minecraft.client.multiplayer.ServerData data=net.minecraft.client.Minecraft.getMinecraft().getCurrentServerData();
net.minecraft.client.multiplayer.ServerData data = Minecraft.getMinecraft().getCurrentServerData();
if(data==null)//Single Player
return null;
return data.serverIP;
@@ -79,7 +79,7 @@ public class MinecraftUtil {
return HttpUtil0.isLanServer(getStandardServerAddress());
}
public static String getCurrentUsername(){
return net.minecraft.client.Minecraft.getMinecraft().getSession().getProfile().getName();
return Minecraft.getMinecraft().getSession().getProfile().getName();
}
private final static Pattern MINECRAFT_CORE_FILE_PATTERN = Pattern.compile("^(.*?)/versions/([^\\/\\\\]*?)/([^\\/\\\\]*?).jar$");
+5
View File
@@ -76,6 +76,11 @@ processResources {
buildUrl : System.getenv("CIRCLE_BUILD_URL")
])
}
dependencies {
compileOnly "cpw.mods:modlauncher:0.1.0-rc.3"
}
task signJar(type: SignJar, dependsOn: reobfJar) {
onlyIf { System.getenv("KEY_PASS") != null }
doLast { System.out.println("Jar will be signed.") }
@@ -2,6 +2,8 @@ package customskinloader.forge;
import java.util.Map;
import customskinloader.forge.transformer.LaunchWrapper;
import customskinloader.forge.transformer.ModLauncher;
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.Name;
@@ -10,7 +12,12 @@ public class ForgePlugin implements IFMLLoadingPlugin {
@Override
public String[] getASMTransformerClass() {
return new String[]{TransformerManager.class.getName()};
try {
Class.forName("cpw.mods.modlauncher.api.ITransformer");
return new String[]{"customskinloader.forge.transformer.ModLauncher"};//ModLauncher
} catch (ClassNotFoundException ignored) {
return new String[]{"customskinloader.forge.transformer.LaunchWrapper"};//LaunchWrapper
}
}
@Override
@@ -5,38 +5,37 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import customskinloader.Logger;
import net.minecraft.launchwrapper.Launch;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodNode;
import net.minecraft.launchwrapper.IClassTransformer;
import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
import customskinloader.Logger;
import customskinloader.forge.transformer.*;
import customskinloader.forge.transformer.PlayerTabTransformer.ScoreObjectiveTransformer;
import customskinloader.forge.transformer.SkinManagerTransformer.*;
import customskinloader.forge.transformer.SpectatorMenuTransformer.PlayerMenuObjectTransformer;
public class TransformerManager implements IClassTransformer {
public static Logger logger = new Logger(new File(Launch.minecraftHome, "./CustomSkinLoader/ForgePlugin.log"));
public class TransformerManager {
public static Logger logger = new Logger(new File("./CustomSkinLoader/ForgePlugin.log"));
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
public @interface TransformTarget{
public @interface TransformTarget {
String className();
String[] methodNames();
String desc();
}
public interface IMethodTransformer{
void transform(ClassNode cn,MethodNode mn);
public interface IMethodTransformer {
void transform(ClassNode cn, MethodNode mn);
}
private static final IMethodTransformer[] TRANFORMERS={
private static final IMethodTransformer[] TRANFORMERS = {
new InitTransformer(),
new LoadSkinTransformer(),
new LoadProfileTexturesTransformer(),
@@ -45,58 +44,55 @@ public class TransformerManager implements IClassTransformer {
new PlayerMenuObjectTransformer(),
new FakeSkinManagerTransformer.InitTransformer()
};
private Map<String, Map<String, IMethodTransformer>> map;
public TransformerManager(){
public Map<String, Map<String, IMethodTransformer>> map;
public TransformerManager() {
map = new HashMap<String, Map<String, IMethodTransformer>>();
for(IMethodTransformer t:TRANFORMERS){
logger.info("[CSL DEBUG] REGISTERING TRANSFORMER %s" , t.getClass().getName());
if(!t.getClass().isAnnotationPresent(TransformTarget.class)){
for (IMethodTransformer t : TRANFORMERS) {
logger.info("[CSL DEBUG] REGISTERING TRANSFORMER %s", t.getClass().getName());
if (!t.getClass().isAnnotationPresent(TransformTarget.class)) {
logger.info("[CSL DEBUG] ERROR occurs while parsing Annotation.");
continue;
}
addMethodTransformer(t.getClass().getAnnotation(TransformTarget.class),t);
addMethodTransformer(t.getClass().getAnnotation(TransformTarget.class), t);
}
}
private void addMethodTransformer(TransformTarget target, IMethodTransformer transformer) {
if (!map.containsKey(target.className()))
map.put(target.className(), new HashMap<String, IMethodTransformer>());
for(String methodName:target.methodNames()){
for (String methodName : target.methodNames()) {
map.get(target.className()).put(methodName + target.desc(), transformer);
logger.info("[CSL DEBUG] REGISTERING METHOD %s(%s)",target.className(),methodName + target.desc());
logger.info("[CSL DEBUG] REGISTERING METHOD %s(%s)", target.className(), methodName + target.desc());
}
}
//From: https://github.com/RecursiveG/UniSkinMod/blob/1.9.4/src/main/java/org/devinprogress/uniskinmod/coremod/BaseAsmTransformer.java#L83-L114
@Override
public byte[] transform(String obfClassName, String className, byte[] bytes) {
if (!map.containsKey(className)) return bytes;
public ClassNode transform(ClassNode classNode) {
String obfClassName = classNode.name;
String className = FMLDeobfuscatingRemapper.INSTANCE.map(obfClassName);
return transform(classNode, className, obfClassName);
}
public ClassNode transform(ClassNode classNode, String className, String obfClassName) {
logger.info("[CSL DEBUG] CLASS %s will be transformed", className);
Map<String, IMethodTransformer> transMap = map.get(className);
ClassReader cr = new ClassReader(bytes);
ClassNode cn = new ClassNode();
cr.accept(cn, 0);
// NOTE: `map` = convert obfuscated name to srgName;
List<MethodNode> ml = new ArrayList<MethodNode>(cn.methods);
List<MethodNode> ml = new ArrayList<MethodNode>(classNode.methods);
for (MethodNode mn : ml) {
String methodName = FMLDeobfuscatingRemapper.INSTANCE.mapMethodName(obfClassName, mn.name, mn.desc);
String methodDesc = FMLDeobfuscatingRemapper.INSTANCE.mapMethodDesc(mn.desc);
if (transMap.containsKey(methodName + methodDesc)) {
String methodTarget = methodName + methodDesc;
if (transMap.containsKey(methodTarget)) {
try {
logger.info("[CSL DEBUG] Transforming method %s in class %s(%s)", methodName + methodDesc, obfClassName, className);
transMap.get(methodName + methodDesc).transform(cn,mn);
logger.info("[CSL DEBUG] Successfully transformed method %s in class %s(%s)", methodName + methodDesc, obfClassName, className);
transMap.get(methodTarget).transform(classNode, mn);
logger.info("[CSL DEBUG] Successfully transformed method %s in class %s", methodName, className);
} catch (Exception e) {
logger.warning("[CSL DEBUG] An error happened when transforming method %s in class %s(%s). The whole class was not modified.", methodName + methodDesc, obfClassName, className);
e.printStackTrace();
return bytes;
logger.warning("[CSL DEBUG] An error happened when transforming method %s in class %s.", methodTarget, className);
logger.warning(e);
}
}
}
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
cn.accept(cw);
return cw.toByteArray();
return classNode;
}
}
@@ -0,0 +1,30 @@
package customskinloader.forge.transformer;
import customskinloader.forge.TransformerManager;
import net.minecraft.launchwrapper.IClassTransformer;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.tree.ClassNode;
public class LaunchWrapper implements IClassTransformer {
private TransformerManager transformerManager = new TransformerManager();
//LaunchWrapper
//From: https://github.com/RecursiveG/UniSkinMod/blob/1.9.4/src/main/java/org/devinprogress/uniskinmod/coremod/BaseAsmTransformer.java#L83-L114
public byte[] transform(String obfClassName, String className, byte[] bytes) {
if (!transformerManager.map.containsKey(className)) return bytes;//Check if should be transformed
//Parse bytes to ClassNode
ClassReader cr = new ClassReader(bytes);
ClassNode cn = new ClassNode();
cr.accept(cn, 0);
//Transform ClassNode
transformerManager.transform(cn, className, obfClassName);
//Parse Class Node to bytes
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
cn.accept(cw);
return cw.toByteArray();
}
}
@@ -0,0 +1,33 @@
package customskinloader.forge.transformer;
import cpw.mods.modlauncher.api.ITransformer;
import cpw.mods.modlauncher.api.ITransformerVotingContext;
import cpw.mods.modlauncher.api.TransformerVoteResult;
import customskinloader.forge.TransformerManager;
import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
import org.objectweb.asm.tree.ClassNode;
import java.util.HashSet;
import java.util.Set;
public class ModLauncher implements ITransformer<ClassNode> {
private TransformerManager transformerManager = new TransformerManager();
//ModLauncher
public ClassNode transform(ClassNode input, ITransformerVotingContext context) {
return transformerManager.transform(input);
}
public TransformerVoteResult castVote(ITransformerVotingContext context) {
return TransformerVoteResult.YES;
}
public Set<Target> targets() {
Set<Target> sets = new HashSet<Target>();
for (String className : transformerManager.map.keySet()) {
String obfName = FMLDeobfuscatingRemapper.INSTANCE.unmap(className);
sets.add(Target.targetClass(obfName));
}
return sets;
}
}
@@ -13,7 +13,7 @@ public class ModSystemTweaker implements ITweaker {
public static Logger logger = new Logger();
public void acceptOptions(List args, File gameDir, File assetsDir, String profile) {
File tweakerLogFile = new File(gameDir,"CustomSkinLoader/Tweaker.log");
File tweakerLogFile = new File(gameDir,"./CustomSkinLoader/Tweaker.log");
logger = new Logger(tweakerLogFile);
logger.info("Using ModSystemTweaker");
@@ -17,7 +17,7 @@ public class Tweaker implements ITweaker {
public static Logger logger = new Logger();
public void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile) {
File tweakerLogFile = new File(gameDir,"CustomSkinLoader/Tweaker.log");
File tweakerLogFile = new File(gameDir,"./CustomSkinLoader/Tweaker.log");
logger = new Logger(tweakerLogFile);
logger.info("Using Tweaker");