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

Merge remote-tracking branch 'upstream/master' into master

Browse Source 
Nice insider info btw, be nice if you shared it, so-called "open source" client.
This commit is contained in:
ThatGamerBlue
2021-05-28 21:39:25 +01:00
parent a0ae15df6e 04dc76bbfd
commit 38634fcad3
481 changed files with 53410 additions and 51723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
runescape-api/src/main/java/net/runelite/rs/api/RSClanChannel.java Normal file
View File

@@ -0,0 +1,44 @@
/*
* Copyright (c) 2021, ThatGamerBlue <thatgamerblue@gmail.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.rs.api;
import java.util.List;
import net.runelite.api.clan.ClanChannel;
import net.runelite.api.clan.ClanChannelMember;
import net.runelite.mapping.Import;
public interface RSClanChannel extends ClanChannel
{
@Import("name")
@Override
String getName();
@Import("members")
@Override
List<ClanChannelMember> getMembers();
@Import("getSortedMembers")
int[] getSortedMembers();
}

42
runescape-api/src/main/java/net/runelite/rs/api/RSClanChannelMember.java Normal file
View File

@@ -0,0 +1,42 @@
/*
* Copyright (c) 2021, ThatGamerBlue <thatgamerblue@gmail.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.rs.api;
import net.runelite.api.clan.ClanChannelMember;
import net.runelite.mapping.Import;
public interface RSClanChannelMember extends ClanChannelMember
{
@Import("rank")
byte getRSRank();
@Import("world")
@Override
int getWorld();
@Import("name")
@Override
String getName();
}

50
runescape-api/src/main/java/net/runelite/rs/api/RSClanSettings.java Normal file
View File

@@ -0,0 +1,50 @@
/*
* Copyright (c) 2021, ThatGamerBlue <thatgamerblue@gmail.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.rs.api;
import net.runelite.api.clan.ClanSettings;
import net.runelite.mapping.Import;
public interface RSClanSettings extends ClanSettings
{
@Import("name")
@Override
String getName();
@Import("memberCount")
int getMemberCount();
@Import("memberNames")
String[] getMemberNames();
@Import("memberRanks")
byte[] getMemberRanks();
@Import("getSortedMembers")
int[] getSortedMembers();
@Import("getTitleGroupValue")
Integer getTitleGroupValue(int group);
}

21
runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
View File

@@ -29,6 +29,7 @@ import java.util.Map;
import net.runelite.api.Client;
import net.runelite.api.SpritePixels;
import net.runelite.api.World;
import net.runelite.api.clan.ClanRank;
import net.runelite.api.widgets.Widget;
import net.runelite.mapping.Construct;
import net.runelite.mapping.Import;
@@ -676,8 +677,8 @@ public interface RSClient extends RSGameEngine, Client
@Import("friendSystem")
RSFriendSystem getFriendManager();
@Import("clanChat")
RSClanChat getFriendsChatManager();
@Import("friendsChat")
RSFriendsChat getFriendsChatManager();
@Import("loginType")
RSLoginType getLoginType();
@@ -1412,4 +1413,20 @@ public interface RSClient extends RSGameEngine, Client
@Import("crossWorldMessageIdsIndex")
int getCrossWorldMessageIdsIndex();
@Import("currentClanChannels")
RSClanChannel[] getCurrentClanChannels();
@Import("currentClanSettings")
RSClanSettings[] getCurrentClanSettingsAry();
@Import("guestClanChannel")
@Override
RSClanChannel getGuestClanChannel();
@Import("guestClanSettings")
@Override
RSClanSettings getGuestClanSettings();
ClanRank getClanRankFromRs(int rank);
}

2
runescape-api/src/main/java/net/runelite/rs/api/RSClanChat.java → runescape-api/src/main/java/net/runelite/rs/api/RSFriendsChat.java
View File

@@ -4,7 +4,7 @@ import net.runelite.api.FriendsChatManager;
import net.runelite.api.FriendsChatMember;
import net.runelite.mapping.Import;
public interface RSClanChat extends RSUserList<FriendsChatMember>, FriendsChatManager
public interface RSFriendsChat extends RSUserList<FriendsChatMember>, FriendsChatManager
{
@Import("owner")
String getOwner();

6
runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java
View File

@@ -50,10 +50,14 @@ public interface RSPlayer extends RSActor, Player
@Override
int getTeam();
@Import("isClanMember")
@Import("isFriendsChatMember")
@Override
boolean isFriendsChatMember();
@Import("isClanMember")
@Override
boolean isClanMember();
@Import("isFriend")
@Override
boolean isFriend();