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

Revert "util: move weaponType"

Browse Source 
This reverts commit c1076a159e.
This commit is contained in:
xKylee
2019-09-07 11:57:44 +01:00
parent a8f1368fb5
commit 38b2492c25
4 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java
View File

@@ -43,7 +43,6 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.ui.overlay.OverlayUtil;
import net.runelite.api.util.Text; import net.runelite.api.util.Text;
import net.runelite.client.util.WeaponType;
@Singleton @Singleton
class PrayAgainstPlayerOverlay extends Overlay class PrayAgainstPlayerOverlay extends Overlay

1
runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java
View File

@@ -41,7 +41,6 @@ import net.runelite.client.ui.overlay.OverlayLayer;
import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.ui.overlay.OverlayUtil;
import net.runelite.client.util.WeaponType;
@Singleton @Singleton
class PrayAgainstPlayerOverlayPrayerTab extends Overlay class PrayAgainstPlayerOverlayPrayerTab extends Overlay

1
runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java
View File

@@ -56,7 +56,6 @@ import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.PluginType;
import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.ui.overlay.OverlayManager;
import net.runelite.client.util.ImageUtil; import net.runelite.client.util.ImageUtil;
import net.runelite.client.util.WeaponType;
@PluginDescriptor( @PluginDescriptor(
name = "Pray Against Player", name = "Pray Against Player",

19
runelite-client/src/main/java/net/runelite/client/util/WeaponType.java → runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java
View File

@@ -22,14 +22,14 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.runelite.client.util; package net.runelite.client.plugins.prayagainstplayer;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.ItemDefinition; import net.runelite.api.ItemDefinition;
import net.runelite.api.Player; import net.runelite.api.Player;
import net.runelite.api.kit.KitType; import net.runelite.api.kit.KitType;
public enum WeaponType enum WeaponType
{ {
WEAPON_MELEE, WEAPON_MELEE,
@@ -116,12 +116,7 @@ public enum WeaponType
"flail", "flail",
"granite hammer", "granite hammer",
"rapier", "rapier",
"bulwark", "bulwark"
"ham joint",
"blade of saeldor",
"swift blade",
"wolfbane",
"keris"
}; };
private static final String[] rangedWeaponNames = { private static final String[] rangedWeaponNames = {
@@ -132,18 +127,14 @@ public enum WeaponType
"dart", "dart",
"thrownaxe", "thrownaxe",
"chinchompa", "chinchompa",
"ballista", "ballista"
"javelin"
}; };
private static final String[] magicWeaponNames = { private static final String[] magicWeaponNames = {
"staff", "staff",
"trident", "trident",
"wand", "wand",
"dawnbringer", "dawnbringer"
"ivandis",
"void knight mace",
"sceptre"
}; };
} }