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

project: Mixins

Browse Source
This commit is contained in:
Owain van Brakel
2022-01-16 04:02:25 +01:00
parent c3fe9b5377
commit c57301c0d3
14 changed files with 214 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runescape-client/src/main/java/Actor.java
View File

@@ -233,7 +233,8 @@ public abstract class Actor extends Renderable {
@ObfuscatedGetter(
intValue = -2034554825
)
int field1131;
@Export("spotAnimationHeight")
int spotAnimationHeight;
@ObfuscatedName("bo")
@ObfuscatedGetter(
intValue = -873586319

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

@@ -358,7 +358,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
if ((var5 & 2) != 0) {
var15.spotAnimation = var1.method7403();
var6 = var1.method7412();
var15.field1131 = var6 >> 16;
var15.spotAnimationHeight = var6 >> 16;
var15.field1130 = (var6 & 65535) + Client.cycle;
var15.spotAnimationFrame = 0;
var15.spotAnimationFrameCycle = 0;

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

@@ -118,7 +118,7 @@ public final class NPC extends Actor {
if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
Model var4 = AccessFile.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame);
if (var4 != null) {
var4.offsetBy(0, -super.field1131, 0);
var4.offsetBy(0, -super.spotAnimationHeight, 0);
Model[] var5 = new Model[]{var3, var4};
var3 = new Model(var5, 2);
}

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

@@ -337,7 +337,7 @@ public final class Player extends Actor {
if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
var4 = AccessFile.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame);
if (var4 != null) {
var4.offsetBy(0, -super.field1131, 0);
var4.offsetBy(0, -super.spotAnimationHeight, 0);
var5 = new Model[]{var3, var4};
var3 = new Model(var5, 2);
}

124
runescape-client/src/main/java/RuneLiteClanMember.java Normal file
View File

@@ -0,0 +1,124 @@
import net.runelite.api.clan.ClanMember;
import net.runelite.api.clan.ClanRank;
public class RuneLiteClanMember implements ClanMember
{
public final int idx;
public final ClanSettings clanSettings;
public RuneLiteClanMember(ClanSettings clanSettings, int idx) {
this.clanSettings = clanSettings;
this.idx = idx;
}
public ClanRank getRank() {
return getClanRank(this.clanSettings.memberRanks[this.idx]);
}
public String getName() {
return this.clanSettings.memberNames[this.idx];
}
public ClanRank getClanRank(int rank)
{
switch (rank)
{
case -1:
return ClanRank.GUEST;
case 10:
return ClanRank.CLAN_RANK_2;
case 20:
return ClanRank.CLAN_RANK_3;
case 30:
return ClanRank.CLAN_RANK_4;
case 40:
return ClanRank.CLAN_RANK_5;
case 50:
return ClanRank.CLAN_RANK_6;
case 60:
return ClanRank.CLAN_RANK_7;
case 70:
return ClanRank.CLAN_RANK_8;
case 80:
return ClanRank.CLAN_RANK_9;
case 90:
return ClanRank.CLAN_RANK_10;
case 100:
return ClanRank.ADMINISTRATOR;
case 105:
return ClanRank.CLAN_RANK_11;
case 110:
return ClanRank.CLAN_RANK_12;
case 115:
return ClanRank.CLAN_RANK_13;
case 120:
return ClanRank.CLAN_RANK_14;
case 125:
return ClanRank.DEPUTY_OWNER;
case 126:
return ClanRank.OWNER;
case 127:
return ClanRank.JMOD;
default:
return ClanRank.CLAN_RANK_1;
}
}
public boolean instanceOf(Object o) {
return o instanceof RuneLiteClanMember;
}
@Override
public boolean equals(Object o) {
if (o == this) {
return true;
} else if (!(o instanceof RuneLiteClanMember)) {
return false;
} else {
RuneLiteClanMember clanMember = (RuneLiteClanMember)o;
if (!clanMember.instanceOf(this)) {
return false;
} else {
String thisName = this.getName();
String objName = clanMember.getName();
if (thisName == null) {
if (objName != null) {
return false;
}
} else if (!thisName.equals(objName)) {
return false;
}
ClanRank thisRank = this.getRank();
ClanRank objRank = clanMember.getRank();
if (thisRank == null) {
if (objRank != null) {
return false;
}
} else if (!thisRank.equals(objRank)) {
return false;
}
return true;
}
}
}
@Override
public int hashCode() {
byte b = 1;
String name = this.getName();
int hash = b * 59 + (name == null ? 43 : name.hashCode());
ClanRank rank = this.getRank();
hash = hash * 59 + (rank == null ? 43 : rank.hashCode());
return hash;
}
public String toString() {
return "ClanMemberImpl(getName=" + this.getName() + ", getRank=" + this.getRank() + ")";
}
}

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

@@ -180,7 +180,7 @@ public class class65 {
if ((var3 & 2048) != 0) {
var2.spotAnimation = var0.method7499();
var5 = var0.method7412();
var2.field1131 = var5 >> 16;
var2.spotAnimationHeight = var5 >> 16;
var2.field1130 = (var5 & 65535) + Client.cycle;
var2.spotAnimationFrame = 0;
var2.spotAnimationFrameCycle = 0;