Skip to content

Commit a005d66

Browse files
committed
Сборка под Java 1.6
Для возможности использования на любых сборках
1 parent d0dd914 commit a005d66

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ idea {
3232

3333
// Project settings
3434
archivesBaseName = 'FontFix'
35-
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
35+
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_6
3636

3737
dependencies {
3838
compile group: 'net.minecraftforge', name: 'forgeSrc', version: '1.4.7-6.6.2.534'

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,22 @@ public class ASMTransformer implements IClassTransformer {
2424

2525
@Override
2626
public byte[] transform(String name, byte[] bytes) {
27-
switch (name) {
28-
case "bn":
29-
return patchStringTranslate(bytes, true);
30-
case "net.minecraft.util.StringTranslate":
31-
return patchStringTranslate(bytes, false);
32-
case "net.minecraft.client.Minecraft":
33-
return patchMinecraft(bytes, LoadingPlugin.isGameObfuscated());
34-
case "u":
35-
case "net.minecraft.util.ChatAllowedCharacters":
36-
return patchAllowedCharacters(bytes);
27+
if (name.equals("bn")) {
28+
return patchStringTranslate(bytes, true);
29+
} else if (name.equals("net.minecraft.util.StringTranslate")) {
30+
return patchStringTranslate(bytes, false);
31+
} else if (name.equals("net.minecraft.client.Minecraft")) {
32+
return patchMinecraft(bytes, LoadingPlugin.isGameObfuscated());
33+
} else if (name.equals("u") || name.equals("net.minecraft.util.ChatAllowedCharacters")) {
34+
return patchAllowedCharacters(bytes);
3735
}
3836
return bytes;
3937
}
4038

4139
/**
4240
* Делает русскую локаль не-unicode
4341
*/
42+
@SuppressWarnings("deprecation")
4443
private byte[] patchStringTranslate(byte[] bytes, boolean obf) {
4544
ClassNode clazz = Utils.readClass(bytes);
4645

@@ -66,7 +65,7 @@ private byte[] patchStringTranslate(byte[] bytes, boolean obf) {
6665
InsnList list = new InsnList();
6766
list.add(new LdcInsnNode("ru_RU"));
6867
list.add(new VarInsnNode(ALOAD, 1)); // #1 param
69-
list.add(new MethodInsnNode(INVOKEVIRTUAL, Type.getInternalName(String.class), "equals", Type.getMethodDescriptor(Type.BOOLEAN_TYPE, Type.getType(Object.class)), false));
68+
list.add(new MethodInsnNode(INVOKEVIRTUAL, Type.getInternalName(String.class), "equals", Type.getMethodDescriptor(Type.BOOLEAN_TYPE, Type.getType(Object.class))));
7069
list.add(new JumpInsnNode(IFEQ, label));
7170
list.add(new VarInsnNode(ALOAD, 0)); // this
7271
list.add(new InsnNode(ICONST_0));

0 commit comments

Comments
 (0)