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

project: Fix upstream merge (#1157)

Browse Source 
* Fix upstream merge

* Update RSItemContainerMixin.java
This commit is contained in:
Lucwousin
2019-07-28 00:05:55 +02:00
committed by Kyleeld
parent 9ed6f586dd
commit 22f6146ea7
25 changed files with 3548 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
runescape-client/src/main/java/GroundItem.java
View File

@@ -1,87 +0,0 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ch")
@Implements("GroundItem")
public final class GroundItem extends Entity {
@ObfuscatedName("i")
@ObfuscatedGetter(
intValue = 1900937269
)
static int field1242;
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "Llx;"
)
@Export("logoSprite")
static IndexedSprite logoSprite;
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = 1946972179
)
@Export("id")
int id;
@ObfuscatedName("w")
@ObfuscatedGetter(
intValue = -1304382567
)
@Export("quantity")
int quantity;
GroundItem() {
}
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(I)Ldm;",
garbageValue = "759381421"
)
@Export("getModel")
protected final Model getModel() {
return WorldMapArea.getItemDefinition(this.id).getModel(this.quantity);
}
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "(Lhp;B)V",
garbageValue = "97"
)
public static void method2054(AbstractArchive var0) {
StructDefinition.StructDefinition_archive = var0;
}
@ObfuscatedName("p")
@ObfuscatedSignature(
signature = "(III)Lbj;",
garbageValue = "308740376"
)
static Message method2049(int var0, int var1) {
ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0);
return var2.getMessage(var1);
}
@ObfuscatedName("hs")
@ObfuscatedSignature(
signature = "(IIIII)V",
garbageValue = "96373324"
)
static void method2053(int var0, int var1, int var2, int var3) {
Widget var4 = Client.getWidgetChild(var0, var1);
if (var4 != null && var4.onTargetEnter != null) {
ScriptEvent var5 = new ScriptEvent();
var5.widget = var4;
var5.args = var4.onTargetEnter;
LoginPacket.runScriptEvent(var5);
}
Client.field812 = var3;
Client.isSpellSelected = true;
WorldMapEvent.field359 = var0;
Client.field848 = var1;
WorldMapCacheName.selectedSpellFlags = var2;
Strings.method4120(var4);
}
}

108
runescape-client/src/main/java/GroundItemPile.java
View File

@@ -1,108 +0,0 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("dc")
@Implements("GroundItemPile")
public final class GroundItemPile {
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = -706647707
)
@Export("tileHeight")
int tileHeight;
@ObfuscatedName("w")
@ObfuscatedGetter(
intValue = -1749434399
)
@Export("x")
int x;
@ObfuscatedName("e")
@ObfuscatedGetter(
intValue = 1687183849
)
@Export("y")
int y;
@ObfuscatedName("p")
@ObfuscatedSignature(
signature = "Leo;"
)
@Export("first")
Entity first;
@ObfuscatedName("k")
@ObfuscatedSignature(
signature = "Leo;"
)
@Export("second")
Entity second;
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "Leo;"
)
@Export("third")
Entity third;
@ObfuscatedName("b")
@ObfuscatedGetter(
longValue = -6836359089398778317L
)
@Export("tag")
long tag;
@ObfuscatedName("i")
@ObfuscatedGetter(
intValue = -1167512637
)
@Export("height")
int height;
GroundItemPile() {
}
@ObfuscatedName("k")
@ObfuscatedSignature(
signature = "(III)I",
garbageValue = "-989207473"
)
public static int method2767(int var0, int var1) {
int var2 = var0 >>> 31;
return (var0 + var2) / var1 - var2;
}
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "(IB)V",
garbageValue = "-23"
)
static void method2764(int var0) {
ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
if (var1 != null) {
var1.remove();
}
}
@ObfuscatedName("v")
@ObfuscatedSignature(
signature = "(III)I",
garbageValue = "1314012151"
)
static final int method2765(int var0, int var1) {
int var2 = MouseHandler.method1021(var0 - 1, var1 - 1) + MouseHandler.method1021(1 + var0, var1 - 1) + MouseHandler.method1021(var0 - 1, 1 + var1) + MouseHandler.method1021(1 + var0, 1 + var1);
int var3 = MouseHandler.method1021(var0 - 1, var1) + MouseHandler.method1021(var0 + 1, var1) + MouseHandler.method1021(var0, var1 - 1) + MouseHandler.method1021(var0, var1 + 1);
int var4 = MouseHandler.method1021(var0, var1);
return var2 / 16 + var3 / 8 + var4 / 4;
}
@ObfuscatedName("y")
@ObfuscatedSignature(
signature = "(B)V",
garbageValue = "76"
)
@Export("ObjectDefinition_clearCached")
public static void ObjectDefinition_clearCached() {
ObjectDefinition.ObjectDefinition_cached.clear();
ObjectDefinition.ObjectDefinition_cachedModelData.clear();
ObjectDefinition.ObjectDefinition_cachedEntities.clear();
ObjectDefinition.ObjectDefinition_cachedModels.clear();
}
}

2
runescape-client/src/main/java/Timer.java
View File

@@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jr")
@Implements("Timer") //GroundItem
@Implements("Timer")
public class Timer {
@ObfuscatedName("q")
@ObfuscatedGetter(