Skip to content

Commit 4ea5c32

Browse files
committed
Порт на MC 1.5.2
1 parent a005d66 commit 4ea5c32

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ apply plugin: 'java'
1616
apply plugin: 'idea'
1717

1818
repositories {
19-
mavenLocal()
19+
flatDir {
20+
dirs 'lib'
21+
}
2022
if (repositories.hasProperty('redserver')) {
2123
redserver()
2224
}
@@ -35,7 +37,7 @@ archivesBaseName = 'FontFix'
3537
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_6
3638

3739
dependencies {
38-
compile group: 'net.minecraftforge', name: 'forgeSrc', version: '1.4.7-6.6.2.534'
40+
compile group: 'net.minecraftforge', name: 'forgeSrc', version: '1.5.2-7.8.1.738'
3941
compile group: 'net.minecraft', name: 'launchwrapper', version: '1.5'
4042
}
4143

@@ -61,7 +63,7 @@ artifacts {
6163

6264
/* Reobf task */
6365
task reobf(type: BON, dependsOn: jar) {
64-
mcpFolder = getProperty('minecraft.mcp.dir') + '/1.4.7-forge'
66+
mcpFolder = getProperty('minecraft.mcp.dir') + '/1.5.2-forge'
6567
input = jar.archivePath
6668
output = jar.archivePath
6769
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Project
22
group=me.theandrey
3-
version=1.4.7
3+
version=1.5.2

src/main/java/me/theandrey/fontfix/ASMTransformer.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ public class ASMTransformer implements IClassTransformer {
2323
private static final String CYRILLIC_TEXTURE = "/font/default_ru.png";
2424

2525
@Override
26-
public byte[] transform(String name, byte[] bytes) {
27-
if (name.equals("bn")) {
26+
public byte[] transform(String name, String transformedName, byte[] bytes) {
27+
if (name.equals("bp")) {
2828
return patchStringTranslate(bytes, true);
2929
} else if (name.equals("net.minecraft.util.StringTranslate")) {
3030
return patchStringTranslate(bytes, false);
3131
} else if (name.equals("net.minecraft.client.Minecraft")) {
3232
return patchMinecraft(bytes, LoadingPlugin.isGameObfuscated());
33-
} else if (name.equals("u") || name.equals("net.minecraft.util.ChatAllowedCharacters")) {
33+
} else if (name.equals("v") || name.equals("net.minecraft.util.ChatAllowedCharacters")) {
3434
return patchAllowedCharacters(bytes);
3535
}
3636
return bytes;
@@ -44,11 +44,11 @@ private byte[] patchStringTranslate(byte[] bytes, boolean obf) {
4444
ClassNode clazz = Utils.readClass(bytes);
4545

4646
final String findMethod = obf ? "a" : "setLanguage";
47-
final String isUnicode = obf ? "e" : "isUnicode";
48-
final String currentLanguage = obf ? "d" : "currentLanguage";
47+
final String isUnicode = obf ? "f" : "isUnicode";
48+
final String currentLanguage = obf ? "e" : "currentLanguage";
4949

5050
for (MethodNode method : clazz.methods) {
51-
if (method.name.equals(findMethod) && method.desc.equals(Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(String.class)))) {
51+
if (method.name.equals(findMethod) && method.desc.equals(Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(String.class), Type.BOOLEAN_TYPE))) {
5252

5353
ListIterator<AbstractInsnNode> iter = method.instructions.iterator();
5454

@@ -91,7 +91,7 @@ private byte[] patchStringTranslate(byte[] bytes, boolean obf) {
9191
*/
9292
private byte[] patchMinecraft(byte[] bytes, boolean obf) {
9393
ClassNode clazz = Utils.readClass(bytes);
94-
final Type fondRenderer = Utils.getObjectType(obf ? "atq" : "net.minecraft.client.gui.FontRenderer");
94+
final Type fondRenderer = Utils.getObjectType(obf ? "awv" : "net.minecraft.client.gui.FontRenderer");
9595
final String startGame = obf ? "a" : "startGame";
9696

9797
for (MethodNode method : clazz.methods) {

0 commit comments

Comments
 (0)