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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2021-11-10 12:51:51 +01:00
parent 9a810aea57 ea4251a03c
commit d58b29ba55
8 changed files with 46 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
runelite-api/src/main/java/net/runelite/api/NpcID.java
View File

@@ -2723,6 +2723,7 @@ public final class NpcID
public static final int COOK_2896 = 2896;
public static final int BANKER_2897 = 2897;
public static final int BANKER_2898 = 2898;
public static final int IFFIE = 2899;
public static final int ELSIE = 2900;
public static final int CLEANER = 2901;
public static final int STRAY_DOG = 2902;
@@ -9476,27 +9477,5 @@ public final class NpcID
public static final int REGENT = 11229;
public static final int GROUP_STORAGE_TUTOR = 11230;
public static final int GROUP_IRON_TUTOR = 11231;
public static final int IFFIE = 11232;
public static final int MONK_11233 = 11233;
public static final int BROTHER_JERED_11234 = 11234;
public static final int BROTHER_JERED_11235 = 11235;
public static final int OZIACH_11236 = 11236;
public static final int OZIACH_11237 = 11237;
public static final int ESTATE_AGENT_11238 = 11238;
public static final int IFFIE_11239 = 11239;
public static final int IFFIE_11240 = 11240;
public static final int OZIACH_11241 = 11241;
public static final int ESTATE_AGENT_11242 = 11242;
public static final int DEATH_11243 = 11243;
public static final int IFFIE_11245 = 11245;
public static final int IFFIE_11246 = 11246;
public static final int JONNY_THE_BEARD_11247 = 11247;
public static final int WOMAN_11248 = 11248;
public static final int DR_HARLOW_11249 = 11249;
public static final int BARBARIAN_11250 = 11250;
public static final int COOK_11251 = 11251;
public static final int BARTENDER_11252 = 11252;
public static final int XI_PLZPETDOGZ_XIX = 11254;
public static final int ROCKING_CHAIR = 11262;
/* This file is automatically generated. Do not edit. */
}

9
runelite-api/src/main/java/net/runelite/api/NullNpcID.java
View File

@@ -175,7 +175,6 @@ public final class NullNpcID
public static final int NULL_2780 = 2780;
public static final int NULL_2781 = 2781;
public static final int NULL_2831 = 2831;
public static final int NULL_2899 = 2899;
public static final int NULL_2934 = 2934;
public static final int NULL_2935 = 2935;
public static final int NULL_2936 = 2936;
@@ -1739,14 +1738,6 @@ public final class NullNpcID
public static final int NULL_11222 = 11222;
public static final int NULL_11223 = 11223;
public static final int NULL_11224 = 11224;
public static final int NULL_11244 = 11244;
public static final int NULL_11253 = 11253;
public static final int NULL_11255 = 11255;
public static final int NULL_11256 = 11256;
public static final int NULL_11257 = 11257;
public static final int NULL_11258 = 11258;
public static final int NULL_11259 = 11259;
public static final int NULL_11260 = 11260;
public static final int NULL_11261 = 11261;
/* This file is automatically generated. Do not edit. */
}

23
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
View File

@@ -12473,7 +12473,6 @@ public final class NullObjectID
public static final int NULL_26454 = 26454;
public static final int NULL_26455 = 26455;
public static final int NULL_26456 = 26456;
public static final int NULL_26458 = 26458;
public static final int NULL_26459 = 26459;
public static final int NULL_26460 = 26460;
public static final int NULL_26463 = 26463;
@@ -21007,27 +21006,5 @@ public final class NullObjectID
public static final int NULL_42849 = 42849;
public static final int NULL_42850 = 42850;
public static final int NULL_42851 = 42851;
public static final int NULL_42852 = 42852;
public static final int NULL_42853 = 42853;
public static final int NULL_42854 = 42854;
public static final int NULL_42855 = 42855;
public static final int NULL_42856 = 42856;
public static final int NULL_42857 = 42857;
public static final int NULL_42858 = 42858;
public static final int NULL_42869 = 42869;
public static final int NULL_42870 = 42870;
public static final int NULL_42875 = 42875;
public static final int NULL_42876 = 42876;
public static final int NULL_42877 = 42877;
public static final int NULL_42878 = 42878;
public static final int NULL_42879 = 42879;
public static final int NULL_42880 = 42880;
public static final int NULL_42881 = 42881;
public static final int NULL_42882 = 42882;
public static final int NULL_42883 = 42883;
public static final int NULL_42884 = 42884;
public static final int NULL_42885 = 42885;
public static final int NULL_42886 = 42886;
public static final int NULL_42887 = 42887;
/* This file is automatically generated. Do not edit. */
}

14
runelite-api/src/main/java/net/runelite/api/ObjectID.java
View File

@@ -21830,19 +21830,5 @@ public final class ObjectID
public static final int BANK_BOOTH_42837 = 42837;
public static final int FROZEN_DOOR = 42840;
public static final int FROZEN_DOOR_42841 = 42841;
public static final int PLAN = 42859;
public static final int PLAN_42860 = 42860;
public static final int PLAN_42861 = 42861;
public static final int PLAN_42862 = 42862;
public static final int CRATE_42863 = 42863;
public static final int CRATE_42864 = 42864;
public static final int DESK_42865 = 42865;
public static final int TABLE_42866 = 42866;
public static final int CHAIR_42867 = 42867;
public static final int BAR_STOOL = 42868;
public static final int TABLE_42871 = 42871;
public static final int TABLE_42872 = 42872;
public static final int EVERGREEN_42873 = 42873;
public static final int EVERGREEN_42874 = 42874;
/* This file is automatically generated. Do not edit. */
}

11
runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraConfig.java
View File

@@ -148,17 +148,6 @@ public interface CameraConfig extends Config
return false;
}
@ConfigItem(
keyName = "compassLook",
name = "Compass options",
description = "Adds Look South, East, and West options to the compass",
position = 10
)
default boolean compassLook()
{
return true;
}
@ConfigItem(
keyName = "compassLookPreservePitch",
name = "Preserve pitch on compass look",

40
runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java
View File

@@ -30,7 +30,6 @@ import com.google.common.primitives.Ints;
import com.google.inject.Provides;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.util.Arrays;
import javax.inject.Inject;
import javax.swing.SwingUtilities;
import net.runelite.api.Client;
@@ -44,7 +43,6 @@ import net.runelite.api.events.BeforeRender;
import net.runelite.api.events.ClientTick;
import net.runelite.api.events.FocusChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.MenuEntryAdded;
import net.runelite.api.events.ScriptCallbackEvent;
import net.runelite.api.events.ScriptPreFired;
import net.runelite.api.events.WidgetLoaded;
@@ -77,11 +75,6 @@ public class CameraPlugin extends Plugin implements KeyListener, MouseListener
private static final int DEFAULT_OUTER_ZOOM_LIMIT = 128;
static final int DEFAULT_INNER_ZOOM_LIMIT = 896;
private static final String LOOK_NORTH = "Look North";
private static final String LOOK_SOUTH = "Look South";
private static final String LOOK_EAST = "Look East";
private static final String LOOK_WEST = "Look West";
private boolean controlDown;
// flags used to store the mousedown states
private boolean rightClick;
@@ -180,39 +173,6 @@ public class CameraPlugin extends Plugin implements KeyListener, MouseListener
client.setInvertPitch(config.invertPitch());
}
@Subscribe
public void onMenuEntryAdded(MenuEntryAdded menuEntryAdded)
{
if (menuEntryAdded.getType() == MenuAction.CC_OP.getId() && menuEntryAdded.getOption().equals(LOOK_NORTH) && config.compassLook())
{
MenuEntry[] menuEntries = client.getMenuEntries();
int len = menuEntries.length;
MenuEntry north = menuEntries[len - 1];
menuEntries = Arrays.copyOf(menuEntries, len + 3);
// The handling for these entries is done in ToplevelCompassOp.rs2asm
menuEntries[--len] = createCameraLookEntry(menuEntryAdded, 4, LOOK_WEST);
menuEntries[++len] = createCameraLookEntry(menuEntryAdded, 3, LOOK_EAST);
menuEntries[++len] = createCameraLookEntry(menuEntryAdded, 2, LOOK_SOUTH);
menuEntries[++len] = north;
client.setMenuEntries(menuEntries);
}
}
private MenuEntry createCameraLookEntry(MenuEntryAdded lookNorth, int identifier, String option)
{
MenuEntry m = new MenuEntry();
m.setOption(option);
m.setTarget(lookNorth.getTarget());
m.setIdentifier(identifier);
m.setType(MenuAction.CC_OP.getId());
m.setParam0(lookNorth.getActionParam0());
m.setParam1(lookNorth.getParam1());
return m;
}
@Subscribe
public void onScriptCallbackEvent(ScriptCallbackEvent event)
{

2
runelite-client/src/main/scripts/ToplevelCompassOp.hash
View File

@@ -1 +1 @@
6A53DA1D918405E3F314E4350A9CF4002988E5C45E06D37A00AA725003FAD064
9365BC83CB2365C7BC3FBFC90C01232DD242740014E14D456BBAA0622D5570F0

75
runelite-client/src/main/scripts/ToplevelCompassOp.rs2asm
View File

@@ -1,12 +1,11 @@
.id 1050
.int_stack_count 1
.string_stack_count 0
.int_var_count 2 ; +1 for saving target angle
.int_var_count 1
.string_var_count 0
; Remove check of op index
; iload 0
; iconst 1
; if_icmpne LABEL10
iload 0
iconst 4
if_icmpgt LABEL10
get_varbit 542
iconst 1
if_icmpeq LABEL10
@@ -17,41 +16,55 @@
LABEL10:
return
LABEL11:
; switch on op index
iload 0
switch
1: LOOK_NORTH
2: LOOK_SOUTH
3: LOOK_EAST
4: LOOK_WEST
jump LABEL10
LOOK_NORTH:
iconst 0
istore 1
jump LOOK
LOOK_SOUTH:
iconst 1024
istore 1
jump LOOK
LOOK_EAST:
iconst 1536
istore 1
jump LOOK
LOOK_WEST:
iconst 512
istore 1
jump LOOK
LOOK:
iconst 2266
iconst 1
iconst 0
sound_synth
iload 0
switch
1: LABEL18
2: LABEL25
3: LABEL32
4: LABEL39
jump LABEL45
LABEL18:
iconst 225
iconst 5
randominc
add
sconst "lookPreservePitch"
runelite_callback
iload 1 ; load target angle
iconst 0
cam_forceangle
jump LABEL45
LABEL25:
iconst 225
iconst 5
randominc
add
sconst "lookPreservePitch"
runelite_callback
iconst 1536
cam_forceangle
jump LABEL45
LABEL32:
iconst 225
iconst 5
randominc
add
sconst "lookPreservePitch"
runelite_callback
iconst 1024
cam_forceangle
jump LABEL45
LABEL39:
iconst 225
iconst 5
randominc
add
sconst "lookPreservePitch"
runelite_callback
iconst 512
cam_forceangle
LABEL45:
return