Merge remote-tracking branch 'runelite/master'

This commit is contained in:
Owain van Brakel
2022-06-12 01:48:45 +02:00
65 changed files with 1985 additions and 513 deletions
@@ -434,6 +434,13 @@ public interface Client extends OAuthApi, GameEngine
@Nonnull
ItemComposition getItemComposition(int id);
/**
* Get the local player's follower, such as a pet
* @return
*/
@Nullable
NPC getFollower();
/**
* Gets the item composition corresponding to an items ID.
*
@@ -1748,162 +1755,6 @@ public interface Client extends OAuthApi, GameEngine
*/
int getItemPressedDuration();
/**
* Sets whether the client is hiding entities.
* <p>
* This method does not itself hide any entities. It behaves as a master
* switch for whether or not any of the related entities are hidden or
* shown. If this method is set to false, changing the configurations for
* specific entities will have no effect.
*
* @param state new entity hiding state
*/
void setIsHidingEntities(boolean state);
/**
* Sets whether or not other players are hidden.
*
* @param state the new player hidden state
*/
void setOthersHidden(boolean state);
/**
* Sets whether 2D sprites related to the other players are hidden.
* (ie. overhead prayers, PK skull)
*
* @param state the new player 2D hidden state
*/
void setOthersHidden2D(boolean state);
/**
* Sets whether or not friends are hidden.
*
* @param state the new friends hidden state
*/
void setFriendsHidden(boolean state);
/**
* Sets whether or not friends chat members are hidden.
*
* @param state the new friends chat member hidden state
*/
void setFriendsChatMembersHidden(boolean state);
/**
* Sets whether or not clan members are hidden.
*
* @param state the new clan chat member hidden state
*/
void setClanChatMembersHidden(boolean state);
/**
* Sets whether or not ignored players are hidden.
*
* @param state the new ignored player hidden state
*/
void setIgnoresHidden(boolean state);
/**
* Sets whether the local player is hidden.
*
* @param state new local player hidden state
*/
void setLocalPlayerHidden(boolean state);
/**
* Sets whether 2D sprites related to the local player are hidden.
* (ie. overhead prayers, PK skull)
*
* @param state new local player 2D hidden state
*/
void setLocalPlayerHidden2D(boolean state);
/**
* Sets whether NPCs are hidden.
*
* @param state new NPC hidden state
*/
void setNPCsHidden(boolean state);
/**
* Sets whether 2D sprites (ie. overhead prayers) related to
* the NPCs are hidden.
*
* @param state new NPC 2D hidden state
*/
void setNPCsHidden2D(boolean state);
/**
* Sets whether Pets from other players are hidden.
*
* @param state new pet hidden state
*/
void setPetsHidden(boolean state);
/**
* Sets whether attacking players or NPCs are hidden.
*
* @param state new attacker hidden state
*/
void setAttackersHidden(boolean state);
/**
* Hides players input here.
*
* @param names the names of the players
*/
void setHideSpecificPlayers(List<String> names);
/**
* Get the list of NPC indices that are currently hidden
*
* @return all of the current hidden NPC Indices
*/
List<Integer> getHiddenNpcIndices();
/**
* If an NPC index is in this List then do not render it
*
* @param npcIndices the npc indices to hide
*/
void setHiddenNpcIndices(List<Integer> npcIndices);
/**
* Increments the counter for how many times this npc has been selected to be hidden
*
* @param name npc name
*/
void addHiddenNpcName(String name);
/**
* Decrements the counter for how many times this npc has been selected to be hidden
*
* @param name npc name
*/
void removeHiddenNpcName(String name);
/**
* Sets whether projectiles are hidden.
*
* @param state new projectile hidden state
*/
void setProjectilesHidden(boolean state);
/**
* Sets whether dead NPCs are hidden.
*
* @param state new NPC hidden state
*/
void setDeadNPCsHidden(boolean state);
/**
* The provided ids will not be hidden when the
* entity-hider attempts to hide dead {@link NPC}'s.
*
* @param blacklist set of npc ids.
*/
void setBlacklistDeadNpcs(Set<Integer> blacklist);
/**
* Adds a custom clientscript to the list of available clientscripts.
*
@@ -12677,5 +12677,17 @@ public final class ItemID
public static final int VOID_MELEE_HELM_LOR = 27007;
public static final int DRAGON_DEFENDER_LT = 27008;
public static final int RUNE_DEFENDER_LT = 27009;
public static final int PREFORM = 27010;
public static final int DOUBLE_AMMO_MOULD = 27012;
public static final int KOVACS_GROG = 27014;
public static final int SMITHING_CATALYST = 27017;
public static final int ORE_PACK = 27019;
public static final int COLOSSAL_BLADE = 27021;
public static final int SMITHS_TUNIC = 27023;
public static final int SMITHS_TROUSERS = 27025;
public static final int SMITHS_BOOTS = 27027;
public static final int SMITHS_GLOVES = 27029;
public static final int SMITHS_GLOVES_I = 27031;
public static final int GIANTS_FOUNDRY_TESTER = 27033;
/* This file is automatically generated. Do not edit. */
}
@@ -33,6 +33,13 @@ public interface NameableContainer<T extends Nameable>
*/
int getCount();
/**
* Get the maximum size of the container.
*
* @return
*/
int getSize();
/**
* Get the members in this container
*
@@ -9650,6 +9650,12 @@ public final class NpcID
public static final int REANIMATED_HELLHOUND = 11463;
public static final int APPRENTICE_TAMARA_11464 = 11464;
public static final int APPRENTICE_TAMARA_11465 = 11465;
public static final int SMITHING_CATALYST = 11466;
public static final int HILL_GIANT_11467 = 11467;
public static final int KOVAC = 11468;
public static final int KOVAC_11469 = 11469;
public static final int KOVAC_11470 = 11470;
public static final int KOVAC_11472 = 11472;
public static final int TARIK_11473 = 11473;
public static final int MAISA_11474 = 11474;
public static final int MAISA_11475 = 11475;
@@ -14122,5 +14122,18 @@ public final class NullItemID
public static final int NULL_26995 = 26995;
public static final int NULL_26998 = 26998;
public static final int NULL_26999 = 26999;
public static final int NULL_27011 = 27011;
public static final int NULL_27013 = 27013;
public static final int NULL_27015 = 27015;
public static final int NULL_27016 = 27016;
public static final int NULL_27018 = 27018;
public static final int NULL_27020 = 27020;
public static final int NULL_27022 = 27022;
public static final int NULL_27024 = 27024;
public static final int NULL_27026 = 27026;
public static final int NULL_27028 = 27028;
public static final int NULL_27030 = 27030;
public static final int NULL_27032 = 27032;
public static final int NULL_27034 = 27034;
/* This file is automatically generated. Do not edit. */
}
@@ -1801,8 +1801,10 @@ public final class NullNpcID
public static final int NULL_11461 = 11461;
public static final int NULL_11471 = 11471;
public static final int NULL_11488 = 11488;
public static final int NULL_11494 = 11494;
public static final int NULL_11512 = 11512;
public static final int NULL_11559 = 11559;
public static final int NULL_11560 = 11560;
public static final int NULL_11567 = 11567;
public static final int NULL_11568 = 11568;
public static final int NULL_11611 = 11611;
@@ -21643,6 +21643,10 @@ public final class NullObjectID
public static final int NULL_43851 = 43851;
public static final int NULL_43852 = 43852;
public static final int NULL_43853 = 43853;
public static final int NULL_43854 = 43854;
public static final int NULL_43855 = 43855;
public static final int NULL_43856 = 43856;
public static final int NULL_43859 = 43859;
public static final int NULL_43871 = 43871;
public static final int NULL_43872 = 43872;
public static final int NULL_43874 = 43874;
@@ -22154,5 +22158,139 @@ public final class NullObjectID
public static final int NULL_44598 = 44598;
public static final int NULL_44599 = 44599;
public static final int NULL_44600 = 44600;
public static final int NULL_44603 = 44603;
public static final int NULL_44618 = 44618;
public static final int NULL_44639 = 44639;
public static final int NULL_44640 = 44640;
public static final int NULL_44641 = 44641;
public static final int NULL_44642 = 44642;
public static final int NULL_44643 = 44643;
public static final int NULL_44644 = 44644;
public static final int NULL_44645 = 44645;
public static final int NULL_44646 = 44646;
public static final int NULL_44647 = 44647;
public static final int NULL_44648 = 44648;
public static final int NULL_44649 = 44649;
public static final int NULL_44650 = 44650;
public static final int NULL_44651 = 44651;
public static final int NULL_44652 = 44652;
public static final int NULL_44653 = 44653;
public static final int NULL_44654 = 44654;
public static final int NULL_44655 = 44655;
public static final int NULL_44656 = 44656;
public static final int NULL_44657 = 44657;
public static final int NULL_44658 = 44658;
public static final int NULL_44659 = 44659;
public static final int NULL_44660 = 44660;
public static final int NULL_44661 = 44661;
public static final int NULL_44662 = 44662;
public static final int NULL_44664 = 44664;
public static final int NULL_44665 = 44665;
public static final int NULL_44666 = 44666;
public static final int NULL_44667 = 44667;
public static final int NULL_44668 = 44668;
public static final int NULL_44669 = 44669;
public static final int NULL_44670 = 44670;
public static final int NULL_44671 = 44671;
public static final int NULL_44672 = 44672;
public static final int NULL_44673 = 44673;
public static final int NULL_44674 = 44674;
public static final int NULL_44675 = 44675;
public static final int NULL_44676 = 44676;
public static final int NULL_44677 = 44677;
public static final int NULL_44678 = 44678;
public static final int NULL_44679 = 44679;
public static final int NULL_44680 = 44680;
public static final int NULL_44681 = 44681;
public static final int NULL_44682 = 44682;
public static final int NULL_44684 = 44684;
public static final int NULL_44685 = 44685;
public static final int NULL_44686 = 44686;
public static final int NULL_44687 = 44687;
public static final int NULL_44688 = 44688;
public static final int NULL_44689 = 44689;
public static final int NULL_44690 = 44690;
public static final int NULL_44691 = 44691;
public static final int NULL_44692 = 44692;
public static final int NULL_44693 = 44693;
public static final int NULL_44694 = 44694;
public static final int NULL_44695 = 44695;
public static final int NULL_44696 = 44696;
public static final int NULL_44697 = 44697;
public static final int NULL_44698 = 44698;
public static final int NULL_44699 = 44699;
public static final int NULL_44700 = 44700;
public static final int NULL_44701 = 44701;
public static final int NULL_44702 = 44702;
public static final int NULL_44703 = 44703;
public static final int NULL_44704 = 44704;
public static final int NULL_44705 = 44705;
public static final int NULL_44706 = 44706;
public static final int NULL_44707 = 44707;
public static final int NULL_44708 = 44708;
public static final int NULL_44709 = 44709;
public static final int NULL_44710 = 44710;
public static final int NULL_44711 = 44711;
public static final int NULL_44712 = 44712;
public static final int NULL_44713 = 44713;
public static final int NULL_44714 = 44714;
public static final int NULL_44715 = 44715;
public static final int NULL_44716 = 44716;
public static final int NULL_44717 = 44717;
public static final int NULL_44718 = 44718;
public static final int NULL_44719 = 44719;
public static final int NULL_44720 = 44720;
public static final int NULL_44721 = 44721;
public static final int NULL_44722 = 44722;
public static final int NULL_44723 = 44723;
public static final int NULL_44724 = 44724;
public static final int NULL_44725 = 44725;
public static final int NULL_44729 = 44729;
public static final int NULL_44730 = 44730;
public static final int NULL_44731 = 44731;
public static final int NULL_44732 = 44732;
public static final int NULL_44733 = 44733;
public static final int NULL_44734 = 44734;
public static final int NULL_44735 = 44735;
public static final int NULL_44736 = 44736;
public static final int NULL_44737 = 44737;
public static final int NULL_44738 = 44738;
public static final int NULL_44739 = 44739;
public static final int NULL_44740 = 44740;
public static final int NULL_44741 = 44741;
public static final int NULL_44742 = 44742;
public static final int NULL_44743 = 44743;
public static final int NULL_44744 = 44744;
public static final int NULL_44745 = 44745;
public static final int NULL_44746 = 44746;
public static final int NULL_44747 = 44747;
public static final int NULL_44748 = 44748;
public static final int NULL_44749 = 44749;
public static final int NULL_44750 = 44750;
public static final int NULL_44751 = 44751;
public static final int NULL_44752 = 44752;
public static final int NULL_44753 = 44753;
public static final int NULL_44754 = 44754;
public static final int NULL_44755 = 44755;
public static final int NULL_44756 = 44756;
public static final int NULL_44757 = 44757;
public static final int NULL_44758 = 44758;
public static final int NULL_44759 = 44759;
public static final int NULL_44760 = 44760;
public static final int NULL_44764 = 44764;
public static final int NULL_44765 = 44765;
public static final int NULL_44766 = 44766;
public static final int NULL_44767 = 44767;
public static final int NULL_44768 = 44768;
public static final int NULL_44769 = 44769;
public static final int NULL_44770 = 44770;
public static final int NULL_44771 = 44771;
public static final int NULL_44773 = 44773;
public static final int NULL_44774 = 44774;
public static final int NULL_44775 = 44775;
public static final int NULL_44776 = 44776;
public static final int NULL_44777 = 44777;
public static final int NULL_44778 = 44778;
public static final int NULL_44779 = 44779;
/* This file is automatically generated. Do not edit. */
}
@@ -17473,7 +17473,7 @@ public final class ObjectID
public static final int OLD_MANS_COFFIN = 33265;
public static final int OLD_SHRINE = 33307;
public static final int BARREL_OF_WATER = 33308;
public static final int BUCKETS = 33309;
public static final int PILE_OF_BUCKETS = 33309;
public static final int FIRE_PIT_33310 = 33310;
public static final int FIRE_33311 = 33311;
public static final int LITTLE_BOULDER = 33312;
@@ -20915,7 +20915,7 @@ public final class ObjectID
public static final int MOUNTED_HARPOONFISH = 40963;
public static final int HAMMERS_40964 = 40964;
public static final int ROPES = 40965;
public static final int BUCKETS_40966 = 40966;
public static final int BUCKETS = 40966;
public static final int HARPOONS = 40967;
public static final int CRATE_40993 = 40993;
public static final int BARREL_40994 = 40994;
@@ -22197,6 +22197,15 @@ public final class ObjectID
public static final int BLOOD_RIFT_43825 = 43825;
public static final int PLANT_43827 = 43827;
public static final int BARRIER_43849 = 43849;
public static final int BROKEN_TRIP_HAMMER = 43857;
public static final int REPAIRED_TRIP_HAMMER = 43858;
public static final int BROKEN_GRINDSTONE = 43860;
public static final int REPAIRED_GRINDSTONE = 43861;
public static final int BROKEN_POLISHING_WHEEL = 43862;
public static final int REPAIRED_POLISHING_WHEEL = 43863;
public static final int CRUCIBLE = 43864;
public static final int MOULD_JIG = 43865;
public static final int BIG_CHEST_43866 = 43866;
public static final int RUBBLE_43867 = 43867;
public static final int STAIRS_43868 = 43868;
public static final int SCIMITAR = 43869;
@@ -22419,5 +22428,49 @@ public final class ObjectID
public static final int LION_GUARD = 44584;
public static final int WARP = 44585;
public static final int WARP_44586 = 44586;
public static final int LAVA_POOL = 44601;
public static final int WATERFALL_44602 = 44602;
public static final int PREFORM_STORAGE = 44604;
public static final int CRATE_44605 = 44605;
public static final int BELT_SYSTEM = 44606;
public static final int BROKEN_TRIP_HAMMER_44607 = 44607;
public static final int BROKEN_GRINDSTONE_44608 = 44608;
public static final int BROKEN_POLISHING_WHEEL_44609 = 44609;
public static final int EXIT_44610 = 44610;
public static final int CRUCIBLE_44611 = 44611;
public static final int MOULD_JIG_44612 = 44612;
public static final int BIG_CHEST_44613 = 44613;
public static final int LAVA_POOL_44614 = 44614;
public static final int WATERFALL_44615 = 44615;
public static final int PREFORM_STORAGE_44616 = 44616;
public static final int CRATE_44617 = 44617;
public static final int TRIP_HAMMER = 44619;
public static final int GRINDSTONE = 44620;
public static final int POLISHING_WHEEL = 44621;
public static final int CRUCIBLE_EMPTY = 44622;
public static final int CRUCIBLE_PARTIALLY_FULL = 44623;
public static final int CRUCIBLE_FULL = 44624;
public static final int MOULD_JIG_EMPTY = 44625;
public static final int MOULD_JIG_SETUP = 44626;
public static final int MOULD_JIG_POURED_METAL = 44627;
public static final int MOULD_JIG_COOLING_METAL = 44628;
public static final int MOULD_JIG_COOLED_METAL = 44629;
public static final int BANK_CHEST_44630 = 44630;
public static final int LAVA_POOL_44631 = 44631;
public static final int WATERFALL_44632 = 44632;
public static final int PREFORM_STORAGE_44633 = 44633;
public static final int PREFORM_STORAGE_44634 = 44634;
public static final int CAVE_44635 = 44635;
public static final int EXIT_44636 = 44636;
public static final int CRATE_44637 = 44637;
public static final int CRATE_44638 = 44638;
public static final int WATERFALL_44663 = 44663;
public static final int MOULDS = 44683;
public static final int CHEST_44726 = 44726;
public static final int HAMMER_44727 = 44727;
public static final int WHEELBARROW_44728 = 44728;
public static final int WATERWHEEL = 44761;
public static final int BELT_SYSTEM_44762 = 44762;
public static final int BELT_SYSTEM_44763 = 44763;
/* This file is automatically generated. Do not edit. */
}
@@ -41,6 +41,7 @@ public enum VarPlayer
{
POUCH_STATUS(261),
DUEL_PENDING(286),
CANNON_AMMO(3),
ATTACK_STYLE(43),
QUEST_POINTS(101),
IS_POISONED(102),
@@ -30,6 +30,7 @@ import java.awt.event.MouseEvent;
import java.awt.event.MouseWheelEvent;
import java.util.List;
import net.runelite.api.MainBufferProvider;
import net.runelite.api.Renderable;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetItem;
@@ -185,4 +186,12 @@ public interface Callbacks
* @param keyEvent the key event
*/
void keyTyped(KeyEvent keyEvent);
}
/**
* Called to test if a renderable should be drawn this frame
* @param renderable the renderable
* @param drawingUi if this is the 2d ui, such as hp bars or hitsplats
* @return false to prevent drawing
*/
boolean draw(Renderable renderable, boolean drawingUi);
}