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

Merge remote-tracking branch 'orig_upstream/master' into master2

Browse Source 
# Conflicts:
#	pom.xml
#	runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java
This commit is contained in:
Lucas
2019-05-23 14:03:13 +02:00
parent 8606c12fd3 46f5a51477
commit 1a2be0c2b5
25 changed files with 543 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
runescape-api/src/main/java/net/runelite/mapping/Protect.java
View File

@@ -1,40 +0,0 @@
/*
* Copyright (c) 2018, Lotto <https://github.com/devLotto>
* 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.mapping;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/**
* Used to indicate a method can only be called from within mixins.
* Calling methods annotated with this annotation outside mixins results in a AbstractMethodError.
* Only works in net.runelite.rs.api.*
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
public @interface Protect
{
}

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

@@ -31,7 +31,6 @@ import net.runelite.api.World;
import net.runelite.api.widgets.Widget;
import net.runelite.mapping.Construct;
import net.runelite.mapping.Import;
import net.runelite.mapping.Protect;
public interface RSClient extends RSGameEngine, Client
{
@@ -826,7 +825,6 @@ public interface RSClient extends RSGameEngine, Client
void revalidateWidgetScroll(Widget[] group, Widget w, boolean postEvent);
@Import("menuAction")
@Protect
void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7);
@Import("Viewport_entityCountAtMouse")

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

@@ -26,7 +26,6 @@ package net.runelite.rs.api;
import net.runelite.api.Player;
import net.runelite.mapping.Import;
import net.runelite.mapping.Protect;
public interface RSPlayer extends RSActor, Player
{
@@ -63,6 +62,5 @@ public interface RSPlayer extends RSActor, Player
int getRsOverheadIcon();
@Import("skullIcon")
@Protect
int getRsSkullIcon();
}