ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

rsmv: renaming of some fields and classes

Browse Source
This commit is contained in:
Adam
2017-03-11 13:07:25 -05:00
parent bf89db8b78
commit 97d28abd0a
22 changed files with 743 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java vendored
View File

@@ -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;

4
cache/src/main/java/net/runelite/cache/definitions/loaders/ModelLoader.java vendored
View File

@@ -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];

43
model-viewer-rsmv/src/main/java/net/runelite/rsmv/Buffer.java Normal file
View File

@@ -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};
}
}

70
model-viewer-rsmv/src/main/java/net/runelite/rsmv/Main.java
View File

@@ -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();
}

1134
model-viewer-rsmv/src/main/java/net/runelite/rsmv/class19.java → model-viewer-rsmv/src/main/java/net/runelite/rsmv/Model.java
View File

File diff suppressed because it is too large Load Diff

17
model-viewer-rsmv/src/main/java/net/runelite/rsmv/class10.java
View File

@@ -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);
}
}

2
model-viewer-rsmv/src/main/java/net/runelite/rsmv/class13.java
View File

@@ -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;

6
model-viewer-rsmv/src/main/java/net/runelite/rsmv/class15.java
View File

@@ -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;

43
model-viewer-rsmv/src/main/java/net/runelite/rsmv/class17.java
View File

@@ -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};
}
}

17
model-viewer-rsmv/src/main/java/net/runelite/rsmv/class7.java
View File

@@ -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);
}
}

7
model-viewer-rsmv/src/main/java/net/runelite/rsmv/class6.java → model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVAbstractListModel.java
View File

@@ -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;

7
model-viewer-rsmv/src/main/java/net/runelite/rsmv/class2.java → model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVAbstractListModel2.java
View File

@@ -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;

9
model-viewer-rsmv/src/main/java/net/runelite/rsmv/class9.java → model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVActionListener.java
View File

@@ -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);
}
}

18
model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVActionListener2.java Normal file
View File

@@ -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);
}
}

18
model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVActionListener3.java Normal file
View File

@@ -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);
}
}

9
model-viewer-rsmv/src/main/java/net/runelite/rsmv/class3.java → model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVComponentAdapter.java
View File

@@ -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);
}
}

9
model-viewer-rsmv/src/main/java/net/runelite/rsmv/class0.java → model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVListSelectionListener.java
View File

@@ -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);
}
}

9
model-viewer-rsmv/src/main/java/net/runelite/rsmv/class4.java → model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVMouseAdapter.java
View File

@@ -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);
}
}

9
model-viewer-rsmv/src/main/java/net/runelite/rsmv/class1.java → model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVMouseMotionAdapter.java
View File

@@ -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);
}
}

9
model-viewer-rsmv/src/main/java/net/runelite/rsmv/class11.java → model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVMouseWheelListener.java
View File

@@ -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);
}
}

9
model-viewer-rsmv/src/main/java/net/runelite/rsmv/class12.java → model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/RSMVWindowAdapter.java
View File

@@ -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);
}
}

9
model-viewer-rsmv/src/main/java/net/runelite/rsmv/class8.java → model-viewer-rsmv/src/main/java/net/runelite/rsmv/ui/class8.java
View File

@@ -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);
}
}