Порт на 1.12.2

Author: TheAndrey

build.gradle

@@ -7,11 +7,11 @@ buildscript {
 		}
 	}
 	dependencies {
-		classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+		classpath 'net.minecraftforge.gradle:ForgeGradle:3.+'
 	}
 }
 
-apply plugin: 'forge'
+apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'idea'
 
 idea {
@@ -22,26 +22,55 @@ idea {
 }
 
 minecraft {
-	version = '1.7.10-10.13.4.1614-1.7.10'
-	runDir = 'minecraft'
+	// The mappings can be changed at any time, and must be in the following format.
+	// snapshot_YYYYMMDD   Snapshot are built nightly.
+	// stable_#            Stables are built at the discretion of the MCP team.
+	mappings channel: 'snapshot', version: '20171003-1.12'
+	// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+
+	// accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+
+	// Default run configurations.
+	// These can be tweaked, removed, or duplicated as needed.
+	runs {
+		client {
+			workingDirectory project.file('minecraft')
+
+			// Recommended logging data for a userdev environment
+			property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+
+			// Recommended logging level for the console
+			property 'forge.logging.console.level', 'debug'
+		}
+	}
+}
+
+dependencies {
+	// Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
+	// that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
+	// The userdev artifact is a special name and will get all sorts of transformations applied to it.
+	minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2860'
 }
 
 // Project settings
-archivesBaseName = 'FontFix'
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
 	options.encoding = 'UTF-8'
 }
 
 jar {
 	manifest {
 		attributes 'FMLCorePlugin': 'com.gamerforea.fontfix.LoadingPlugin'
+		attributes 'FMLCorePluginContainsFMLMod': 'true'
 	}
 }
 
-task devJar(type: Jar) {
-	classifier = 'dev'
+// This is the preferred method to reobfuscate your jar file
+jar.finalizedBy('reobfJar')
+
+tasks.register('devJar', Jar) {
+	archiveClassifier.set('dev')
 	manifest = jar.manifest
 	from sourceSets.main.output
 }

gradle.properties

@@ -1,6 +1,6 @@
 # Project
 group=com.gamerforea
-version=1.7.10
+version=1.12.2
 
 # Repositories
-minecraftforge.repository.url=https://files.minecraftforge.net/maven
+minecraftforge.repository.url=https://maven.minecraftforge.net/

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip

src/main/java/com/gamerforea/fontfix/ASMTransformer.java

@@ -18,22 +18,17 @@ public class ASMTransformer implements IClassTransformer {
 	@Override
 	public byte[] transform(String name, String transformedName, byte[] bytes) {
 		switch (name) {
-			case "bbu":
+			case "bip":
 			case "net.minecraft.client.gui.FontRenderer":
 				return patchFontRenderer(bytes);
-			case "brs":
+			case "cfb":
 				return patchLocale(bytes, true);
 			case "net.minecraft.client.resources.Locale":
 				return patchLocale(bytes, false);
 			case "net.minecraft.client.Minecraft":
 				return patchMinecraft(bytes, false);
-			case "bao":
+			case "bib":
 				return patchMinecraft(bytes, true);
-			case "cofh.core.ProxyClient":
-			case "cofh.lib.render.RenderHelper":
-			case "buildcraft.silicon.render.PackageFontRenderer":
-			case "blusunrize.immersiveengineering.client.IEManualInstance":
-				return patchMods(bytes);
 		}
 		return bytes;
 	}
@@ -64,12 +59,12 @@ private byte[] patchFontRenderer(byte[] bytes) {
 	private byte[] patchLocale(byte[] bytes, boolean obf) {
 		ClassNode clazz = Utils.readClass(bytes);
 
-		final Type classMc = Utils.getObjectType(obf ? "bao" : "net.minecraft.client.Minecraft");
-		final Type classSettings = Utils.getObjectType(obf ? "bbj" : "net.minecraft.client.settings.GameSettings");
-		final Type classLocale = Utils.getObjectType(obf ? "brs" : "net.minecraft.client.resources.Locale");
+		final Type classMc = Utils.getObjectType(obf ? "bib" : "net.minecraft.client.Minecraft");
+		final Type classSettings = Utils.getObjectType(obf ? "bid" : "net.minecraft.client.settings.GameSettings");
+		final Type classLocale = Utils.getObjectType(obf ? "cfb" : "net.minecraft.client.resources.Locale");
 		final String findMethod = obf ? "a" : "isUnicode";
-		final String getMinecraft = obf ? "B" : "getMinecraft";
-		final String gameSettings = obf ? "u" : "gameSettings";
+		final String getMinecraft = obf ? "z" : "getMinecraft";
+		final String gameSettings = obf ? "t" : "gameSettings";
 
 		for (MethodNode method : clazz.methods) {
 			if (method.name.equals(findMethod) && method.desc.equals(Type.getMethodDescriptor(Type.BOOLEAN_TYPE))) {
@@ -79,16 +74,16 @@ private byte[] patchLocale(byte[] bytes, boolean obf) {
 				list.add(new VarInsnNode(ASTORE, 1));
 				list.add(new VarInsnNode(ALOAD, 1));
 				list.add(new FieldInsnNode(GETFIELD, classMc.getInternalName(), gameSettings, classSettings.getDescriptor()));
-				list.add(new FieldInsnNode(GETFIELD, classSettings.getInternalName(), obf ? "aK" : "language", Type.getType(String.class).getDescriptor()));
+				list.add(new FieldInsnNode(GETFIELD, classSettings.getInternalName(), obf ? "aJ" : "language", Type.getType(String.class).getDescriptor()));
 				list.add(new LdcInsnNode("ru_RU"));
 				list.add(new MethodInsnNode(INVOKEVIRTUAL, Type.getInternalName(String.class), "equals", Type.getMethodDescriptor(Type.BOOLEAN_TYPE, Type.getType(Object.class)), false));
 				list.add(new MethodInsnNode(INVOKESTATIC, classMc.getInternalName(), getMinecraft, Type.getMethodDescriptor(classMc), false));
 				list.add(new FieldInsnNode(GETFIELD, classMc.getInternalName(), gameSettings, classSettings.getDescriptor()));
-				list.add(new FieldInsnNode(GETFIELD, classSettings.getInternalName(), obf ? "aL" : "forceUnicodeFont", Type.BOOLEAN_TYPE.getDescriptor()));
+				list.add(new FieldInsnNode(GETFIELD, classSettings.getInternalName(), obf ? "aK" : "forceUnicodeFont", Type.BOOLEAN_TYPE.getDescriptor()));
 				list.add(new InsnNode(IRETURN));
 				list.add(new FrameNode(F_APPEND, 1, new Object[]{classMc.getInternalName()}, 0, null));
 				list.add(new VarInsnNode(ALOAD, 0));
-				list.add(new FieldInsnNode(GETFIELD, classLocale.getInternalName(), obf ? "d" : "field_135029_d", Type.BOOLEAN_TYPE.getDescriptor()));
+				list.add(new FieldInsnNode(GETFIELD, classLocale.getInternalName(), obf ? "d" : "unicode", Type.BOOLEAN_TYPE.getDescriptor()));
 				list.add(new InsnNode(IRETURN));
 
 				method.instructions = list;
@@ -102,8 +97,8 @@ private byte[] patchLocale(byte[] bytes, boolean obf) {
 
 	private byte[] patchMinecraft(byte[] bytes, boolean obf) {
 		ClassNode clazz = Utils.readClass(bytes);
-		final Type fondRenderer = Utils.getObjectType(obf ? "bbu" : "net.minecraft.client.gui.FontRenderer");
-		final String mStartGame = obf ? "ag" : "startGame";
+		final Type fondRenderer = Utils.getObjectType(obf ? "bip" : "net.minecraft.client.gui.FontRenderer");
+		final String mStartGame = obf ? "aq" : "init";
 
 		for (MethodNode method : clazz.methods) {
 			if (method.name.equals(mStartGame) && method.desc.equals(Type.getMethodDescriptor(Type.VOID_TYPE))) {

src/main/java/com/gamerforea/fontfix/LoadingPlugin.java

@@ -1,12 +1,12 @@
 package com.gamerforea.fontfix;
 
 import java.util.Map;
-import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 import net.minecraft.launchwrapper.Launch;
+import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-@IFMLLoadingPlugin.MCVersion("1.7.10")
+@IFMLLoadingPlugin.MCVersion("1.12.2")
 @IFMLLoadingPlugin.SortingIndex(900) // Obf
 public class LoadingPlugin implements IFMLLoadingPlugin {