Skip to content

fix: block Al Kharid mine in pathfinder collision data #1813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zimada1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: block Al Kharid mine in pathfinder collision data #1813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cache/src/main/java/net/runelite/cache/WorldMapManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@

public class WorldMapManager
{
public static final int DETAILS_ID = 0;
public static final int COMPOSITEMAP_ID = 1;

private final Store store;
private final List<WorldMapCompositeDefinition> worldMapCompositeDefinitions = new ArrayList<>();
private final List<WorldMapElementDefinition> elements = new ArrayList<>();
Expand All @@ -60,7 +63,7 @@ public void load() throws IOException
{
Storage storage = store.getStorage();
Index index = store.getIndex(IndexType.WORLDMAP);
Archive compositeMapArchive = index.findArchiveByName("compositemap");
Archive compositeMapArchive = index.isNamed() ? index.findArchiveByName("compositemap") : index.getArchive(COMPOSITEMAP_ID);
WorldMapCompositeLoader worldMapCompositeLoader = new WorldMapCompositeLoader();
worldMapCompositeLoader.configureForRevision(index.getRevision());

Expand Down
4 changes: 4 additions & 0 deletions cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,10 @@ else if (opcode == 149)
{
def.placeholderTemplateId = stream.readUnsignedShort();
}
else if (opcode == 160)
{
def.stackable = 2;
}
else if (opcode == 200)
{
entityOpsLoader.decodeSubOp(def.groundOps, stream);
Expand Down
2 changes: 1 addition & 1 deletion cache/src/test/java/net/runelite/cache/WorldMapDumperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public void extract() throws IOException

Storage storage = store.getStorage();
Index index = store.getIndex(IndexType.WORLDMAP);
Archive archive = index.findArchiveByName("details");
Archive archive = index.isNamed() ? index.findArchiveByName("details") : index.getArchive(WorldMapManager.DETAILS_ID);

byte[] archiveData = storage.loadArchive(archive);
ArchiveFiles files = archive.getFiles(archiveData);
Expand Down
3 changes: 1 addition & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ org.gradle.parallel=true
org.gradle.caching=false

project.build.group=net.runelite
project.build.version=1.12.30
runelite.injected-client.version=1.12.30
project.build.version=1.12.31-SNAPSHOT

glslang.path=
microbot.version=2.6.8
Expand Down
26 changes: 13 additions & 13 deletions runelite-api/src/main/interfaces/interfaces.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,19 @@ content_container=9
tab_container=10
item_container=12
scrollbar=13
search_button_background=41
deposit_inventory=43
deposit_equipment=45
potion_store=119
incinerator=48
incinerator_confirm=49
potionstore_content=51
equipment_parent=54
equipment_set_bonus=95
settings_button=99
equipment_button=100
popup=102
equipment_stat_bonus=108
search_button_background=47
deposit_inventory=49
deposit_equipment=51
potion_store=126
incinerator=54
incinerator_confirm=55
potionstore_content=58
equipment_parent=61
equipment_set_bonus=102
settings_button=106
equipment_button=107
popup=109
equipment_stat_bonus=115

[bank_inventory]
id=15
Expand Down
28 changes: 11 additions & 17 deletions runelite-api/src/main/java/net/runelite/api/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ public interface Client extends OAuthApi, GameEngine
/**
* Gets the pitch of the camera.
* <p>
* The value returned by this method is measured in JAU, or Jagex
* Angle Unit, which is 1/1024 of a revolution.
* The value returned by this method is measured in JAU14, or Jagex
* Angle Unit (14 bit), where each unit is equivalent to 2π/(2^14) radians.
*
* @return the camera pitch
*/
Expand All @@ -291,6 +291,9 @@ public interface Client extends OAuthApi, GameEngine

/**
* Gets the yaw of the camera.
* <p>
* The value returned by this method is measured in JAU14, or Jagex
* Angle Unit (14 bit), where each unit is equivalent to 2π/(2^14) radians.
*
* @return the camera yaw
*/
Expand Down Expand Up @@ -683,15 +686,6 @@ public interface Client extends OAuthApi, GameEngine
@Deprecated
int getMenuWidth();

/**
* Gets the angle of the map, or target camera yaw.
*
* @return the map angle
* @see #getCameraYawTarget()
*/
@Deprecated
int getMapAngle();

/**
* Checks whether the client window is currently resized.
*
Expand Down Expand Up @@ -1728,39 +1722,39 @@ public interface Client extends OAuthApi, GameEngine
* Typically this is the player position, but can be other points in cutscenes or in free camera mode.
* @return
*/
double getCameraFocalPointX();
float getCameraFocalPointX();

/**
* Sets the camera focus point x. Requires the {@link #getCameraMode()} to be free camera.
* @param x
*/
void setCameraFocalPointX(double x);
void setCameraFocalPointX(float x);

/**
* Get the camera focus point y
* Typically this is the player position, but can be other points in cutscenes or in free camera mode.
* @return
*/
double getCameraFocalPointY();
float getCameraFocalPointY();

/**
* Sets the camera focus point y. Requires the {@link #getCameraMode()} to be free camera.
* @param y
*/
void setCameraFocalPointY(double y);
void setCameraFocalPointY(float y);

/**
* Get the camera focus point z
* Typically this is the player position, but can be other points in cutscenes or in free camera mode.
* @return
*/
double getCameraFocalPointZ();
float getCameraFocalPointZ();

/**
* Sets the camera focus point z. Requires the {@link #getCameraMode()} to be free camera.
* @param z
*/
void setCameraFocalPointZ(double z);
void setCameraFocalPointZ(float z);

/**
* Sets the normal moving speed when using oculus orb (default value is 12)
Expand Down
9 changes: 3 additions & 6 deletions runelite-api/src/main/java/net/runelite/api/EntityOps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,10 @@ public interface EntityOps
{
int MAX_OPS = 5;

int getNumOps();

@Nullable
String getOp(int idx);

int getNumSubOps(int idx);

int getSubID(int idx, int subIdx);

@Nullable
String getSubOp(int idx, int subIdx);
EntityOps getSubOps(int idx);
}
44 changes: 41 additions & 3 deletions runelite-api/src/main/java/net/runelite/api/ItemID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10782,7 +10782,7 @@ public final class ItemID
public static final int STAMINA_POTION1_23589 = 23589;
public static final int HELM_OF_NEITIZNOT_23591 = 23591;
public static final int BARROWS_GLOVES_23593 = 23593;
public static final int BERSERKER_RING_23595 = 23595;
public static final int BERSERKER_RING_I_23595 = 23595;
public static final int DRAGON_DEFENDER_23597 = 23597;
public static final int SPIRIT_SHIELD_23599 = 23599;
public static final int RUNE_CROSSBOW_23601 = 23601;
Expand Down Expand Up @@ -13771,7 +13771,7 @@ public final class ItemID
public static final int ECHO_CRYSTAL = 28942;
public static final int ECHO_BOOTS = 28945;
public static final int DIZANAS_QUIVER_UNCHARGED = 28947;
public static final int DIZANAS_QUIVER_UNCHARGED_L = 28949;
public static final int DIZANAS_QUIVER_L_UNCHARGED = 28949;
public static final int DIZANAS_QUIVER = 28951;
public static final int DIZANAS_QUIVER_L = 28953;
public static final int BLESSED_DIZANAS_QUIVER = 28955;
Expand Down Expand Up @@ -16255,7 +16255,7 @@ public final class ItemID
public static final int UNCHARGED_TRIDENT_E_O = 33328;
public static final int IBANS_STAFF_O = 33330;
public static final int IBANS_STAFF_U_O = 33332;
public static final int IBANS_STAFF_BO = 33333;
public static final int IBANS_STAFF_O_33333 = 33333;
public static final int SOULREAPER_AXE_O = 33335;
public static final int OATHPLATE_SLAYER_HELMET = 33338;
public static final int RADIANT_SLAYER_HELMET = 33340;
Expand Down Expand Up @@ -16304,5 +16304,43 @@ public final class ItemID
public static final int DEMONIC_PACTS_RELIC_HUNTER_T1_ARMOUR_SET = 33451;
public static final int DEMONIC_PACTS_RELIC_HUNTER_T2_ARMOUR_SET = 33454;
public static final int DEMONIC_PACTS_RELIC_HUNTER_T3_ARMOUR_SET = 33457;
public static final int DRAGON_CROSSBOW_33460 = 33460;
public static final int OATHPLATE_HELM_33462 = 33462;
public static final int VOID_MELEE_HELM_L_BROKEN = 33464;
public static final int VOID_MELEE_HELM_L_MANGLED = 33466;
public static final int VOID_MAGE_HELM_L_BROKEN = 33468;
public static final int VOID_MAGE_HELM_L_MANGLED = 33470;
public static final int VOID_RANGER_HELM_L_BROKEN = 33472;
public static final int VOID_RANGER_HELM_L_MANGLED = 33474;
public static final int VOID_KNIGHT_TOP_L_BROKEN = 33476;
public static final int VOID_KNIGHT_TOP_L_MANGLED = 33478;
public static final int ELITE_VOID_TOP_L_BROKEN = 33480;
public static final int ELITE_VOID_TOP_L_MANGLED = 33482;
public static final int VOID_KNIGHT_ROBE_L_BROKEN = 33484;
public static final int VOID_KNIGHT_ROBE_L_MANGLED = 33486;
public static final int ELITE_VOID_ROBE_L_BROKEN = 33488;
public static final int ELITE_VOID_ROBE_L_MANGLED = 33490;
public static final int VOID_KNIGHT_GLOVES_L_BROKEN = 33492;
public static final int VOID_KNIGHT_GLOVES_L_MANGLED = 33494;
public static final int INFERNAL_MAX_CAPE_L_BROKEN = 33496;
public static final int INFERNAL_MAX_CAPE_L_MANGLED = 33498;
public static final int INFERNAL_CAPE_L_BROKEN = 33500;
public static final int INFERNAL_CAPE_L_MANGLED = 33502;
public static final int BLOOD_ANCIENT_SCEPTRE_L_BROKEN = 33504;
public static final int BLOOD_ANCIENT_SCEPTRE_L_MANGLED = 33506;
public static final int ICE_ANCIENT_SCEPTRE_L_BROKEN = 33508;
public static final int ICE_ANCIENT_SCEPTRE_L_MANGLED = 33510;
public static final int SMOKE_ANCIENT_SCEPTRE_L_BROKEN = 33512;
public static final int SMOKE_ANCIENT_SCEPTRE_L_MANGLED = 33514;
public static final int SHADOW_ANCIENT_SCEPTRE_L_BROKEN = 33516;
public static final int SHADOW_ANCIENT_SCEPTRE_L_MANGLED = 33518;
public static final int FIGHTER_TORSO_L_BROKEN = 33520;
public static final int FIGHTER_TORSO_L_MANGLED = 33522;
public static final int DIZANAS_QUIVER_L_BROKEN = 33524;
public static final int DIZANAS_QUIVER_L_MANGLED = 33526;
public static final int BLESSED_DIZANAS_QUIVER_L_BROKEN = 33528;
public static final int BLESSED_DIZANAS_QUIVER_L_MANGLED = 33530;
public static final int DIZANAS_MAX_CAPE_L_BROKEN = 33532;
public static final int DIZANAS_MAX_CAPE_L_MANGLED = 33533;
/* This file is automatically generated. Do not edit. */
}
4 changes: 2 additions & 2 deletions runelite-api/src/main/java/net/runelite/api/NpcID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ public final class NpcID
public static final int MAID = 223;
public static final int COOK = 225;
public static final int BUTLER = 227;
public static final int DEMON_BUTLER = 229;
public static final int WOLF_231 = 231;
public static final int JUNGLE_WOLF = 232;
public static final int MACARONI_PENGUIN = 233;
Expand Down Expand Up @@ -6558,7 +6559,7 @@ public final class NpcID
public static final int MAID_7328 = 7328;
public static final int COOK_7329 = 7329;
public static final int BUTLER_7330 = 7330;
public static final int DEMON_BUTLER = 7331;
public static final int DEMON_BUTLER_7331 = 7331;
public static final int FAIRY_FIXIT = 7332;
public static final int FAIRY_FIXIT_7333 = 7333;
public static final int GIANT_SQUIRREL = 7334;
Expand Down Expand Up @@ -13132,7 +13133,6 @@ public final class NpcID
public static final int ELIDINIS_WARDEN_15698 = 15698;
public static final int TZTOKJAD_15699 = 15699;
public static final int YAMA_15700 = 15700;
public static final int DEMON_BUTLER_15710 = 15710;
public static final int DEMON_BUTLER_15711 = 15711;
/* This file is automatically generated. Do not edit. */
}
36 changes: 36 additions & 0 deletions runelite-api/src/main/java/net/runelite/api/NullItemID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16841,5 +16841,41 @@ public final class NullItemID
public static final int NULL_33456 = 33456;
public static final int NULL_33458 = 33458;
public static final int NULL_33459 = 33459;
public static final int NULL_33461 = 33461;
public static final int NULL_33463 = 33463;
public static final int NULL_33465 = 33465;
public static final int NULL_33467 = 33467;
public static final int NULL_33469 = 33469;
public static final int NULL_33471 = 33471;
public static final int NULL_33473 = 33473;
public static final int NULL_33475 = 33475;
public static final int NULL_33477 = 33477;
public static final int NULL_33479 = 33479;
public static final int NULL_33481 = 33481;
public static final int NULL_33483 = 33483;
public static final int NULL_33485 = 33485;
public static final int NULL_33487 = 33487;
public static final int NULL_33489 = 33489;
public static final int NULL_33491 = 33491;
public static final int NULL_33493 = 33493;
public static final int NULL_33495 = 33495;
public static final int NULL_33497 = 33497;
public static final int NULL_33499 = 33499;
public static final int NULL_33501 = 33501;
public static final int NULL_33503 = 33503;
public static final int NULL_33505 = 33505;
public static final int NULL_33507 = 33507;
public static final int NULL_33509 = 33509;
public static final int NULL_33511 = 33511;
public static final int NULL_33513 = 33513;
public static final int NULL_33515 = 33515;
public static final int NULL_33517 = 33517;
public static final int NULL_33519 = 33519;
public static final int NULL_33521 = 33521;
public static final int NULL_33523 = 33523;
public static final int NULL_33525 = 33525;
public static final int NULL_33527 = 33527;
public static final int NULL_33529 = 33529;
public static final int NULL_33531 = 33531;
/* This file is automatically generated. Do not edit. */
}
1 change: 0 additions & 1 deletion runelite-api/src/main/java/net/runelite/api/NullNpcID.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public final class NullNpcID
public static final int NULL_224 = 224;
public static final int NULL_226 = 226;
public static final int NULL_228 = 228;
public static final int NULL_229 = 229;
public static final int NULL_230 = 230;
public static final int NULL_317 = 317;
public static final int NULL_324 = 324;
Expand Down
Loading