From 71d2e74732c7a5ffc29d7a0db3de118328640707 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 15 Nov 2019 09:13:11 -0500 Subject: [PATCH] Remove SEASONAL_DEADMAN world type Co-authored-by: Hydrox6 --- .../http/api/hiscore/HiscoreEndpoint.java | 1 - .../net/runelite/http/api/worlds/WorldType.java | 1 - .../http/service/worlds/ServiceWorldType.java | 3 +-- .../src/main/java/net/runelite/api/WorldType.java | 9 ++------- .../client/plugins/hiscore/HiscorePanel.java | 4 ---- .../plugins/opponentinfo/OpponentInfoPlugin.java | 4 ---- .../plugins/screenshot/ScreenshotPlugin.java | 3 +-- .../client/plugins/timers/TimersPlugin.java | 1 - .../client/plugins/worldhopper/WorldTableRow.java | 3 +-- .../client/plugins/xptracker/XpWorldType.java | 3 --- .../client/plugins/hiscore/seasonal_deadman.png | Bin 311 -> 0 bytes 11 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/seasonal_deadman.png diff --git a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreEndpoint.java b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreEndpoint.java index a88f2e208e..4b0b39b0f4 100644 --- a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreEndpoint.java +++ b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreEndpoint.java @@ -35,7 +35,6 @@ public enum HiscoreEndpoint HARDCORE_IRONMAN("Hardcore Ironman", "https://services.runescape.com/m=hiscore_oldschool_hardcore_ironman/index_lite.ws"), ULTIMATE_IRONMAN("Ultimate Ironman", "https://services.runescape.com/m=hiscore_oldschool_ultimate/index_lite.ws"), DEADMAN("Deadman", "https://services.runescape.com/m=hiscore_oldschool_deadman/index_lite.ws"), - SEASONAL_DEADMAN("Seasonal Deadman", "https://services.runescape.com/m=hiscore_oldschool_seasonal/index_lite.ws"), DEADMAN_TOURNAMENT("Deadman Tournament", "https://services.runescape.com/m=hiscore_oldschool_tournament/index_lite.ws"); private final String name; diff --git a/http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java b/http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java index c94a7c70e6..5c9af6cc10 100644 --- a/http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java +++ b/http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java @@ -34,6 +34,5 @@ public enum WorldType LAST_MAN_STANDING, TOURNAMENT, DEADMAN, - SEASONAL_DEADMAN, DEADMAN_TOURNAMENT } diff --git a/http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java b/http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java index c6aa598321..9cfa5a5a41 100644 --- a/http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java +++ b/http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java @@ -36,8 +36,7 @@ enum ServiceWorldType LAST_MAN_STANDING(WorldType.LAST_MAN_STANDING, 1 << 14), TOURNAMENT(WorldType.TOURNAMENT, 1 << 25), DEADMAN_TOURNAMENT(WorldType.DEADMAN_TOURNAMENT, 1 << 26), - DEADMAN(WorldType.DEADMAN, 1 << 29), - SEASONAL_DEADMAN(WorldType.SEASONAL_DEADMAN, 1 << 30); + DEADMAN(WorldType.DEADMAN, 1 << 29); private final WorldType apiType; private final int mask; diff --git a/runelite-api/src/main/java/net/runelite/api/WorldType.java b/runelite-api/src/main/java/net/runelite/api/WorldType.java index 0ecfd1ed94..91c16734ca 100644 --- a/runelite-api/src/main/java/net/runelite/api/WorldType.java +++ b/runelite-api/src/main/java/net/runelite/api/WorldType.java @@ -67,11 +67,7 @@ public enum WorldType /** * Deadman world type. */ - DEADMAN(1 << 29), - /** - * Seasonal deadman world type. - */ - SEASONAL_DEADMAN(1 << 30); + DEADMAN(1 << 29); private final int mask; @@ -83,8 +79,7 @@ public enum WorldType private static final EnumSet PVP_WORLD_TYPES = EnumSet.of( DEADMAN, DEADMAN_TOURNAMENT, - PVP, - SEASONAL_DEADMAN + PVP ); /** diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java index d61f8866db..fe93fb04f6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java @@ -651,10 +651,6 @@ public class HiscorePanel extends PluginPanel { return HiscoreEndpoint.DEADMAN_TOURNAMENT; } - else if (wTypes.contains(WorldType.SEASONAL_DEADMAN)) - { - return HiscoreEndpoint.SEASONAL_DEADMAN; - } else if (wTypes.contains(WorldType.DEADMAN)) { return HiscoreEndpoint.DEADMAN; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java index e038e81ab2..c387581790 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java @@ -117,10 +117,6 @@ public class OpponentInfoPlugin extends Plugin { hiscoreEndpoint = HiscoreEndpoint.DEADMAN_TOURNAMENT; } - else if (worldType.contains(WorldType.SEASONAL_DEADMAN)) - { - hiscoreEndpoint = HiscoreEndpoint.SEASONAL_DEADMAN; - } else if (worldType.contains(WorldType.DEADMAN)) { hiscoreEndpoint = HiscoreEndpoint.DEADMAN; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index 1c4123e795..e58a088118 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java @@ -616,9 +616,8 @@ public class ScreenshotPlugin extends Plugin { final EnumSet worldTypes = client.getWorldType(); final boolean dmm = worldTypes.contains(WorldType.DEADMAN); - final boolean sdmm = worldTypes.contains(WorldType.SEASONAL_DEADMAN); final boolean dmmt = worldTypes.contains(WorldType.DEADMAN_TOURNAMENT); - final boolean isDmmWorld = dmm || sdmm || dmmt; + final boolean isDmmWorld = dmm || dmmt; String playerDir = client.getLocalPlayer().getName(); if (isDmmWorld) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index 0a2772f253..67d2e6bccf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -542,7 +542,6 @@ public class TimersPlugin extends Plugin else if (HALF_TELEBLOCK_PATTERN.matcher(event.getMessage()).find()) { if (client.getWorldType().contains(WorldType.DEADMAN) - && !client.getWorldType().contains(WorldType.SEASONAL_DEADMAN) && !client.getWorldType().contains(WorldType.DEADMAN_TOURNAMENT)) { createGameTimer(DMM_FULLTB); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java index 2cf20ddd4f..077dd7f72b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java @@ -245,8 +245,7 @@ class WorldTableRow extends JPanel } else if (world.getTypes().contains(WorldType.PVP) || world.getTypes().contains(WorldType.HIGH_RISK) - || world.getTypes().contains(WorldType.DEADMAN) - || world.getTypes().contains(WorldType.SEASONAL_DEADMAN)) + || world.getTypes().contains(WorldType.DEADMAN)) { activityField.setForeground(DANGEROUS_WORLD); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java index a907381347..5126a978e4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java @@ -31,7 +31,6 @@ enum XpWorldType NORMAL, TOURNEY, DMM, - SDMM, DMMT; static XpWorldType of(WorldType type) @@ -42,8 +41,6 @@ enum XpWorldType return TOURNEY; case DEADMAN: return DMM; - case SEASONAL_DEADMAN: - return SDMM; case DEADMAN_TOURNAMENT: return DMMT; default: diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/seasonal_deadman.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/seasonal_deadman.png deleted file mode 100644 index d3632e62db3c98559117313d114b7a10d4b4319c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|&H|6fVg?3oVGw3ym^DWNDEQLT z#WBR9cWtmWU$X&^X{flE-+@_6g+tjbgxnu_lr(iN)mBe{RN9w%uguBp!JG9~H>Vvx_keqjVYjyHnxqxM zwmWw8m`)8-cRK2(cynR=<$GlUc0IDs7=wz}x^0+SRIV_Shc!L)Ua)44!SOt4x7IS$Z|N3`_;TP9(9;Z_u6{1- HoD!M