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

discord: Remove code for handling of varbits

Browse Source 
By changing DiscordAreaType.RAIDS to use regions instead of varbits, it is no longer necessary for the discord plugin to have any varbit-related code
This commit is contained in:
Broooklyn
2021-01-17 19:01:09 -05:00
committed by Adam
parent f8612639fe
commit dc99317b75
2 changed files with 0 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java
View File

@@ -26,16 +26,12 @@
*/ */
package net.runelite.client.plugins.discord; package net.runelite.client.plugins.discord;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import net.runelite.api.Client;
import net.runelite.api.Skill; import net.runelite.api.Skill;
import net.runelite.api.Varbits;
@AllArgsConstructor @AllArgsConstructor
@Getter @Getter
@@ -433,20 +429,12 @@ enum DiscordGameEventType
REGION_WRATH_ALTAR("Wrath Altar", DiscordAreaType.REGIONS, 9291); REGION_WRATH_ALTAR("Wrath Altar", DiscordAreaType.REGIONS, 9291);
private static final Map<Integer, DiscordGameEventType> FROM_REGION; private static final Map<Integer, DiscordGameEventType> FROM_REGION;
private static final List<DiscordGameEventType> FROM_VARBITS;
static static
{ {
ImmutableMap.Builder<Integer, DiscordGameEventType> regionMapBuilder = new ImmutableMap.Builder<>(); ImmutableMap.Builder<Integer, DiscordGameEventType> regionMapBuilder = new ImmutableMap.Builder<>();
ImmutableList.Builder<DiscordGameEventType> fromVarbitsBuilder = ImmutableList.builder();
for (DiscordGameEventType discordGameEventType : DiscordGameEventType.values()) for (DiscordGameEventType discordGameEventType : DiscordGameEventType.values())
{ {
if (discordGameEventType.getVarbits() != null)
{
fromVarbitsBuilder.add(discordGameEventType);
continue;
}
if (discordGameEventType.getRegionIds() == null) if (discordGameEventType.getRegionIds() == null)
{ {
continue; continue;
@@ -458,7 +446,6 @@ enum DiscordGameEventType
} }
} }
FROM_REGION = regionMapBuilder.build(); FROM_REGION = regionMapBuilder.build();
FROM_VARBITS = fromVarbitsBuilder.build();
} }
@Nullable @Nullable
@@ -500,9 +487,6 @@ enum DiscordGameEventType
@Nullable @Nullable
private DiscordAreaType discordAreaType; private DiscordAreaType discordAreaType;
@Nullable
private Varbits varbits;
@Nullable @Nullable
private int[] regionIds; private int[] regionIds;
@@ -544,15 +528,6 @@ enum DiscordGameEventType
this(state, priority, true, false, false, true, false); this(state, priority, true, false, false, true, false);
} }
DiscordGameEventType(String areaName, DiscordAreaType areaType, Varbits varbits)
{
this.state = exploring(areaType, areaName);
this.priority = -2;
this.discordAreaType = areaType;
this.varbits = varbits;
this.shouldClear = true;
}
private static String training(final Skill skill) private static String training(final Skill skill)
{ {
return training(skill.getName()); return training(skill.getName());
@@ -612,17 +587,4 @@ enum DiscordGameEventType
{ {
return FROM_REGION.get(regionId); return FROM_REGION.get(regionId);
} }
public static DiscordGameEventType fromVarbit(final Client client)
{
for (DiscordGameEventType fromVarbit : FROM_VARBITS)
{
if (client.getVar(fromVarbit.getVarbits()) != 0)
{
return fromVarbit;
}
}
return null;
}
} }

17
runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java
View File

@@ -46,7 +46,6 @@ import net.runelite.api.WorldType;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.StatChanged; import net.runelite.api.events.StatChanged;
import net.runelite.api.events.VarbitChanged;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.discord.DiscordService; import net.runelite.client.discord.DiscordService;
import net.runelite.client.discord.events.DiscordJoinGame; import net.runelite.client.discord.events.DiscordJoinGame;
@@ -210,22 +209,6 @@ public class DiscordPlugin extends Plugin
} }
} }
@Subscribe
public void onVarbitChanged(VarbitChanged event)
{
if (!config.showRaidingActivity())
{
return;
}
final DiscordGameEventType discordGameEventType = DiscordGameEventType.fromVarbit(client);
if (discordGameEventType != null)
{
discordState.triggerEvent(discordGameEventType);
}
}
@Subscribe @Subscribe
public void onDiscordReady(DiscordReady event) public void onDiscordReady(DiscordReady event)
{ {