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

deprecate invalid kittypes

Browse Source
This commit is contained in:
ThatGamerBlue
2021-05-17 06:27:50 +01:00
parent 829f0b134b
commit 7eb96d606a
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/Dependencies.kt
View File

@@ -27,7 +27,7 @@ object ProjectVersions {
const val launcherVersion = "2.2.0" const val launcherVersion = "2.2.0"
const val rlVersion = "1.7.7" const val rlVersion = "1.7.7"
const val openosrsVersion = "4.6.1" const val openosrsVersion = "4.6.2"
const val rsversion = 195 const val rsversion = 195
const val cacheversion = 165 const val cacheversion = 165

3
runelite-api/src/main/java/net/runelite/api/kit/KitType.java
View File

@@ -51,7 +51,10 @@ public enum KitType
HANDS("Hands"), HANDS("Hands"),
BOOTS("Boots"), BOOTS("Boots"),
JAW("Jaw"), JAW("Jaw"),
// When removing these, make sure you also remove the type.ordinal() > 11 checks in RSPlayerCompositionMixin
@Deprecated(since = "4.6.2", forRemoval = true)
RING("Ring"), RING("Ring"),
@Deprecated(since = "4.6.2", forRemoval = true)
AMMUNITION("Ammo"); AMMUNITION("Ammo");
private final String name; private final String name;

10
runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerCompositionMixin.java
View File

@@ -12,6 +12,11 @@ public abstract class RSPlayerCompositionMixin implements RSPlayerComposition
@Override @Override
public int getEquipmentId(KitType type) public int getEquipmentId(KitType type)
{ {
if (type.ordinal() > 11)
{
return -1;
}
int id = getEquipmentIds()[type.getIndex()]; int id = getEquipmentIds()[type.getIndex()];
if (id < 512) if (id < 512)
{ {
@@ -24,6 +29,11 @@ public abstract class RSPlayerCompositionMixin implements RSPlayerComposition
@Override @Override
public int getKitId(KitType type) public int getKitId(KitType type)
{ {
if (type.ordinal() > 11)
{
return -1;
}
int id = getEquipmentIds()[type.getIndex()]; int id = getEquipmentIds()[type.getIndex()];
if (id < 256 || id >= 512) if (id < 256 || id >= 512)
{ {