diff --git a/client/src/main/java/Static137.java b/client/src/main/java/Static137.java index 7af505e..db1c601 100644 --- a/client/src/main/java/Static137.java +++ b/client/src/main/java/Static137.java @@ -14,8 +14,8 @@ public final class Static137 { public static final JagString aClass100_637 = Static28.method790(""); @OriginalMember(owner = "client!kl", name = "a", descriptor = "(Lclient!wa;B)Lclient!kc;") - public static Class18_Sub2 method2664(@OriginalArg(0) Buffer arg0) { - return new Class18_Sub2(arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2220(), arg0.method2220(), arg0.method2229()); + public static TextureOp29SubOp2 method2664(@OriginalArg(0) Buffer arg0) { + return new TextureOp29SubOp2(arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2220(), arg0.method2220(), arg0.method2229()); } @OriginalMember(owner = "client!kl", name = "b", descriptor = "(II)Z") diff --git a/client/src/main/java/Static156.java b/client/src/main/java/Static156.java index 1f9f22a..9fc94b0 100644 --- a/client/src/main/java/Static156.java +++ b/client/src/main/java/Static156.java @@ -191,7 +191,7 @@ public final class Static156 { } @OriginalMember(owner = "client!mf", name = "a", descriptor = "(BLclient!wa;)Lclient!ta;") - public static Class18_Sub4 method2960(@OriginalArg(1) Buffer arg0) { - return new Class18_Sub4(arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2220(), arg0.method2220(), arg0.method2229()); + public static TextureOp29SubOp4 method2960(@OriginalArg(1) Buffer arg0) { + return new TextureOp29SubOp4(arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2220(), arg0.method2220(), arg0.method2229()); } } diff --git a/client/src/main/java/Static21.java b/client/src/main/java/Static21.java index 94a9d41..0674c17 100644 --- a/client/src/main/java/Static21.java +++ b/client/src/main/java/Static21.java @@ -31,7 +31,7 @@ public final class Static21 { } @OriginalMember(owner = "client!bk", name = "a", descriptor = "(BLclient!wa;)Lclient!re;") - public static Class18_Sub3 method620(@OriginalArg(1) Buffer arg0) { - return new Class18_Sub3(arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2220(), arg0.method2229()); + public static TextureOp29SubOp3 method620(@OriginalArg(1) Buffer arg0) { + return new TextureOp29SubOp3(arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2220(), arg0.method2229()); } } diff --git a/client/src/main/java/Static9.java b/client/src/main/java/Static9.java index 91c8a9e..af3c28e 100644 --- a/client/src/main/java/Static9.java +++ b/client/src/main/java/Static9.java @@ -88,8 +88,8 @@ public final class Static9 { } @OriginalMember(owner = "client!al", name = "a", descriptor = "(ILclient!wa;)Lclient!ci;") - public static Class18_Sub1 method184(@OriginalArg(1) Buffer arg0) { - return new Class18_Sub1(arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2220(), arg0.method2229()); + public static TextureOp29SubOp1 method184(@OriginalArg(1) Buffer arg0) { + return new TextureOp29SubOp1(arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2220(), arg0.method2229()); } @OriginalMember(owner = "client!al", name = "b", descriptor = "(B)V") diff --git a/client/src/main/java/TextureOp29.java b/client/src/main/java/TextureOp29.java index 78b5ae5..d11fd03 100644 --- a/client/src/main/java/TextureOp29.java +++ b/client/src/main/java/TextureOp29.java @@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc; public final class TextureOp29 extends TextureOp { @OriginalMember(owner = "client!si", name = "U", descriptor = "[Lclient!kf;") - private Class18[] aClass18Array1; + private TextureOp29SubOp[] aClass18Array1; @OriginalMember(owner = "client!si", name = "", descriptor = "()V") public TextureOp29() { @@ -34,7 +34,7 @@ public final class TextureOp29 extends TextureOp { return; } for (@Pc(23) int local23 = 0; local23 < this.aClass18Array1.length; local23++) { - @Pc(33) Class18 local33 = this.aClass18Array1[local23]; + @Pc(33) TextureOp29SubOp local33 = this.aClass18Array1[local23]; @Pc(36) int local36 = local33.anInt5228; @Pc(39) int local39 = local33.anInt5229; if (local36 >= 0) { @@ -53,7 +53,7 @@ public final class TextureOp29 extends TextureOp { @Override public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) { if (arg0 == 0) { - this.aClass18Array1 = new Class18[arg1.method2229()]; + this.aClass18Array1 = new TextureOp29SubOp[arg1.method2229()]; for (@Pc(11) int local11 = 0; local11 < this.aClass18Array1.length; local11++) { @Pc(24) int local24 = arg1.method2229(); if (local24 == 0) { diff --git a/client/src/main/java/Class18.java b/client/src/main/java/TextureOp29SubOp.java similarity index 88% rename from client/src/main/java/Class18.java rename to client/src/main/java/TextureOp29SubOp.java index 73ab7f2..daac203 100644 --- a/client/src/main/java/Class18.java +++ b/client/src/main/java/TextureOp29SubOp.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!kf") -public abstract class Class18 { +public abstract class TextureOp29SubOp { @OriginalMember(owner = "client!kf", name = "e", descriptor = "I") public final int anInt5229; @@ -15,7 +15,7 @@ public abstract class Class18 { public final int anInt5228; @OriginalMember(owner = "client!kf", name = "", descriptor = "(III)V") - protected Class18(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { + protected TextureOp29SubOp(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { this.anInt5229 = arg1; this.anInt5231 = arg2; this.anInt5228 = arg0; diff --git a/client/src/main/java/Class18_Sub1.java b/client/src/main/java/TextureOp29SubOp1.java similarity index 86% rename from client/src/main/java/Class18_Sub1.java rename to client/src/main/java/TextureOp29SubOp1.java index 5cfa346..b3ef593 100644 --- a/client/src/main/java/Class18_Sub1.java +++ b/client/src/main/java/TextureOp29SubOp1.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!ci") -public final class Class18_Sub1 extends Class18 { +public final class TextureOp29SubOp1 extends TextureOp29SubOp { @OriginalMember(owner = "client!ci", name = "s", descriptor = "I") private final int anInt1015; @@ -19,7 +19,7 @@ public final class Class18_Sub1 extends Class18 { private final int anInt1017; @OriginalMember(owner = "client!ci", name = "", descriptor = "(IIIIII)V") - public Class18_Sub1(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { + public TextureOp29SubOp1(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { super(-1, arg4, arg5); this.anInt1015 = arg3; this.anInt1012 = arg1; diff --git a/client/src/main/java/Class18_Sub2.java b/client/src/main/java/TextureOp29SubOp2.java similarity index 87% rename from client/src/main/java/Class18_Sub2.java rename to client/src/main/java/TextureOp29SubOp2.java index 3296882..b8a7d9b 100644 --- a/client/src/main/java/Class18_Sub2.java +++ b/client/src/main/java/TextureOp29SubOp2.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!kc") -public final class Class18_Sub2 extends Class18 { +public final class TextureOp29SubOp2 extends TextureOp29SubOp { @OriginalMember(owner = "client!kc", name = "B", descriptor = "I") private final int anInt3168; @@ -19,7 +19,7 @@ public final class Class18_Sub2 extends Class18 { private final int anInt3159; @OriginalMember(owner = "client!kc", name = "", descriptor = "(IIIIIII)V") - public Class18_Sub2(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) { + public TextureOp29SubOp2(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) { super(arg4, arg5, arg6); this.anInt3168 = arg3; this.anInt3165 = arg0; diff --git a/client/src/main/java/Class18_Sub3.java b/client/src/main/java/TextureOp29SubOp3.java similarity index 87% rename from client/src/main/java/Class18_Sub3.java rename to client/src/main/java/TextureOp29SubOp3.java index 666e9a6..53a16de 100644 --- a/client/src/main/java/Class18_Sub3.java +++ b/client/src/main/java/TextureOp29SubOp3.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!re") -public final class Class18_Sub3 extends Class18 { +public final class TextureOp29SubOp3 extends TextureOp29SubOp { @OriginalMember(owner = "client!re", name = "x", descriptor = "I") private final int anInt4850; @@ -31,7 +31,7 @@ public final class Class18_Sub3 extends Class18 { private final int anInt4854; @OriginalMember(owner = "client!re", name = "", descriptor = "(IIIIIIIIII)V") - public Class18_Sub3(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9) { + public TextureOp29SubOp3(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9) { super(-1, arg8, arg9); this.anInt4850 = arg1; this.anInt4853 = arg6; diff --git a/client/src/main/java/Class18_Sub4.java b/client/src/main/java/TextureOp29SubOp4.java similarity index 89% rename from client/src/main/java/Class18_Sub4.java rename to client/src/main/java/TextureOp29SubOp4.java index 48a69bf..63976b1 100644 --- a/client/src/main/java/Class18_Sub4.java +++ b/client/src/main/java/TextureOp29SubOp4.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!ta") -public final class Class18_Sub4 extends Class18 { +public final class TextureOp29SubOp4 extends TextureOp29SubOp { @OriginalMember(owner = "client!ta", name = "D", descriptor = "I") private final int anInt5247; @@ -19,7 +19,7 @@ public final class Class18_Sub4 extends Class18 { private final int anInt5244; @OriginalMember(owner = "client!ta", name = "", descriptor = "(IIIIIII)V") - public Class18_Sub4(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) { + public TextureOp29SubOp4(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) { super(arg4, arg5, arg6); this.anInt5247 = arg1; this.anInt5238 = arg2;