From 97d28abd0a8997d7bf830d4dbacc5446c6567910 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 11 Mar 2017 13:07:25 -0500 Subject: [PATCH] rsmv: renaming of some fields and classes --- .../cache/definitions/ModelDefinition.java | 2 +- .../definitions/loaders/ModelLoader.java | 4 +- .../main/java/net/runelite/rsmv/Buffer.java | 43 + .../src/main/java/net/runelite/rsmv/Main.java | 70 +- .../rsmv/{class19.java => Model.java} | 1134 ++++++++--------- .../main/java/net/runelite/rsmv/class10.java | 17 - .../main/java/net/runelite/rsmv/class13.java | 2 +- .../main/java/net/runelite/rsmv/class15.java | 6 +- .../main/java/net/runelite/rsmv/class17.java | 43 - .../main/java/net/runelite/rsmv/class7.java | 17 - .../RSMVAbstractListModel.java} | 7 +- .../RSMVAbstractListModel2.java} | 7 +- .../RSMVActionListener.java} | 9 +- .../runelite/rsmv/ui/RSMVActionListener2.java | 18 + .../runelite/rsmv/ui/RSMVActionListener3.java | 18 + .../RSMVComponentAdapter.java} | 9 +- .../RSMVListSelectionListener.java} | 9 +- .../{class4.java => ui/RSMVMouseAdapter.java} | 9 +- .../RSMVMouseMotionAdapter.java} | 9 +- .../RSMVMouseWheelListener.java} | 9 +- .../RSMVWindowAdapter.java} | 9 +- .../net/runelite/rsmv/{ => ui}/class8.java | 9 +- 22 files changed, 743 insertions(+), 717 deletions(-) create mode 100644 model-viewer-rsmv/src/main/java/net/runelite/rsmv/Buffer.java rename model-viewer-rsmv/src/main/java/net/runelite/rsmv/{class19.java => Model.java} (56%) delete mode 100644 model-viewer-rsmv/src/main/java/net/runelite/rsmv/class10.java delete mode 100644 model-viewer-rsmv/src/main/java/net/runelite/rsmv/class17.java delete mode 100644 model-viewer-rsmv/src/main/java/net/runelite/rsmv/class7.java rename model-viewer-rsmv/src/main/java/net/runelite/rsmv/{class6.java => ui/RSMVAbstractListModel.java} (68%) rename model-viewer-rsmv/src/main/java/net/runelite/rsmv/{class2.java => ui/RSMVAbstractListModel2.java} (67%) rename model-viewer-rsmv/src/main/java/net/runelite/rsmv/{class9.java => ui/RSMVActionListener.java} (50%) create mode 100644 model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVActionListener2.java create mode 100644 model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVActionListener3.java rename model-viewer-rsmv/src/main/java/net/runelite/rsmv/{class3.java => ui/RSMVComponentAdapter.java} (50%) rename model-viewer-rsmv/src/main/java/net/runelite/rsmv/{class0.java => ui/RSMVListSelectionListener.java} (50%) rename model-viewer-rsmv/src/main/java/net/runelite/rsmv/{class4.java => ui/RSMVMouseAdapter.java} (56%) rename model-viewer-rsmv/src/main/java/net/runelite/rsmv/{class1.java => ui/RSMVMouseMotionAdapter.java} (50%) rename model-viewer-rsmv/src/main/java/net/runelite/rsmv/{class11.java => ui/RSMVMouseWheelListener.java} (50%) rename model-viewer-rsmv/src/main/java/net/runelite/rsmv/{class12.java => ui/RSMVWindowAdapter.java} (50%) rename model-viewer-rsmv/src/main/java/net/runelite/rsmv/{ => ui}/class8.java (57%) diff --git a/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java index 0a8a3bf166..12b0d4c3cb 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java @@ -20,7 +20,7 @@ public class ModelDefinition public byte[] faceRenderType; public short[] faceTextures; public byte priority; - public int anInt2569; + public int texTriangleCount; public byte[] textureRenderTypes; public short[] texTriangleY; public short[] texTriangleZ; diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/ModelLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/ModelLoader.java index efcd97bead..373b868d08 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/ModelLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/ModelLoader.java @@ -141,7 +141,7 @@ public class ModelLoader position += var7 * 2 + var29 * 2; model.vertexCount = verticeCount; model.triangleFaceCount = triangleCount; - model.anInt2569 = textureTriangleCount; + model.texTriangleCount = textureTriangleCount; model.vertexX = new int[verticeCount]; model.vertexY = new int[verticeCount]; model.vertexZ = new int[verticeCount]; @@ -492,7 +492,7 @@ public class ModelLoader int var10000 = var46 + var36; model.vertexCount = var10; model.triangleFaceCount = var11; - model.anInt2569 = var12; + model.texTriangleCount = var12; model.vertexX = new int[var10]; model.vertexY = new int[var10]; model.vertexZ = new int[var10]; diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/Buffer.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/Buffer.java new file mode 100644 index 0000000000..2b49eb186b --- /dev/null +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/Buffer.java @@ -0,0 +1,43 @@ +package net.runelite.rsmv; + + +public final class Buffer { + private byte[] field87; + public int offset; + + public Buffer(byte[] var1) { + this.field87 = var1; + this.offset = 0; + } + + public final int readUnsignedByte() { + return this.field87[this.offset++] & 255; + } + + public final byte readByte() { + return this.field87[this.offset++]; + } + + public final int readUnsignedShort() { + this.offset += 2; + return ((this.field87[this.offset - 2] & 255) << 8) + (this.field87[this.offset - 1] & 255); + } + + public final int readMid() { + this.offset += 3; + return ((this.field87[this.offset - 3] & 255) << 16) + ((this.field87[this.offset - 2] & 255) << 8) + (this.field87[this.offset - 1] & 255); + } + + public final int readShortv2() { + this.offset += 2; + return ((this.field87[this.offset - 2] & 255) << 8) + (this.field87[this.offset - 1] & 255); + } + + public final int readShortSmart() { + return (this.field87[this.offset] & 255) < 128?this.readUnsignedByte() - 64:this.readUnsignedShort() - '쀀'; + } + + static { + int[] var10000 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, '\uffff', 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; + } +} diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/Main.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/Main.java index eb7b410cc4..e323b3d20a 100644 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/Main.java +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/Main.java @@ -1,5 +1,17 @@ package net.runelite.rsmv; +import net.runelite.rsmv.ui.RSMVListSelectionListener; +import net.runelite.rsmv.ui.RSMVMouseMotionAdapter; +import net.runelite.rsmv.ui.RSMVActionListener3; +import net.runelite.rsmv.ui.RSMVMouseWheelListener; +import net.runelite.rsmv.ui.RSMVWindowAdapter; +import net.runelite.rsmv.ui.RSMVAbstractListModel2; +import net.runelite.rsmv.ui.RSMVComponentAdapter; +import net.runelite.rsmv.ui.RSMVMouseAdapter; +import net.runelite.rsmv.ui.RSMVAbstractListModel; +import net.runelite.rsmv.ui.RSMVActionListener2; +import net.runelite.rsmv.ui.class8; +import net.runelite.rsmv.ui.RSMVActionListener; import java.awt.Color; import java.awt.EventQueue; import java.awt.event.ActionEvent; @@ -39,7 +51,7 @@ public class Main extends JFrame implements Runnable { private int field37 = -1; private String field38 = ""; private static long field39 = 0L; - private class19 field40; + private Model field40; private JFileChooser field41; private JFileChooser field42; private static class13 field43; @@ -73,26 +85,26 @@ public class Main extends JFrame implements Runnable { this.field47 = new JMenuItem(); this.setDefaultCloseOperation(3); this.setTitle("Runescape Model Viewer"); - this.addWindowListener(new class12(this)); + this.addWindowListener(new RSMVWindowAdapter(this)); this.field52.setBackground(new Color(0, 0, 0)); - this.field52.addMouseWheelListener(new class11(this)); - this.field52.addMouseListener(new class4(this)); - this.field52.addComponentListener(new class3(this)); - this.field52.addMouseMotionListener(new class1(this)); + this.field52.addMouseWheelListener(new RSMVMouseWheelListener(this)); + this.field52.addMouseListener(new RSMVMouseAdapter(this)); + this.field52.addComponentListener(new RSMVComponentAdapter(this)); + this.field52.addMouseMotionListener(new RSMVMouseMotionAdapter(this)); GroupLayout var2 = new GroupLayout(this.field52); this.field52.setLayout(var2); var2.setHorizontalGroup(var2.createParallelGroup(Alignment.LEADING).addGap(0, 536, 32767)); var2.setVerticalGroup(var2.createParallelGroup(Alignment.LEADING).addGap(0, 318, 32767)); - this.field44.addListSelectionListener(new class0(this)); + this.field44.addListSelectionListener(new RSMVListSelectionListener(this)); this.field48.setViewportView(this.field44); this.field51.setText("Optimized Rendering"); - this.field51.addActionListener(new class10(this)); + this.field51.addActionListener(new RSMVActionListener3(this)); this.field45.setText("File"); this.field50.setText("Load"); - this.field50.addActionListener(new class9(this)); + this.field50.addActionListener(new RSMVActionListener(this)); this.field45.add(this.field50); this.field49.setText("Load Folder"); - this.field49.addActionListener(new class7(this)); + this.field49.addActionListener(new RSMVActionListener2(this)); this.field45.add(this.field49); this.field47.setText("Exit"); this.field45.add(this.field47); @@ -176,7 +188,7 @@ public class Main extends JFrame implements Runnable { var4[var5] = var10[var5].getName(); } - this.field44.setModel(new class2(this, var6, var4)); + this.field44.setModel(new RSMVAbstractListModel2(this, var6, var4)); } var1.close(); @@ -211,30 +223,30 @@ public class Main extends JFrame implements Runnable { } // $FF: synthetic method - static void method13(Main var0, WindowEvent var1) { + public static void windowClosingCallback(Main var0, WindowEvent var1) { var0.method11(); } // $FF: synthetic method - static void method14(Main var0, MouseWheelEvent var1) { + public static void mouseWheelMoved(Main var0, MouseWheelEvent var1) { int var2 = var1.getWheelRotation(); var0.field35 += var2 * 10; } // $FF: synthetic method - static void method15(Main var0, MouseEvent var1) { + public static void mouseReleasedCallback(Main var0, MouseEvent var1) { var0.field37 = var0.field36 = -1; } // $FF: synthetic method - static void method16(Main var0, ComponentEvent var1) { + public static void componentResizedCallback(Main var0, ComponentEvent var1) { if(var0.field52.getWidth() > 0 && var0.field52.getHeight() > 0) { var0.method9(); } } // $FF: synthetic method - static void method17(Main var0, MouseEvent var1) { + public static void mouseDragged(Main var0, MouseEvent var1) { int var2 = var1.getX(); int var3 = var1.getY(); if(var0.field36 != -1 || var0.field37 != -1) { @@ -258,18 +270,18 @@ public class Main extends JFrame implements Runnable { } // $FF: synthetic method - static void method18(Main var0, ListSelectionEvent var1) { + public static void listSelectionValueChanged(Main var0, ListSelectionEvent var1) { if(!var1.getValueIsAdjusting()) { String var2 = var0.field44.getModel().getElementAt(var0.field44.getAnchorSelectionIndex()).toString(); byte[] var3; - class19 var4; + Model var4; if((var3 = method12(var0.field38 + System.getProperty("file.separator") + var2))[var3.length - 1] == -1 && var3[var3.length - 2] == -1) { - if((var4 = class19.method36(var3)).field91) { + if((var4 = Model.method36(var3)).field91) { var4.method37(4); } } else { - class19.method34(var3, 0); - var4 = class19.method35(0); + Model.method34(var3, 0); + var4 = Model.method35(0); } var4.method38(64, 768, -50, -10, -50, true); @@ -279,24 +291,24 @@ public class Main extends JFrame implements Runnable { } // $FF: synthetic method - static void method19(Main var0, ActionEvent var1) { + public static void actionListenerCallback3(Main var0, ActionEvent var1) { field32 = var0.field51.isSelected(); } // $FF: synthetic method - static void method20(Main var0, ActionEvent var1) { + public static void actionListenerCallback(Main var0, ActionEvent var1) { var0.field41.setFileSelectionMode(0); File var2; if(var0.field41.showOpenDialog(var0) == 0 && (var2 = var0.field41.getSelectedFile()).isFile()) { byte[] var3; - class19 var4; + Model var4; if((var3 = method12(var2.getAbsolutePath()))[var3.length - 1] == -1 && var3[var3.length - 2] == -1) { - if((var4 = class19.method36(var3)).field91) { + if((var4 = Model.method36(var3)).field91) { var4.method37(4); } } else { - class19.method34(var3, 0); - var4 = class19.method35(0); + Model.method34(var3, 0); + var4 = Model.method35(0); } var4.method38(64, 768, -50, -10, -50, true); @@ -306,7 +318,7 @@ public class Main extends JFrame implements Runnable { } // $FF: synthetic method - static void method21(Main var0, ActionEvent var1) { + public static void actionListenerCallback2(Main var0, ActionEvent var1) { var0.field42.setFileSelectionMode(1); File var5; if(var0.field42.showOpenDialog(var0) == 0 && (var5 = var0.field42.getSelectedFile()).isDirectory()) { @@ -320,7 +332,7 @@ public class Main extends JFrame implements Runnable { var3[var4] = var6[var4].getName(); } - var0.field44.setModel(new class6(var0, var2, var3)); + var0.field44.setModel(new RSMVAbstractListModel(var0, var2, var3)); var0.method11(); } diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class19.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/Model.java similarity index 56% rename from model-viewer-rsmv/src/main/java/net/runelite/rsmv/class19.java rename to model-viewer-rsmv/src/main/java/net/runelite/rsmv/Model.java index 0fb219afcb..1c133a0a8c 100644 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class19.java +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/Model.java @@ -1,24 +1,24 @@ package net.runelite.rsmv; -public final class class19 extends class18 { +public final class Model extends class18 { public boolean field91 = false; - private int field92; - private int[] field93; - private int[] field94; - private int[] field95; - private int field96; - private int[] field97; - private int[] field98; - private int[] field99; + private int verticeCount; + private int[] vertexX; + private int[] vertexY; + private int[] vertexZ; + private int triangleCount; + private int[] trianglePointsX; + private int[] trianglePointsY; + private int[] trianglePointsZ; private int[] field100; private int[] field101; private int[] field102; - private int[] field103; + private int[] faceRenderType; private int[] field104; - private int[] field105; + private int[] faceAlphas; private int[] field106; - private int field107; + private int texTriangleCount; private int[] field108; private int[] field109; private int[] field110; @@ -26,8 +26,8 @@ public final class class19 extends class18 { private int field112; private int field113; private int field114; - private int[] field115; - private int[] field116; + private int[] vertexSkins; + private int[] triangleSkinValues; private class16[] field117; private static class15[] field118; private static boolean[] field119; @@ -61,61 +61,61 @@ public final class class19 extends class18 { public static void method34(byte[] var0, int var1) { if(var0 == null) { class15 var13; - (var13 = field118[0] = new class15()).field67 = 0; - var13.field68 = 0; - var13.field69 = 0; + (var13 = field118[0] = new class15()).vertexCount = 0; + var13.triangleFaceCount = 0; + var13.texTriangleCount = 0; } else { - class17 var12; - (var12 = new class17(var0)).field88 = var0.length - 18; + Buffer var12; + (var12 = new Buffer(var0)).offset = var0.length - 18; class15 var2; (var2 = field118[0] = new class15()).field66 = var0; - var2.field67 = var12.method29(); - var2.field68 = var12.method29(); - var2.field69 = var12.method27(); - int var10 = var12.method27(); - int var3 = var12.method27(); - int var4 = var12.method27(); - int var5 = var12.method27(); - int var6 = var12.method27(); - int var7 = var12.method29(); - int var8 = var12.method29(); - var12.method29(); - int var11 = var12.method29(); + var2.vertexCount = var12.readUnsignedShort(); + var2.triangleFaceCount = var12.readUnsignedShort(); + var2.texTriangleCount = var12.readUnsignedByte(); + int var10 = var12.readUnsignedByte(); + int var3 = var12.readUnsignedByte(); + int var4 = var12.readUnsignedByte(); + int var5 = var12.readUnsignedByte(); + int var6 = var12.readUnsignedByte(); + int var7 = var12.readUnsignedShort(); + int var8 = var12.readUnsignedShort(); + var12.readUnsignedShort(); + int var11 = var12.readUnsignedShort(); var2.field70 = 0; - int var9 = 0 + var2.field67; + int var9 = 0 + var2.vertexCount; var2.field76 = var9; - var9 += var2.field68; + var9 += var2.triangleFaceCount; var2.field79 = var9; if(var3 == 255) { - var9 += var2.field68; + var9 += var2.triangleFaceCount; } else { var2.field79 = -var3 - 1; } var2.field81 = var9; if(var5 == 1) { - var9 += var2.field68; + var9 += var2.triangleFaceCount; } else { var2.field81 = -1; } var2.field78 = var9; if(var10 == 1) { - var9 += var2.field68; + var9 += var2.triangleFaceCount; } else { var2.field78 = -1; } var2.field74 = var9; if(var6 == 1) { - var9 += var2.field67; + var9 += var2.vertexCount; } else { var2.field74 = -1; } var2.field80 = var9; if(var4 == 1) { - var9 += var2.field68; + var9 += var2.triangleFaceCount; } else { var2.field80 = -1; } @@ -123,9 +123,9 @@ public final class class19 extends class18 { var2.field75 = var9; var9 += var11; var2.field77 = var9; - var9 += var2.field68 << 1; + var9 += var2.triangleFaceCount << 1; var2.field82 = var9; - var9 += var2.field69 * 6; + var9 += var2.texTriangleCount * 6; var2.field71 = var9; var9 += var7; var2.field72 = var9; @@ -134,76 +134,76 @@ public final class class19 extends class18 { } } - public static class19 method35(int var0) { - return field118 == null?null:new class19(0); + public static Model method35(int var0) { + return field118 == null?null:new Model(0); } - public static class19 method36(byte[] var0) { - return new class19(var0); + public static Model method36(byte[] var0) { + return new Model(var0); } - private class19() { + private Model() { } public final void method37(int var1) { - for(var1 = 0; var1 < this.field92; ++var1) { - this.field93[var1] /= 4; - this.field94[var1] /= 4; - this.field95[var1] /= 4; + for(var1 = 0; var1 < this.verticeCount; ++var1) { + this.vertexX[var1] /= 4; + this.vertexY[var1] /= 4; + this.vertexZ[var1] /= 4; } } - private class19(byte[] var1) { - class17 var2 = new class17(var1); - class17 var3 = new class17(var1); - class17 var4 = new class17(var1); - class17 var5 = new class17(var1); - class17 var6 = new class17(var1); - class17 var7 = new class17(var1); - class17 var8 = new class17(var1); - var2.field88 = var1.length - 23; - int var9 = var2.method31(); - int var10 = var2.method31(); - int var11 = var2.method27(); + private Model(byte[] var1) { + Buffer var2 = new Buffer(var1); + Buffer var3 = new Buffer(var1); + Buffer var4 = new Buffer(var1); + Buffer var5 = new Buffer(var1); + Buffer var6 = new Buffer(var1); + Buffer var7 = new Buffer(var1); + Buffer var8 = new Buffer(var1); + var2.offset = var1.length - 23; + int verticeCount = var2.readShortv2(); + int triangleCount = var2.readShortv2(); + int textureTriangleCount = var2.readUnsignedByte(); class15 var12; (var12 = field118[0] = new class15()).field66 = var1; - var12.field67 = var9; - var12.field68 = var10; - var12.field69 = var11; - int var165 = var2.method27(); + var12.vertexCount = verticeCount; + var12.triangleFaceCount = triangleCount; + var12.texTriangleCount = textureTriangleCount; + int var165 = var2.readUnsignedByte(); boolean var13 = ~(1 & var165) == -2; boolean var14; if(!(var14 = (8 & var165) == 8)) { - class19 var84 = this; - class17 var86 = new class17(var1); - class17 var87 = new class17(var1); - class17 var88 = new class17(var1); - class17 var89 = new class17(var1); - class17 var90 = new class17(var1); - class17 var91 = new class17(var1); - class17 var92 = new class17(var1); - var86.field88 = var1.length - 23; - int var93 = var86.method31(); - int var94 = var86.method31(); - int var95 = var86.method27(); + Model var84 = this; + Buffer var86 = new Buffer(var1); + Buffer var87 = new Buffer(var1); + Buffer var88 = new Buffer(var1); + Buffer var89 = new Buffer(var1); + Buffer var90 = new Buffer(var1); + Buffer var91 = new Buffer(var1); + Buffer var92 = new Buffer(var1); + var86.offset = var1.length - 23; + int var93 = var86.readShortv2(); + int var94 = var86.readShortv2(); + int var95 = var86.readUnsignedByte(); class15 var96; (var96 = field118[0] = new class15()).field66 = var1; - var96.field67 = var93; - var96.field68 = var94; - var96.field69 = var95; - int var97 = var86.method27(); + var96.vertexCount = var93; + var96.triangleFaceCount = var94; + var96.texTriangleCount = var95; + int var97 = var86.readUnsignedByte(); boolean var98 = ~(1 & var97) == -2; - int var99 = var86.method27(); - int var100 = var86.method27(); - int var101 = var86.method27(); - int var102 = var86.method27(); - int var103 = var86.method27(); - int var104 = var86.method31(); - int var105 = var86.method31(); - int var106 = var86.method31(); - int var107 = var86.method31(); - int var108 = var86.method31(); + int var99 = var86.readUnsignedByte(); + int var100 = var86.readUnsignedByte(); + int var101 = var86.readUnsignedByte(); + int var102 = var86.readUnsignedByte(); + int var103 = var86.readUnsignedByte(); + int var104 = var86.readShortv2(); + int var105 = var86.readShortv2(); + int var106 = var86.readShortv2(); + int var107 = var86.readShortv2(); + int var108 = var86.readShortv2(); int var109 = 0; int var110 = 0; int var111 = 0; @@ -217,15 +217,15 @@ public final class class19 extends class18 { int[] var120 = null; int[] var121 = null; int[] var122 = null; - short[] var123 = null; + short[] faceColor = null; int var125; if(var95 > 0) { var114 = new byte[var95]; - var86.field88 = 0; + var86.offset = 0; for(var125 = 0; var125 < var95; ++var125) { byte var126; - if((var126 = var114[var125] = var86.method28()) == 0) { + if((var126 = var114[var125] = var86.readByte()) == 0) { ++var109; } @@ -282,23 +282,23 @@ public final class class19 extends class18 { int var143 = var125 += var110 * 6; int var144 = var125 += var110; int var145 = var125 + var110; - int[] var146 = new int[var93]; - int[] var147 = new int[var93]; - int[] var148 = new int[var93]; - int[] var149 = new int[var94]; - int[] var150 = new int[var94]; - int[] var151 = new int[var94]; - this.field115 = new int[var93]; - this.field103 = new int[var94]; + int[] vertexX = new int[var93]; + int[] vertexY = new int[var93]; + int[] vertexZ = new int[var93]; + int[] trianglePointsX = new int[var94]; + int[] trianglePointsY = new int[var94]; + int[] trianglePointsZ = new int[var94]; + this.vertexSkins = new int[var93]; + this.faceRenderType = new int[var94]; this.field104 = new int[var94]; - this.field105 = new int[var94]; - this.field116 = new int[var94]; + this.faceAlphas = new int[var94]; + this.triangleSkinValues = new int[var94]; if(var103 == 1) { - this.field115 = new int[var93]; + this.vertexSkins = new int[var93]; } if(var98) { - this.field103 = new int[var94]; + this.faceRenderType = new int[var94]; } if(var99 == 255) { @@ -306,22 +306,22 @@ public final class class19 extends class18 { } if(var100 == 1) { - this.field105 = new int[var94]; + this.faceAlphas = new int[var94]; } if(var101 == 1) { - this.field116 = new int[var94]; + this.triangleSkinValues = new int[var94]; } if(var102 == 1) { - var123 = new short[var94]; + faceColor = new short[var94]; } if(var102 == 1 && var95 > 0) { var113 = new byte[var94]; } - int[] var124 = new int[var94]; + int[] faceColors = new int[var94]; int[] var152 = null; int[] var153 = null; int[] var154 = null; @@ -344,11 +344,11 @@ public final class class19 extends class18 { } } - var86.field88 = var95; - var87.field88 = var137; - var88.field88 = var138; - var89.field88 = var139; - var90.field88 = var131; + var86.offset = var95; + var87.offset = var137; + var88.offset = var138; + var89.offset = var139; + var90.offset = var131; int var155 = 0; int var156 = 0; int var157 = 0; @@ -359,82 +359,82 @@ public final class class19 extends class18 { int var161; int var162; for(var158 = 0; var158 < var93; ++var158) { - var159 = var86.method27(); + var159 = var86.readUnsignedByte(); var160 = 0; if((var159 & 1) != 0) { - var160 = var87.method32(); + var160 = var87.readShortSmart(); } var161 = 0; if((var159 & 2) != 0) { - var161 = var88.method32(); + var161 = var88.readShortSmart(); } var162 = 0; if((var159 & 4) != 0) { - var162 = var89.method32(); + var162 = var89.readShortSmart(); } - var146[var158] = var155 + var160; - var147[var158] = var156 + var161; - var148[var158] = var157 + var162; - var155 = var146[var158]; - var156 = var147[var158]; - var157 = var148[var158]; - if(var84.field115 != null) { - var84.field115[var158] = var90.method27(); + vertexX[var158] = var155 + var160; + vertexY[var158] = var156 + var161; + vertexZ[var158] = var157 + var162; + var155 = vertexX[var158]; + var156 = vertexY[var158]; + var157 = vertexZ[var158]; + if(var84.vertexSkins != null) { + var84.vertexSkins[var158] = var90.readUnsignedByte(); } } - var86.field88 = var136; - var87.field88 = var127; - var88.field88 = var129; - var89.field88 = var132; - var90.field88 = var130; - var91.field88 = var134; - var92.field88 = var135; + var86.offset = var136; + var87.offset = var127; + var88.offset = var129; + var89.offset = var132; + var90.offset = var130; + var91.offset = var134; + var92.offset = var135; for(var158 = 0; var158 < var94; ++var158) { - var124[var158] = var86.method31(); + faceColors[var158] = var86.readShortv2(); if(var97 == 1) { - var84.field103[var158] = var87.method28(); - if(var84.field103[var158] == 2) { - var124[var158] = '\uffff'; + var84.faceRenderType[var158] = var87.readByte(); + if(var84.faceRenderType[var158] == 2) { + faceColors[var158] = '\uffff'; } - var84.field103[var158] = 0; + var84.faceRenderType[var158] = 0; } if(var99 == 255) { - var84.field104[var158] = var88.method28(); + var84.field104[var158] = var88.readByte(); } if(var100 == 1) { - var84.field105[var158] = var89.method28(); - if(var84.field105[var158] < 0) { - var84.field105[var158] += 256; + var84.faceAlphas[var158] = var89.readByte(); + if(var84.faceAlphas[var158] < 0) { + var84.faceAlphas[var158] += 256; } } if(var101 == 1) { - var84.field116[var158] = var90.method27(); + var84.triangleSkinValues[var158] = var90.readUnsignedByte(); } if(var102 == 1) { - var123[var158] = (short)(var91.method31() - 1); + faceColor[var158] = (short)(var91.readShortv2() - 1); } if(var113 != null) { - if(var123[var158] != -1) { - var113[var158] = (byte)(var92.method27() - 1); + if(faceColor[var158] != -1) { + var113[var158] = (byte)(var92.readUnsignedByte() - 1); } else { var113[var158] = -1; } } } - var86.field88 = var133; - var87.field88 = var128; + var86.offset = var133; + var87.offset = var128; var158 = 0; var159 = 0; var160 = 0; @@ -442,92 +442,92 @@ public final class class19 extends class18 { int var163; for(var162 = 0; var162 < var94; ++var162) { - if((var163 = var87.method27()) == 1) { - var161 = var158 = var86.method32() + var161; - var161 = var159 = var86.method32() + var161; - var161 = var160 = var86.method32() + var161; - var149[var162] = var158; - var150[var162] = var159; - var151[var162] = var160; + if((var163 = var87.readUnsignedByte()) == 1) { + var161 = var158 = var86.readShortSmart() + var161; + var161 = var159 = var86.readShortSmart() + var161; + var161 = var160 = var86.readShortSmart() + var161; + trianglePointsX[var162] = var158; + trianglePointsY[var162] = var159; + trianglePointsZ[var162] = var160; } if(var163 == 2) { var159 = var160; - var161 = var160 = var86.method32() + var161; - var149[var162] = var158; - var150[var162] = var159; - var151[var162] = var160; + var161 = var160 = var86.readShortSmart() + var161; + trianglePointsX[var162] = var158; + trianglePointsY[var162] = var159; + trianglePointsZ[var162] = var160; } if(var163 == 3) { var158 = var160; - var161 = var160 = var86.method32() + var161; - var149[var162] = var158; - var150[var162] = var159; - var151[var162] = var160; + var161 = var160 = var86.readShortSmart() + var161; + trianglePointsX[var162] = var158; + trianglePointsY[var162] = var159; + trianglePointsZ[var162] = var160; } if(var163 == 4) { int var164 = var158; var158 = var159; var159 = var164; - var161 = var160 = var86.method32() + var161; - var149[var162] = var158; - var150[var162] = var164; - var151[var162] = var160; + var161 = var160 = var86.readShortSmart() + var161; + trianglePointsX[var162] = var158; + trianglePointsY[var162] = var164; + trianglePointsZ[var162] = var160; } } - var86.field88 = var140; - var87.field88 = var141; - var88.field88 = var142; - var89.field88 = var143; - var90.field88 = var144; - var91.field88 = var145; + var86.offset = var140; + var87.offset = var141; + var88.offset = var142; + var89.offset = var143; + var90.offset = var144; + var91.offset = var145; for(var162 = 0; var162 < var95; ++var162) { if((var163 = var114[var162] & 255) == 0) { - var152[var162] = var86.method31(); - var153[var162] = var86.method31(); - var154[var162] = var86.method31(); + var152[var162] = var86.readShortv2(); + var153[var162] = var86.readShortv2(); + var154[var162] = var86.readShortv2(); } if(var163 == 1) { - var152[var162] = var87.method31(); - var153[var162] = var87.method31(); - var154[var162] = var87.method31(); - var120[var162] = var88.method31(); - var122[var162] = var88.method31(); - var121[var162] = var88.method31(); - var118[var162] = var89.method28(); - var119[var162] = var90.method28(); - var116[var162] = var91.method28(); + var152[var162] = var87.readShortv2(); + var153[var162] = var87.readShortv2(); + var154[var162] = var87.readShortv2(); + var120[var162] = var88.readShortv2(); + var122[var162] = var88.readShortv2(); + var121[var162] = var88.readShortv2(); + var118[var162] = var89.readByte(); + var119[var162] = var90.readByte(); + var116[var162] = var91.readByte(); } if(var163 == 2) { - var152[var162] = var87.method31(); - var153[var162] = var87.method31(); - var154[var162] = var87.method31(); - var120[var162] = var88.method31(); - var122[var162] = var88.method31(); - var121[var162] = var88.method31(); - var118[var162] = var89.method28(); - var119[var162] = var90.method28(); - var116[var162] = var91.method28(); - var117[var162] = var91.method28(); - var115[var162] = var91.method28(); + var152[var162] = var87.readShortv2(); + var153[var162] = var87.readShortv2(); + var154[var162] = var87.readShortv2(); + var120[var162] = var88.readShortv2(); + var122[var162] = var88.readShortv2(); + var121[var162] = var88.readShortv2(); + var118[var162] = var89.readByte(); + var119[var162] = var90.readByte(); + var116[var162] = var91.readByte(); + var117[var162] = var91.readByte(); + var115[var162] = var91.readByte(); } if(var163 == 3) { - var152[var162] = var87.method31(); - var153[var162] = var87.method31(); - var154[var162] = var87.method31(); - var120[var162] = var88.method31(); - var122[var162] = var88.method31(); - var121[var162] = var88.method31(); - var118[var162] = var89.method28(); - var119[var162] = var90.method28(); - var116[var162] = var91.method28(); + var152[var162] = var87.readShortv2(); + var153[var162] = var87.readShortv2(); + var154[var162] = var87.readShortv2(); + var120[var162] = var88.readShortv2(); + var122[var162] = var88.readShortv2(); + var121[var162] = var88.readShortv2(); + var118[var162] = var89.readByte(); + var119[var162] = var90.readByte(); + var116[var162] = var91.readByte(); } } @@ -537,42 +537,42 @@ public final class class19 extends class18 { } } - var84.field106 = var124; - var84.field92 = var93; - var84.field96 = var94; - var84.field93 = var146; - var84.field94 = var147; - var84.field95 = var148; - var84.field97 = var149; - var84.field98 = var150; - var84.field99 = var151; + var84.field106 = faceColors; + var84.verticeCount = var93; + var84.triangleCount = var94; + var84.vertexX = vertexX; + var84.vertexY = vertexY; + var84.vertexZ = vertexZ; + var84.trianglePointsX = trianglePointsX; + var84.trianglePointsY = trianglePointsY; + var84.trianglePointsZ = trianglePointsZ; } else { int var166 = 0; if(var14) { - var2.field88 -= 7; - var166 = var2.method27(); - var2.field88 += 6; + var2.offset -= 7; + var166 = var2.readUnsignedByte(); + var2.offset += 6; } if(var166 == 15) { this.field91 = true; } - int var168 = var2.method27(); - int var15 = var2.method27(); - int var16 = var2.method27(); - int var17 = var2.method27(); - int var18 = var2.method27(); - int var19 = var2.method31(); - int var20 = var2.method31(); - int var21 = var2.method31(); - int var22 = var2.method31(); - int var23 = var2.method31(); - int var24 = 0; + int modelPriority = var2.readUnsignedByte(); + int var15 = var2.readUnsignedByte(); + int var16 = var2.readUnsignedByte(); + int modelTexture = var2.readUnsignedByte(); + int modelVertexSkins = var2.readUnsignedByte(); + int var19 = var2.readShortv2(); + int var20 = var2.readShortv2(); + int var21 = var2.readShortv2(); + int var22 = var2.readShortv2(); + int var23 = var2.readShortv2(); + int textureAmount = 0; int var25 = 0; int var26 = 0; byte[] var27 = null; - byte[] var28 = null; + byte[] textureRenderTypes = null; byte[] var29 = null; byte[] var30 = null; byte[] var31 = null; @@ -582,15 +582,15 @@ public final class class19 extends class18 { int[] var35 = null; int[] var36 = null; short[] var37 = null; - int var38; - if(var11 > 0) { - var28 = new byte[var11]; - var2.field88 = 0; + int position; + if(textureTriangleCount > 0) { + textureRenderTypes = new byte[textureTriangleCount]; + var2.offset = 0; - for(var38 = 0; var38 < var11; ++var38) { + for(position = 0; position < textureTriangleCount; ++position) { byte var39; - if((var39 = var28[var38] = var2.method28()) == 0) { - ++var24; + if((var39 = textureRenderTypes[position] = var2.readByte()) == 0) { + ++textureAmount; } if(var39 > 0 && var39 <= 3) { @@ -603,50 +603,50 @@ public final class class19 extends class18 { } } - int var170 = var38 = var11 + var9; + int renderTypePos = position = textureTriangleCount + verticeCount; if(var13) { - var38 += var10; + position += triangleCount; } if(var165 == 1) { - var38 += var10; + position += triangleCount; } - int var40 = var38; - int var41 = var38 += var10; - if(var168 == 255) { - var38 += var10; + int var40 = position; + int var41 = position += triangleCount; + if(modelPriority == 255) { + position += triangleCount; } - int var42 = var38; + int var42 = position; if(var16 == 1) { - var38 += var10; + position += triangleCount; } - int var43 = var38; - if(var18 == 1) { - var38 += var9; + int var43 = position; + if(modelVertexSkins == 1) { + position += verticeCount; } - int var44 = var38; + int var44 = position; if(var15 == 1) { - var38 += var10; + position += triangleCount; } - int var45 = var38; - var22 = var38 += var22; - if(var17 == 1) { - var38 += var10 << 1; + int var45 = position; + var22 = position += var22; + if(modelTexture == 1) { + position += triangleCount << 1; } - int var46 = var38; - var23 = var38 += var23; - int var47 = var38 += var10 << 1; - int var48 = var38 += var19; - var20 = var38 += var20; - var21 = var38 += var21; - var24 = var38 += var24 * 6; - var38 += var25 * 6; + int textureCoordPos = position; + var23 = position += var23; + int var47 = position += triangleCount << 1; + int var48 = position += var19; + var20 = position += var20; + var21 = position += var21; + textureAmount = position += textureAmount * 6; + position += var25 * 6; byte var169 = 6; if(var166 != 14) { if(var166 >= 15) { @@ -656,57 +656,57 @@ public final class class19 extends class18 { var169 = 7; } - int var49 = var38; - int var50 = var38 += var169 * var25; - int var51 = var38 += var25; - int var64 = var38 + var25; - int[] var65 = new int[var9]; - int[] var66 = new int[var9]; - int[] var67 = new int[var9]; - int[] var68 = new int[var10]; - int[] var69 = new int[var10]; - int[] var70 = new int[var10]; - this.field115 = new int[var9]; - this.field103 = new int[var10]; - this.field104 = new int[var10]; - this.field105 = new int[var10]; - this.field116 = new int[var10]; - if(var18 == 1) { - this.field115 = new int[var9]; + int var49 = position; + int var50 = position += var169 * var25; + int var51 = position += var25; + int var64 = position + var25; + int[] vertexX = new int[verticeCount]; + int[] vertexY = new int[verticeCount]; + int[] vertexZ = new int[verticeCount]; + int[] trianglePointsX = new int[triangleCount]; + int[] trianglePointsY = new int[triangleCount]; + int[] trianglePointsZ = new int[triangleCount]; + this.vertexSkins = new int[verticeCount]; + this.faceRenderType = new int[triangleCount]; + this.field104 = new int[triangleCount]; + this.faceAlphas = new int[triangleCount]; + this.triangleSkinValues = new int[triangleCount]; + if(modelVertexSkins == 1) { + this.vertexSkins = new int[verticeCount]; } if(var13) { - this.field103 = new int[var10]; + this.faceRenderType = new int[triangleCount]; } - if(var168 == 255) { - this.field104 = new int[var10]; + if(modelPriority == 255) { + this.field104 = new int[triangleCount]; } if(var15 == 1) { - this.field105 = new int[var10]; + this.faceAlphas = new int[triangleCount]; } if(var16 == 1) { - this.field116 = new int[var10]; + this.triangleSkinValues = new int[triangleCount]; } - if(var17 == 1) { - var37 = new short[var10]; + if(modelTexture == 1) { + var37 = new short[triangleCount]; } - if(var17 == 1 && var11 > 0) { - var27 = new byte[var10]; + if(modelTexture == 1 && textureTriangleCount > 0) { + var27 = new byte[triangleCount]; } - int[] var167 = new int[var10]; + int[] var167 = new int[triangleCount]; int[] var71 = null; int[] var72 = null; int[] var73 = null; - if(var11 > 0) { - var71 = new int[var11]; - var72 = new int[var11]; - var73 = new int[var11]; + if(textureTriangleCount > 0) { + var71 = new int[textureTriangleCount]; + var72 = new int[textureTriangleCount]; + var73 = new int[textureTriangleCount]; if(var25 > 0) { var34 = new int[var25]; var36 = new int[var25]; @@ -722,11 +722,11 @@ public final class class19 extends class18 { } } - var2.field88 = var11; - var3.field88 = var47; - var4.field88 = var48; - var5.field88 = var20; - var6.field88 = var43; + var2.offset = textureTriangleCount; + var3.offset = var47; + var4.offset = var48; + var5.offset = var20; + var6.offset = var43; int var74 = 0; int var75 = 0; int var76 = 0; @@ -736,278 +736,278 @@ public final class class19 extends class18 { int var79; int var80; int var81; - for(var77 = 0; var77 < var9; ++var77) { - var78 = var2.method27(); + for(var77 = 0; var77 < verticeCount; ++var77) { + var78 = var2.readUnsignedByte(); var79 = 0; if((var78 & 1) != 0) { - var79 = var3.method32(); + var79 = var3.readShortSmart(); } var80 = 0; if((var78 & 2) != 0) { - var80 = var4.method32(); + var80 = var4.readShortSmart(); } var81 = 0; if((var78 & 4) != 0) { - var81 = var5.method32(); + var81 = var5.readShortSmart(); } - var65[var77] = var74 + var79; - var66[var77] = var75 + var80; - var67[var77] = var76 + var81; - var74 = var65[var77]; - var75 = var66[var77]; - var76 = var67[var77]; - if(this.field115 != null) { - this.field115[var77] = var6.method27(); + vertexX[var77] = var74 + var79; + vertexY[var77] = var75 + var80; + vertexZ[var77] = var76 + var81; + var74 = vertexX[var77]; + var75 = vertexY[var77]; + var76 = vertexZ[var77]; + if(this.vertexSkins != null) { + this.vertexSkins[var77] = var6.readUnsignedByte(); } } - var2.field88 = var23; - var3.field88 = var170; - var4.field88 = var41; - var5.field88 = var44; - var6.field88 = var42; - var7.field88 = var22; - var8.field88 = var46; + var2.offset = var23; + var3.offset = renderTypePos; + var4.offset = var41; + var5.offset = var44; + var6.offset = var42; + var7.offset = var22; + var8.offset = textureCoordPos; - for(var77 = 0; var77 < var10; ++var77) { - var167[var77] = var2.method31(); + for(var77 = 0; var77 < triangleCount; ++var77) { + var167[var77] = var2.readShortv2(); if(var165 == 1) { - this.field103[var77] = var3.method28(); - if(this.field103[var77] == 2) { + this.faceRenderType[var77] = var3.readByte(); + if(this.faceRenderType[var77] == 2) { var167[var77] = '\uffff'; } - this.field103[var77] = 0; + this.faceRenderType[var77] = 0; } - if(var168 == 255) { - this.field104[var77] = var4.method28(); + if(modelPriority == 255) { + this.field104[var77] = var4.readByte(); } if(var15 == 1) { - this.field105[var77] = var5.method28(); - if(this.field105[var77] < 0) { - this.field105[var77] += 256; + this.faceAlphas[var77] = var5.readByte(); + if(this.faceAlphas[var77] < 0) { + this.faceAlphas[var77] += 256; } } if(var16 == 1) { - this.field116[var77] = var6.method27(); + this.triangleSkinValues[var77] = var6.readUnsignedByte(); } - if(var17 == 1) { - var37[var77] = (short)(var7.method31() - 1); + if(modelTexture == 1) { + var37[var77] = (short)(var7.readShortv2() - 1); } if(var27 != null) { if(var37[var77] != -1) { - var27[var77] = (byte)(var8.method27() - 1); + var27[var77] = (byte)(var8.readUnsignedByte() - 1); } else { var27[var77] = -1; } } } - var2.field88 = var45; - var3.field88 = var40; + var2.offset = var45; + var3.offset = var40; var77 = 0; var78 = 0; var79 = 0; var80 = 0; int var82; - for(var81 = 0; var81 < var10; ++var81) { - if((var82 = var3.method27()) == 1) { - var80 = var77 = var2.method32() + var80; - var80 = var78 = var2.method32() + var80; - var80 = var79 = var2.method32() + var80; - var68[var81] = var77; - var69[var81] = var78; - var70[var81] = var79; + for(var81 = 0; var81 < triangleCount; ++var81) { + if((var82 = var3.readUnsignedByte()) == 1) { + var80 = var77 = var2.readShortSmart() + var80; + var80 = var78 = var2.readShortSmart() + var80; + var80 = var79 = var2.readShortSmart() + var80; + trianglePointsX[var81] = var77; + trianglePointsY[var81] = var78; + trianglePointsZ[var81] = var79; } if(var82 == 2) { var78 = var79; - var80 = var79 = var2.method32() + var80; - var68[var81] = var77; - var69[var81] = var78; - var70[var81] = var79; + var80 = var79 = var2.readShortSmart() + var80; + trianglePointsX[var81] = var77; + trianglePointsY[var81] = var78; + trianglePointsZ[var81] = var79; } if(var82 == 3) { var77 = var79; - var80 = var79 = var2.method32() + var80; - var68[var81] = var77; - var69[var81] = var78; - var70[var81] = var79; + var80 = var79 = var2.readShortSmart() + var80; + trianglePointsX[var81] = var77; + trianglePointsY[var81] = var78; + trianglePointsZ[var81] = var79; } if(var82 == 4) { int var83 = var77; var77 = var78; var78 = var83; - var80 = var79 = var2.method32() + var80; - var68[var81] = var77; - var69[var81] = var83; - var70[var81] = var79; + var80 = var79 = var2.readShortSmart() + var80; + trianglePointsX[var81] = var77; + trianglePointsY[var81] = var83; + trianglePointsZ[var81] = var79; } } - var2.field88 = var21; - var3.field88 = var24; - var4.field88 = var49; - var5.field88 = var50; - var6.field88 = var51; - var7.field88 = var64; + var2.offset = var21; + var3.offset = textureAmount; + var4.offset = var49; + var5.offset = var50; + var6.offset = var51; + var7.offset = var64; - for(var81 = 0; var81 < var11; ++var81) { - if((var82 = var28[var81] & 255) == 0) { - var71[var81] = var2.method31(); - var72[var81] = var2.method31(); - var73[var81] = var2.method31(); + for(var81 = 0; var81 < textureTriangleCount; ++var81) { + if((var82 = textureRenderTypes[var81] & 255) == 0) { + var71[var81] = var2.readShortv2(); + var72[var81] = var2.readShortv2(); + var73[var81] = var2.readShortv2(); } if(var82 == 1) { - var71[var81] = var3.method31(); - var72[var81] = var3.method31(); - var73[var81] = var3.method31(); + var71[var81] = var3.readShortv2(); + var72[var81] = var3.readShortv2(); + var73[var81] = var3.readShortv2(); if(var166 < 15) { - var34[var81] = var4.method31(); + var34[var81] = var4.readShortv2(); if(var166 >= 14) { - var36[var81] = var4.method30(); + var36[var81] = var4.readMid(); } else { - var36[var81] = var4.method31(); + var36[var81] = var4.readShortv2(); } - var35[var81] = var4.method31(); + var35[var81] = var4.readShortv2(); } else { - var34[var81] = var4.method30(); - var36[var81] = var4.method30(); - var35[var81] = var4.method30(); + var34[var81] = var4.readMid(); + var36[var81] = var4.readMid(); + var35[var81] = var4.readMid(); } - var32[var81] = var5.method28(); - var33[var81] = var6.method28(); - var30[var81] = var7.method28(); + var32[var81] = var5.readByte(); + var33[var81] = var6.readByte(); + var30[var81] = var7.readByte(); } if(var82 == 2) { - var71[var81] = var3.method31(); - var72[var81] = var3.method31(); - var73[var81] = var3.method31(); + var71[var81] = var3.readShortv2(); + var72[var81] = var3.readShortv2(); + var73[var81] = var3.readShortv2(); if(var166 >= 15) { - var34[var81] = var4.method30(); - var36[var81] = var4.method30(); - var35[var81] = var4.method30(); + var34[var81] = var4.readMid(); + var36[var81] = var4.readMid(); + var35[var81] = var4.readMid(); } else { - var34[var81] = var4.method31(); + var34[var81] = var4.readShortv2(); if(var166 < 14) { - var36[var81] = var4.method31(); + var36[var81] = var4.readShortv2(); } else { - var36[var81] = var4.method30(); + var36[var81] = var4.readMid(); } - var35[var81] = var4.method31(); + var35[var81] = var4.readShortv2(); } - var32[var81] = var5.method28(); - var33[var81] = var6.method28(); - var30[var81] = var7.method28(); - var31[var81] = var7.method28(); - var29[var81] = var7.method28(); + var32[var81] = var5.readByte(); + var33[var81] = var6.readByte(); + var30[var81] = var7.readByte(); + var31[var81] = var7.readByte(); + var29[var81] = var7.readByte(); } if(var82 == 3) { - var71[var81] = var3.method31(); - var72[var81] = var3.method31(); - var73[var81] = var3.method31(); + var71[var81] = var3.readShortv2(); + var72[var81] = var3.readShortv2(); + var73[var81] = var3.readShortv2(); if(var166 < 15) { - var34[var81] = var4.method31(); + var34[var81] = var4.readShortv2(); if(var166 < 14) { - var36[var81] = var4.method31(); + var36[var81] = var4.readShortv2(); } else { - var36[var81] = var4.method30(); + var36[var81] = var4.readMid(); } - var35[var81] = var4.method31(); + var35[var81] = var4.readShortv2(); } else { - var34[var81] = var4.method30(); - var36[var81] = var4.method30(); - var35[var81] = var4.method30(); + var34[var81] = var4.readMid(); + var36[var81] = var4.readMid(); + var35[var81] = var4.readMid(); } - var32[var81] = var5.method28(); - var33[var81] = var6.method28(); - var30[var81] = var7.method28(); + var32[var81] = var5.readByte(); + var33[var81] = var6.readByte(); + var30[var81] = var7.readByte(); } } - if(var168 != 255) { - for(var81 = 0; var81 < var10; ++var81) { - this.field104[var81] = var168; + if(modelPriority != 255) { + for(var81 = 0; var81 < triangleCount; ++var81) { + this.field104[var81] = modelPriority; } } this.field106 = var167; - this.field92 = var9; - this.field96 = var10; - this.field93 = var65; - this.field94 = var66; - this.field95 = var67; - this.field97 = var68; - this.field98 = var69; - this.field99 = var70; + this.verticeCount = verticeCount; + this.triangleCount = triangleCount; + this.vertexX = vertexX; + this.vertexY = vertexY; + this.vertexZ = vertexZ; + this.trianglePointsX = trianglePointsX; + this.trianglePointsY = trianglePointsY; + this.trianglePointsZ = trianglePointsZ; } } - private class19(int var1) { + private Model(int var1) { class15 var15 = field118[var1]; - this.field92 = var15.field67; - this.field96 = var15.field68; - this.field107 = var15.field69; - this.field93 = new int[this.field92]; - this.field94 = new int[this.field92]; - this.field95 = new int[this.field92]; - this.field97 = new int[this.field96]; - this.field98 = new int[this.field96]; - this.field99 = new int[this.field96]; - this.field108 = new int[this.field107]; - this.field109 = new int[this.field107]; - this.field110 = new int[this.field107]; + this.verticeCount = var15.vertexCount; + this.triangleCount = var15.triangleFaceCount; + this.texTriangleCount = var15.texTriangleCount; + this.vertexX = new int[this.verticeCount]; + this.vertexY = new int[this.verticeCount]; + this.vertexZ = new int[this.verticeCount]; + this.trianglePointsX = new int[this.triangleCount]; + this.trianglePointsY = new int[this.triangleCount]; + this.trianglePointsZ = new int[this.triangleCount]; + this.field108 = new int[this.texTriangleCount]; + this.field109 = new int[this.texTriangleCount]; + this.field110 = new int[this.texTriangleCount]; if(var15.field74 >= 0) { - this.field115 = new int[this.field92]; + this.vertexSkins = new int[this.verticeCount]; } if(var15.field78 >= 0) { - this.field103 = new int[this.field96]; + this.faceRenderType = new int[this.triangleCount]; } if(var15.field79 >= 0) { - this.field104 = new int[this.field96]; + this.field104 = new int[this.triangleCount]; } if(var15.field80 >= 0) { - this.field105 = new int[this.field96]; + this.faceAlphas = new int[this.triangleCount]; } if(var15.field81 >= 0) { - this.field116 = new int[this.field96]; + this.triangleSkinValues = new int[this.triangleCount]; } - this.field106 = new int[this.field96]; - class17 var2; - (var2 = new class17(var15.field66)).field88 = 0; - class17 var3; - (var3 = new class17(var15.field66)).field88 = var15.field71; - class17 var4; - (var4 = new class17(var15.field66)).field88 = var15.field72; - class17 var5; - (var5 = new class17(var15.field66)).field88 = var15.field73; - class17 var6; - (var6 = new class17(var15.field66)).field88 = var15.field74; + this.field106 = new int[this.triangleCount]; + Buffer var2; + (var2 = new Buffer(var15.field66)).offset = 0; + Buffer var3; + (var3 = new Buffer(var15.field66)).offset = var15.field71; + Buffer var4; + (var4 = new Buffer(var15.field66)).offset = var15.field72; + Buffer var5; + (var5 = new Buffer(var15.field66)).offset = var15.field73; + Buffer var6; + (var6 = new Buffer(var15.field66)).offset = var15.field74; int var7 = 0; int var8 = 0; int var9 = 0; @@ -1017,110 +1017,110 @@ public final class class19 extends class18 { int var12; int var13; int var14; - for(var10 = 0; var10 < this.field92; ++var10) { - var11 = var2.method27(); + for(var10 = 0; var10 < this.verticeCount; ++var10) { + var11 = var2.readUnsignedByte(); var12 = 0; if((var11 & 1) != 0) { - var12 = var3.method32(); + var12 = var3.readShortSmart(); } var13 = 0; if((var11 & 2) != 0) { - var13 = var4.method32(); + var13 = var4.readShortSmart(); } var14 = 0; if((var11 & 4) != 0) { - var14 = var5.method32(); + var14 = var5.readShortSmart(); } - this.field93[var10] = var7 + var12; - this.field94[var10] = var8 + var13; - this.field95[var10] = var9 + var14; - var7 = this.field93[var10]; - var8 = this.field94[var10]; - var9 = this.field95[var10]; - if(this.field115 != null) { - this.field115[var10] = var6.method27(); + this.vertexX[var10] = var7 + var12; + this.vertexY[var10] = var8 + var13; + this.vertexZ[var10] = var9 + var14; + var7 = this.vertexX[var10]; + var8 = this.vertexY[var10]; + var9 = this.vertexZ[var10]; + if(this.vertexSkins != null) { + this.vertexSkins[var10] = var6.readUnsignedByte(); } } - var2.field88 = var15.field77; - var3.field88 = var15.field78; - var4.field88 = var15.field79; - var5.field88 = var15.field80; - var6.field88 = var15.field81; + var2.offset = var15.field77; + var3.offset = var15.field78; + var4.offset = var15.field79; + var5.offset = var15.field80; + var6.offset = var15.field81; - for(var10 = 0; var10 < this.field96; ++var10) { - this.field106[var10] = var2.method29(); - if(this.field103 != null) { - this.field103[var10] = var3.method27(); + for(var10 = 0; var10 < this.triangleCount; ++var10) { + this.field106[var10] = var2.readUnsignedShort(); + if(this.faceRenderType != null) { + this.faceRenderType[var10] = var3.readUnsignedByte(); } if(this.field104 != null) { - this.field104[var10] = var4.method27(); + this.field104[var10] = var4.readUnsignedByte(); } - if(this.field105 != null) { - this.field105[var10] = var5.method27(); + if(this.faceAlphas != null) { + this.faceAlphas[var10] = var5.readUnsignedByte(); } - if(this.field116 != null) { - this.field116[var10] = var6.method27(); + if(this.triangleSkinValues != null) { + this.triangleSkinValues[var10] = var6.readUnsignedByte(); } } - var2.field88 = var15.field75; - var3.field88 = var15.field76; + var2.offset = var15.field75; + var3.offset = var15.field76; var10 = 0; var11 = 0; var12 = 0; var13 = 0; - for(var14 = 0; var14 < this.field96; ++var14) { + for(var14 = 0; var14 < this.triangleCount; ++var14) { int var16; - if((var16 = var3.method27()) == 1) { - var13 = var10 = var2.method32() + var13; - var13 = var11 = var2.method32() + var13; - var13 = var12 = var2.method32() + var13; - this.field97[var14] = var10; - this.field98[var14] = var11; - this.field99[var14] = var12; + if((var16 = var3.readUnsignedByte()) == 1) { + var13 = var10 = var2.readShortSmart() + var13; + var13 = var11 = var2.readShortSmart() + var13; + var13 = var12 = var2.readShortSmart() + var13; + this.trianglePointsX[var14] = var10; + this.trianglePointsY[var14] = var11; + this.trianglePointsZ[var14] = var12; } if(var16 == 2) { var11 = var12; - var13 = var12 = var2.method32() + var13; - this.field97[var14] = var10; - this.field98[var14] = var11; - this.field99[var14] = var12; + var13 = var12 = var2.readShortSmart() + var13; + this.trianglePointsX[var14] = var10; + this.trianglePointsY[var14] = var11; + this.trianglePointsZ[var14] = var12; } if(var16 == 3) { var10 = var12; - var13 = var12 = var2.method32() + var13; - this.field97[var14] = var10; - this.field98[var14] = var11; - this.field99[var14] = var12; + var13 = var12 = var2.readShortSmart() + var13; + this.trianglePointsX[var14] = var10; + this.trianglePointsY[var14] = var11; + this.trianglePointsZ[var14] = var12; } if(var16 == 4) { var16 = var10; var10 = var11; var11 = var16; - var13 = var12 = var2.method32() + var13; - this.field97[var14] = var10; - this.field98[var14] = var16; - this.field99[var14] = var12; + var13 = var12 = var2.readShortSmart() + var13; + this.trianglePointsX[var14] = var10; + this.trianglePointsY[var14] = var16; + this.trianglePointsZ[var14] = var12; } } - var2.field88 = var15.field82; + var2.offset = var15.field82; - for(var14 = 0; var14 < this.field107; ++var14) { - this.field108[var14] = var2.method29(); - this.field109[var14] = var2.method29(); - this.field110[var14] = var2.method29(); + for(var14 = 0; var14 < this.texTriangleCount; ++var14) { + this.field108[var14] = var2.readUnsignedShort(); + this.field109[var14] = var2.readUnsignedShort(); + this.field110[var14] = var2.readUnsignedShort(); } } @@ -1129,15 +1129,15 @@ public final class class19 extends class18 { var1 = (int)Math.sqrt(5100.0D); var1 = var1 * 768 >> 8; if(this.field100 == null) { - this.field100 = new int[this.field96]; - this.field101 = new int[this.field96]; - this.field102 = new int[this.field96]; + this.field100 = new int[this.triangleCount]; + this.field101 = new int[this.triangleCount]; + this.field102 = new int[this.triangleCount]; } if(super.field89 == null) { - super.field89 = new class16[this.field92]; + super.field89 = new class16[this.verticeCount]; - for(var2 = 0; var2 < this.field92; ++var2) { + for(var2 = 0; var2 < this.verticeCount; ++var2) { super.field89[var2] = new class16(); } } @@ -1149,16 +1149,16 @@ public final class class19 extends class18 { int var11; int var12; int var20; - for(var2 = 0; var2 < this.field96; ++var2) { - var3 = this.field97[var2]; - var4 = this.field98[var2]; - var5 = this.field99[var2]; - var20 = this.field93[var4] - this.field93[var3]; - var7 = this.field94[var4] - this.field94[var3]; - var8 = this.field95[var4] - this.field95[var3]; - var9 = this.field93[var5] - this.field93[var3]; - var10 = this.field94[var5] - this.field94[var3]; - var11 = this.field95[var5] - this.field95[var3]; + for(var2 = 0; var2 < this.triangleCount; ++var2) { + var3 = this.trianglePointsX[var2]; + var4 = this.trianglePointsY[var2]; + var5 = this.trianglePointsZ[var2]; + var20 = this.vertexX[var4] - this.vertexX[var3]; + var7 = this.vertexY[var4] - this.vertexY[var3]; + var8 = this.vertexZ[var4] - this.vertexZ[var3]; + var9 = this.vertexX[var5] - this.vertexX[var3]; + var10 = this.vertexY[var5] - this.vertexY[var3]; + var11 = this.vertexZ[var5] - this.vertexZ[var3]; var12 = var7 * var11 - var10 * var8; var8 = var8 * var9 - var11 * var20; @@ -1174,9 +1174,9 @@ public final class class19 extends class18 { var12 = (var12 << 8) / var7; var8 = (var8 << 8) / var7; var20 = (var20 << 8) / var7; - if(this.field103 != null && (this.field103[var2] & 1) != 0) { + if(this.faceRenderType != null && (this.faceRenderType[var2] & 1) != 0) { var3 = 64 + (var12 * -50 + var8 * -10 + var20 * -50) / (var1 + var1 / 2); - this.field100[var2] = method39(this.field106[var2], var3, this.field103[var2]); + this.field100[var2] = method39(this.field106[var2], var3, this.faceRenderType[var2]); } else { class16 var13; class16 var10000 = var13 = super.field89[var3]; @@ -1202,13 +1202,13 @@ public final class class19 extends class18 { byte var18 = -50; var3 = var1; byte var17 = 64; - class19 var14 = this; + Model var14 = this; - for(var7 = 0; var7 < var14.field96; ++var7) { - var8 = var14.field97[var7]; - var9 = var14.field98[var7]; - var10 = var14.field99[var7]; - if(var14.field103 == null) { + for(var7 = 0; var7 < var14.triangleCount; ++var7) { + var8 = var14.trianglePointsX[var7]; + var9 = var14.trianglePointsY[var7]; + var10 = var14.trianglePointsZ[var7]; + if(var14.faceRenderType == null) { var11 = var14.field106[var7]; class16 var15 = var14.field89[var8]; var8 = var17 + (var18 * var15.field83 + var19 * var15.field84 + var21 * var15.field85) / (var3 * var15.field86); @@ -1219,9 +1219,9 @@ public final class class19 extends class18 { var15 = var14.field89[var10]; var8 = var17 + (var18 * var15.field83 + var19 * var15.field84 + var21 * var15.field85) / (var3 * var15.field86); var14.field102[var7] = method39(var11, var8, 0); - } else if((var14.field103[var7] & 1) == 0) { + } else if((var14.faceRenderType[var7] & 1) == 0) { var11 = var14.field106[var7]; - var12 = var14.field103[var7]; + var12 = var14.faceRenderType[var7]; class16 var16 = var14.field89[var8]; var8 = var17 + (var18 * var16.field83 + var19 * var16.field84 + var21 * var16.field85) / (var3 * var16.field86); var14.field100[var7] = method39(var11, var8, var12); @@ -1237,11 +1237,11 @@ public final class class19 extends class18 { label74: { var14.field89 = null; var14.field117 = null; - var14.field115 = null; - var14.field116 = null; - if(var14.field103 != null) { - for(var7 = 0; var7 < var14.field96; ++var7) { - if((var14.field103[var7] & 2) == 2) { + var14.vertexSkins = null; + var14.triangleSkinValues = null; + if(var14.faceRenderType != null) { + for(var7 = 0; var7 < var14.triangleCount; ++var7) { + if((var14.faceRenderType[var7] & 2) == 2) { break label74; } } @@ -1255,10 +1255,10 @@ public final class class19 extends class18 { this.field111 = 0; this.field112 = 0; - for(var2 = 0; var2 < var14.field92; ++var2) { - var3 = var14.field93[var2]; - var4 = var14.field94[var2]; - var5 = var14.field95[var2]; + for(var2 = 0; var2 < var14.verticeCount; ++var2) { + var3 = var14.vertexX[var2]; + var4 = var14.vertexY[var2]; + var5 = var14.vertexZ[var2]; if(-var4 > var14.field90) { var14.field90 = -var4; } @@ -1310,10 +1310,10 @@ public final class class19 extends class18 { var4 = field139[var4]; int var16 = var6 * var15 + var7 * var4 >> 16; - for(int var17 = 0; var17 < this.field92; ++var17) { - int var18 = this.field93[var17]; - int var19 = this.field94[var17]; - int var20 = this.field95[var17]; + for(int var17 = 0; var17 < this.verticeCount; ++var17) { + int var18 = this.vertexX[var17]; + int var19 = this.vertexY[var17]; + int var20 = this.vertexZ[var17]; int var21; if(var3 != 0) { var21 = var19 * var13 + var18 * var14 >> 16; @@ -1340,7 +1340,7 @@ public final class class19 extends class18 { field123[var17] = var20 - var16; field121[var17] = var5 + (var18 << 9) / var20; field122[var17] = var8 + (var21 << 9) / var20; - if(this.field107 > 0) { + if(this.texTriangleCount > 0) { field124[var17] = var18; field125[var17] = var21; field126[var17] = var20; @@ -1351,17 +1351,17 @@ public final class class19 extends class18 { boolean var28 = false; var28 = false; var28 = false; - class19 var22 = this; + Model var22 = this; for(var2 = 0; var2 < var22.field113; ++var2) { field127[var2] = 0; } - for(var2 = 0; var2 < var22.field96; ++var2) { - if(var22.field103 == null || var22.field103[var2] != -1) { - var3 = var22.field97[var2]; - var4 = var22.field98[var2]; - var5 = var22.field99[var2]; + for(var2 = 0; var2 < var22.triangleCount; ++var2) { + if(var22.faceRenderType == null || var22.faceRenderType[var2] != -1) { + var3 = var22.trianglePointsX[var2]; + var4 = var22.trianglePointsY[var2]; + var5 = var22.trianglePointsZ[var2]; var6 = field121[var3]; var7 = field121[var4]; var8 = field121[var5]; @@ -1534,9 +1534,9 @@ public final class class19 extends class18 { var3 = class5.field12; var4 = class5.field13; var5 = 0; - var6 = this.field97[var1]; - var7 = this.field98[var1]; - int var8 = this.field99[var1]; + var6 = this.trianglePointsX[var1]; + var7 = this.trianglePointsY[var1]; + int var8 = this.trianglePointsZ[var1]; int var9 = field126[var6]; int var10 = field126[var7]; int var11 = field126[var8]; @@ -1628,10 +1628,10 @@ public final class class19 extends class18 { class5.field8 = true; } - if(this.field103 == null) { + if(this.faceRenderType == null) { var6 = 0; } else { - var6 = this.field103[var1] & 3; + var6 = this.faceRenderType[var1] & 3; } if(var6 == 0) { @@ -1639,13 +1639,13 @@ public final class class19 extends class18 { } else if(var6 == 1) { class5.method5(var15, var3, var4, var12, var13, var14, field140[this.field100[var1]]); } else if(var6 == 2) { - var6 = this.field103[var1] >> 2; + var6 = this.faceRenderType[var1] >> 2; var7 = this.field108[var6]; var8 = this.field109[var6]; var6 = this.field110[var6]; class5.method7(var15, var3, var4, var12, var13, var14, field136[0], field136[1], field136[2], field124[var7], field124[var8], field124[var6], field125[var7], field125[var8], field125[var6], field126[var7], field126[var8], field126[var6], this.field106[var1]); } else if(var6 == 3) { - var6 = this.field103[var1] >> 2; + var6 = this.faceRenderType[var1] >> 2; var7 = this.field108[var6]; var8 = this.field109[var6]; var6 = this.field110[var6]; @@ -1658,10 +1658,10 @@ public final class class19 extends class18 { class5.field8 = true; } - if(this.field103 == null) { + if(this.faceRenderType == null) { var6 = 0; } else { - var6 = this.field103[var1] & 3; + var6 = this.faceRenderType[var1] & 3; } if(var6 == 0) { @@ -1678,7 +1678,7 @@ public final class class19 extends class18 { } if(var6 == 2) { - var6 = this.field103[var1] >> 2; + var6 = this.faceRenderType[var1] >> 2; var7 = this.field108[var6]; var8 = this.field109[var6]; var6 = this.field110[var6]; @@ -1688,7 +1688,7 @@ public final class class19 extends class18 { } if(var6 == 3) { - var6 = this.field103[var1] >> 2; + var6 = this.faceRenderType[var1] >> 2; var7 = this.field108[var6]; var8 = this.field109[var6]; var6 = this.field110[var6]; @@ -1699,20 +1699,20 @@ public final class class19 extends class18 { } } else { - int var2 = this.field97[var1]; - var3 = this.field98[var1]; - var4 = this.field99[var1]; + int var2 = this.trianglePointsX[var1]; + var3 = this.trianglePointsY[var1]; + var4 = this.trianglePointsZ[var1]; class5.field8 = field119[var1]; - if(this.field105 == null) { + if(this.faceAlphas == null) { class5.field11 = 0; } else { - class5.field11 = this.field105[var1]; + class5.field11 = this.faceAlphas[var1]; } - if(this.field103 == null) { + if(this.faceRenderType == null) { var5 = 0; } else { - var5 = this.field103[var1] & 3; + var5 = this.faceRenderType[var1] & 3; } if(var5 == 0) { @@ -1720,14 +1720,14 @@ public final class class19 extends class18 { } else if(var5 == 1) { class5.method5(field122[var2], field122[var3], field122[var4], field121[var2], field121[var3], field121[var4], field140[this.field100[var1]]); } else if(var5 == 2) { - var5 = this.field103[var1] >> 2; + var5 = this.faceRenderType[var1] >> 2; var6 = this.field108[var5]; var7 = this.field109[var5]; var5 = this.field110[var5]; class5.method7(field122[var2], field122[var3], field122[var4], field121[var2], field121[var3], field121[var4], this.field100[var1], this.field101[var1], this.field102[var1], field124[var6], field124[var7], field124[var5], field125[var6], field125[var7], field125[var5], field126[var6], field126[var7], field126[var5], this.field106[var1]); } else { if(var5 == 3) { - var5 = this.field103[var1] >> 2; + var5 = this.faceRenderType[var1] >> 2; var6 = this.field108[var5]; var7 = this.field109[var5]; var5 = this.field110[var5]; @@ -1739,7 +1739,7 @@ public final class class19 extends class18 { } static { - new class19(); + new Model(); field119 = new boolean[4096]; field120 = new boolean[4096]; field121 = new int[4096]; diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class10.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class10.java deleted file mode 100644 index 4d3c4100bb..0000000000 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class10.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.runelite.rsmv; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -final class class10 implements ActionListener { - // $FF: synthetic field - private Main field29; - - class10(Main var1) { - this.field29 = var1; - } - - public final void actionPerformed(ActionEvent var1) { - Main.method19(this.field29, var1); - } -} diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class13.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class13.java index 62daca2e11..4af7965772 100644 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class13.java +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class13.java @@ -102,7 +102,7 @@ public final class class13 implements ImageObserver, ImageProducer { return true; } - public final void method25(class19 var1, int var2, int var3, int var4, int var5, int var6) { + public final void method25(Model var1, int var2, int var3, int var4, int var5, int var6) { this.method22(); class5.field18 = this.field53; var2 = class5.field12; diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class15.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class15.java index a4f34cd62e..383111fdca 100644 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class15.java +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class15.java @@ -3,9 +3,9 @@ package net.runelite.rsmv; final class class15 { public byte[] field66; - public int field67; - public int field68; - public int field69; + public int vertexCount; + public int triangleFaceCount; + public int texTriangleCount; public int field70; public int field71; public int field72; diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class17.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class17.java deleted file mode 100644 index c069d027f1..0000000000 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class17.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.runelite.rsmv; - - -public final class class17 { - private byte[] field87; - public int field88; - - public class17(byte[] var1) { - this.field87 = var1; - this.field88 = 0; - } - - public final int method27() { - return this.field87[this.field88++] & 255; - } - - public final byte method28() { - return this.field87[this.field88++]; - } - - public final int method29() { - this.field88 += 2; - return ((this.field87[this.field88 - 2] & 255) << 8) + (this.field87[this.field88 - 1] & 255); - } - - public final int method30() { - this.field88 += 3; - return ((this.field87[this.field88 - 3] & 255) << 16) + ((this.field87[this.field88 - 2] & 255) << 8) + (this.field87[this.field88 - 1] & 255); - } - - public final int method31() { - this.field88 += 2; - return ((this.field87[this.field88 - 2] & 255) << 8) + (this.field87[this.field88 - 1] & 255); - } - - public final int method32() { - return (this.field87[this.field88] & 255) < 128?this.method27() - 64:this.method29() - '쀀'; - } - - static { - int[] var10000 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, '\uffff', 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; - } -} diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class7.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class7.java deleted file mode 100644 index fca5cde887..0000000000 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class7.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.runelite.rsmv; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -final class class7 implements ActionListener { - // $FF: synthetic field - private Main field27; - - class7(Main var1) { - this.field27 = var1; - } - - public final void actionPerformed(ActionEvent var1) { - Main.method21(this.field27, var1); - } -} diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class6.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVAbstractListModel.java similarity index 68% rename from model-viewer-rsmv/src/main/java/net/runelite/rsmv/class6.java rename to model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVAbstractListModel.java index 8773ea98e6..d79725455a 100644 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class6.java +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVAbstractListModel.java @@ -1,15 +1,16 @@ -package net.runelite.rsmv; +package net.runelite.rsmv.ui; import javax.swing.AbstractListModel; +import net.runelite.rsmv.Main; -final class class6 extends AbstractListModel { +public final class RSMVAbstractListModel extends AbstractListModel { private String[] field24; // $FF: synthetic field private int field25; // $FF: synthetic field private String[] field26; - class6(Main var1, int var2, String[] var3) { + public RSMVAbstractListModel(Main var1, int var2, String[] var3) { this.field25 = var2; this.field26 = var3; this.field24 = this.field26; diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class2.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVAbstractListModel2.java similarity index 67% rename from model-viewer-rsmv/src/main/java/net/runelite/rsmv/class2.java rename to model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVAbstractListModel2.java index c7c8969f67..3d7189997a 100644 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class2.java +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVAbstractListModel2.java @@ -1,15 +1,16 @@ -package net.runelite.rsmv; +package net.runelite.rsmv.ui; import javax.swing.AbstractListModel; +import net.runelite.rsmv.Main; -final class class2 extends AbstractListModel { +public final class RSMVAbstractListModel2 extends AbstractListModel { private String[] field2; // $FF: synthetic field private int field3; // $FF: synthetic field private String[] field4; - class2(Main var1, int var2, String[] var3) { + public RSMVAbstractListModel2(Main var1, int var2, String[] var3) { this.field3 = var2; this.field4 = var3; this.field2 = this.field4; diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class9.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVActionListener.java similarity index 50% rename from model-viewer-rsmv/src/main/java/net/runelite/rsmv/class9.java rename to model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVActionListener.java index 774b044810..b093626efe 100644 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class9.java +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVActionListener.java @@ -1,17 +1,18 @@ -package net.runelite.rsmv; +package net.runelite.rsmv.ui; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import net.runelite.rsmv.Main; -final class class9 implements ActionListener { +public final class RSMVActionListener implements ActionListener { // $FF: synthetic field private Main field28; - class9(Main var1) { + public RSMVActionListener(Main var1) { this.field28 = var1; } public final void actionPerformed(ActionEvent var1) { - Main.method20(this.field28, var1); + Main.actionListenerCallback(this.field28, var1); } } diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVActionListener2.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVActionListener2.java new file mode 100644 index 0000000000..08819c75ea --- /dev/null +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVActionListener2.java @@ -0,0 +1,18 @@ +package net.runelite.rsmv.ui; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import net.runelite.rsmv.Main; + +public final class RSMVActionListener2 implements ActionListener { + // $FF: synthetic field + private Main field27; + + public RSMVActionListener2(Main var1) { + this.field27 = var1; + } + + public final void actionPerformed(ActionEvent var1) { + Main.actionListenerCallback2(this.field27, var1); + } +} diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVActionListener3.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVActionListener3.java new file mode 100644 index 0000000000..b4638a0e51 --- /dev/null +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVActionListener3.java @@ -0,0 +1,18 @@ +package net.runelite.rsmv.ui; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import net.runelite.rsmv.Main; + +public final class RSMVActionListener3 implements ActionListener { + // $FF: synthetic field + private Main field29; + + public RSMVActionListener3(Main var1) { + this.field29 = var1; + } + + public final void actionPerformed(ActionEvent var1) { + Main.actionListenerCallback3(this.field29, var1); + } +} diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class3.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVComponentAdapter.java similarity index 50% rename from model-viewer-rsmv/src/main/java/net/runelite/rsmv/class3.java rename to model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVComponentAdapter.java index 6bb6df6c48..c56feacaf8 100644 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class3.java +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVComponentAdapter.java @@ -1,17 +1,18 @@ -package net.runelite.rsmv; +package net.runelite.rsmv.ui; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; +import net.runelite.rsmv.Main; -final class class3 extends ComponentAdapter { +public final class RSMVComponentAdapter extends ComponentAdapter { // $FF: synthetic field private Main field5; - class3(Main var1) { + public RSMVComponentAdapter(Main var1) { this.field5 = var1; } public final void componentResized(ComponentEvent var1) { - Main.method16(this.field5, var1); + Main.componentResizedCallback(this.field5, var1); } } diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class0.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVListSelectionListener.java similarity index 50% rename from model-viewer-rsmv/src/main/java/net/runelite/rsmv/class0.java rename to model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVListSelectionListener.java index 99ca355efb..ef5843da21 100644 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class0.java +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVListSelectionListener.java @@ -1,17 +1,18 @@ -package net.runelite.rsmv; +package net.runelite.rsmv.ui; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; +import net.runelite.rsmv.Main; -final class class0 implements ListSelectionListener { +public final class RSMVListSelectionListener implements ListSelectionListener { // $FF: synthetic field private Main field0; - class0(Main var1) { + public RSMVListSelectionListener(Main var1) { this.field0 = var1; } public final void valueChanged(ListSelectionEvent var1) { - Main.method18(this.field0, var1); + Main.listSelectionValueChanged(this.field0, var1); } } diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class4.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVMouseAdapter.java similarity index 56% rename from model-viewer-rsmv/src/main/java/net/runelite/rsmv/class4.java rename to model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVMouseAdapter.java index 87e6695ade..5d965a04e7 100644 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class4.java +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVMouseAdapter.java @@ -1,13 +1,14 @@ -package net.runelite.rsmv; +package net.runelite.rsmv.ui; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import net.runelite.rsmv.Main; -final class class4 extends MouseAdapter { +public final class RSMVMouseAdapter extends MouseAdapter { // $FF: synthetic field private Main field6; - class4(Main var1) { + public RSMVMouseAdapter(Main var1) { this.field6 = var1; } @@ -15,6 +16,6 @@ final class class4 extends MouseAdapter { } public final void mouseReleased(MouseEvent var1) { - Main.method15(this.field6, var1); + Main.mouseReleasedCallback(this.field6, var1); } } diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class1.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVMouseMotionAdapter.java similarity index 50% rename from model-viewer-rsmv/src/main/java/net/runelite/rsmv/class1.java rename to model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVMouseMotionAdapter.java index e2002a45f5..b4a7745251 100644 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class1.java +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVMouseMotionAdapter.java @@ -1,17 +1,18 @@ -package net.runelite.rsmv; +package net.runelite.rsmv.ui; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; +import net.runelite.rsmv.Main; -final class class1 extends MouseMotionAdapter { +public final class RSMVMouseMotionAdapter extends MouseMotionAdapter { // $FF: synthetic field private Main field1; - class1(Main var1) { + public RSMVMouseMotionAdapter(Main var1) { this.field1 = var1; } public final void mouseDragged(MouseEvent var1) { - Main.method17(this.field1, var1); + Main.mouseDragged(this.field1, var1); } } diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class11.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVMouseWheelListener.java similarity index 50% rename from model-viewer-rsmv/src/main/java/net/runelite/rsmv/class11.java rename to model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVMouseWheelListener.java index 45565d2b41..fde83ac167 100644 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class11.java +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVMouseWheelListener.java @@ -1,17 +1,18 @@ -package net.runelite.rsmv; +package net.runelite.rsmv.ui; import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; +import net.runelite.rsmv.Main; -final class class11 implements MouseWheelListener { +public final class RSMVMouseWheelListener implements MouseWheelListener { // $FF: synthetic field private Main field30; - class11(Main var1) { + public RSMVMouseWheelListener(Main var1) { this.field30 = var1; } public final void mouseWheelMoved(MouseWheelEvent var1) { - Main.method14(this.field30, var1); + Main.mouseWheelMoved(this.field30, var1); } } diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class12.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVWindowAdapter.java similarity index 50% rename from model-viewer-rsmv/src/main/java/net/runelite/rsmv/class12.java rename to model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVWindowAdapter.java index 9307461d4c..a5d777664f 100644 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class12.java +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVWindowAdapter.java @@ -1,17 +1,18 @@ -package net.runelite.rsmv; +package net.runelite.rsmv.ui; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import net.runelite.rsmv.Main; -final class class12 extends WindowAdapter { +public final class RSMVWindowAdapter extends WindowAdapter { // $FF: synthetic field private Main field31; - class12(Main var1) { + public RSMVWindowAdapter(Main var1) { this.field31 = var1; } public final void windowClosing(WindowEvent var1) { - Main.method13(this.field31, var1); + Main.windowClosingCallback(this.field31, var1); } } diff --git a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class8.java b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/class8.java similarity index 57% rename from model-viewer-rsmv/src/main/java/net/runelite/rsmv/class8.java rename to model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/class8.java index 2023d33d30..025c75eea2 100644 --- a/model-viewer-rsmv/src/main/java/net/runelite/rsmv/class8.java +++ b/model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/class8.java @@ -1,6 +1,9 @@ -package net.runelite.rsmv; +package net.runelite.rsmv.ui; -final class class8 implements Runnable { +import net.runelite.rsmv.Main; +import net.runelite.rsmv.Model; + +public final class class8 implements Runnable { public final void run() { Main var1; (var1 = new Main()).setTitle("Runescape Model Viewer v0.3"); @@ -8,6 +11,6 @@ final class class8 implements Runnable { var1.setVisible(true); var1.method9(); (new Thread(var1)).start(); - class19.method33(1); + Model.method33(1); } }