Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build
on:
push:
branches:
- stable
- unofficial-fixes
- main
paths:
- '**.java'
Expand Down Expand Up @@ -55,4 +55,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: SkyblockAddons v${{ env.project_version }}+${{ env.ORG_GRADLE_PROJECT_buildNumber }}
path: build/libs/*
path: build/libs/*
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ run
Thumbs.db
bytecode
.vscode
logs
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import java.text.ParseException

plugins {
id 'java'
id 'gg.essential.loom' version '0.10.0.5'
id 'gg.essential.loom' version '0.10.0.+'
id 'dev.architectury.architectury-pack200' version '0.1.3'
id 'io.freefair.lombok' version "6.6.1"
id 'io.freefair.lombok' version "8.0.1"
id 'com.github.johnrengelman.shadow' version '7.1.2'
id 'net.kyori.blossom' version '1.3.1'
}
Expand Down Expand Up @@ -97,7 +97,7 @@ dependencies {
minecraft("com.mojang:minecraft:${project.minecraftVersion}")
mappings("de.oceanlabs.mcp:mcp_stable:${project.mappings}")
forge("net.minecraftforge:forge:${project.forgeVersion}")
runtimeOnly('me.djtheredstoner:DevAuth-forge-legacy:1.1.0')
runtimeOnly('me.djtheredstoner:DevAuth-forge-legacy:1.1.2')

// Discord RPC for Java https://github.com/jagrosh/DiscordIPC
bundle('com.github.ILikePlayingGames:DiscordIPC:-SNAPSHOT') {
Expand All @@ -110,7 +110,7 @@ dependencies {
exclude module: 'gson'
because 'Different version conflicts with Minecraft\'s GSON'
}
testImplementation('org.junit.jupiter:junit-jupiter:5.9.1')
testImplementation('org.junit.jupiter:junit-jupiter:5.9.3')
}

tasks.withType(JavaCompile).configureEach {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
import codes.biscuit.skyblockaddons.misc.scheduler.NewScheduler;
import codes.biscuit.skyblockaddons.misc.scheduler.Scheduler;
import codes.biscuit.skyblockaddons.newgui.GuiManager;
import codes.biscuit.skyblockaddons.utils.EnumUtils;
import codes.biscuit.skyblockaddons.utils.InventoryUtils;
import codes.biscuit.skyblockaddons.utils.SkyblockAddonsMessageFactory;
import codes.biscuit.skyblockaddons.utils.Utils;
import codes.biscuit.skyblockaddons.utils.*;
import codes.biscuit.skyblockaddons.utils.data.DataUtils;
import codes.biscuit.skyblockaddons.utils.gson.GsonInitializableTypeAdapter;
import codes.biscuit.skyblockaddons.utils.gson.PatternAdapter;
Expand Down Expand Up @@ -191,6 +188,10 @@ public void init(FMLInitializationEvent e) {
usingLabymod = utils.isModLoaded("labymod");
usingOofModv1 = utils.isModLoaded("refractionoof", "1.0");
usingPatcher = utils.isModLoaded("patcher");

if (!this.configValues.isEnabled(Feature.NUMBER_SEPARATORS)) {
TextUtils.NUMBER_FORMAT.setGroupingUsed(false);
}
}

@Mod.EventHandler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,6 @@ private <E extends Enum<?>, F extends Enum<?>> void deserializeEnumEnumMapFromID
}
}

@SuppressWarnings("unchecked")
private <E extends Enum<?>, N extends Number> void deserializeEnumNumberMapFromID(Map<E, N> map, String path, Class<E> keyClass, Class<N> numberClass) {
deserializeEnumNumberMapFromID(loadedConfig, map, path, keyClass, numberClass);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ public enum EssenceType {
DRAGON,
GOLD,
DIAMOND,
ICE;
ICE,
CRIMSON;

private String niceName;
@Getter private ResourceLocation resourceLocation;
Expand Down
17 changes: 14 additions & 3 deletions src/main/java/codes/biscuit/skyblockaddons/core/Feature.java
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,18 @@ public enum Feature {
SHOW_SKYBLOCK_ITEM_ID(213, "settings.showSkyblockItemId", null, true),
RESET_SALVAGED_ESSENCES_AFTER_LEAVING_MENU(214, "settings.resetSalvagedEssencesAfterLeavingMenu", null, false),
CHANGE_DUNGEON_MAP_ZOOM_WITH_KEYBOARD(215, "settings.changeDungeonMapZoomWithKeyboard", null, false),
// Release 1.7
PLAYER_SYMBOLS_IN_CHAT(216, "settings.showPlayerSymbolsInChat", null, false, EnumUtils.FeatureSetting.SHOW_PROFILE_TYPE, EnumUtils.FeatureSetting.SHOW_NETHER_FACTION),
CRIMSON_ARMOR_ABILITY_STACKS(217, "settings.crimsonArmorAbilityStacks", new GuiFeatureData(EnumUtils.DrawType.TEXT, ColorCode.GOLD), false),
HIDE_TRUE_DEFENSE(218, "settings.hideTrueDefense", new GuiFeatureData(ColorCode.RED), false),
SHOW_PROFILE_TYPE(219, "settings.showProfileType", false),
SHOW_NETHER_FACTION(220,"settings.showNetherFaction", false),
// Release Fix3dll
NUMBER_SEPARATORS(221, "settings.numberSeparators", null, false),
HIDE_WHEN_NOT_IN_CRIMSON(222, null, false),
INFERNO_SLAYER_TRACKER(223, "settings.infernoSlayerTracker", new GuiFeatureData(EnumUtils.DrawType.SLAYER_TRACKERS, ColorCode.WHITE), false, EnumUtils.FeatureSetting.COLOUR_BY_RARITY, EnumUtils.FeatureSetting.TEXT_MODE, EnumUtils.FeatureSetting.HIDE_WHEN_NOT_IN_CRIMSON),
INFERNO_COLOR_BY_RARITY(224, null, false),
INFERNO_TEXT_MODE(225, null, true),

WARNING_TIME(-1, "settings.warningDuration", null, false),
WARP_ADVANCED_MODE(-1, "settings.advancedMode", null, true),
Expand Down Expand Up @@ -252,6 +259,10 @@ public enum Feature {
REPEAT_SLAYER_BOSS_WARNING, ROTATE_MAP, CENTER_ROTATION_ON_PLAYER, MAP_ZOOM, BASE_STAT_BOOST_COLOR_BY_RARITY,
SHOW_PLAYER_HEADS_ON_MAP, SHOW_GLOWING_ITEMS_ON_ISLAND, SKILL_ACTIONS_LEFT_UNTIL_NEXT_LEVEL, REVENANT_COLOR_BY_RARITY,
TARANTULA_COLOR_BY_RARITY, SVEN_COLOR_BY_RARITY, REVENANT_TEXT_MODE, TARANTULA_TEXT_MODE, SVEN_TEXT_MODE,
DRAGON_STATS_TRACKER_COLOR_BY_RARITY, HIDE_WHEN_NOT_IN_CASTLE, HIDE_WHEN_NOT_IN_SPIDERS_DEN, HIDE_WHEN_NOT_IN_END,
ENDERMAN_COLOR_BY_RARITY, ENDERMAN_TEXT_MODE, HIDE_WHEN_NOT_IN_CRIMSON, INFERNO_COLOR_BY_RARITY, INFERNO_TEXT_MODE,
HIDE_WHEN_NOT_IN_CRYPTS, SHOW_PERSONAL_COMPACTOR_PREVIEW, SHOW_SKILL_PERCENTAGE_INSTEAD_OF_XP,
SHOW_SKILL_XP_GAINED, SHOW_SALVAGE_ESSENCES_COUNTER, HEALING_CIRCLE_OPACITY, COOLDOWN_PREDICTION, ENCHANTMENTS_HIGHLIGHT,
DRAGON_STATS_TRACKER_COLOR_BY_RARITY, HIDE_WHEN_NOT_IN_CASTLE, HIDE_WHEN_NOT_IN_SPIDERS_DEN,
HIDE_WHEN_NOT_IN_CRYPTS, SHOW_PERSONAL_COMPACTOR_PREVIEW, SHOW_SKILL_PERCENTAGE_INSTEAD_OF_XP, SHOW_SKILL_XP_GAINED,
SHOW_SALVAGE_ESSENCES_COUNTER, HEALING_CIRCLE_OPACITY, COOLDOWN_PREDICTION, ENCHANTMENTS_HIGHLIGHT,
Expand All @@ -274,7 +285,7 @@ public enum Feature {
SLAYER_INDICATOR, POWER_ORB_STATUS_DISPLAY, ZEALOT_COUNTER, TICKER_CHARGES_DISPLAY, TAB_EFFECT_TIMERS, SHOW_TOTAL_ZEALOT_COUNT, SHOW_SUMMONING_EYE_COUNT,
SHOW_AVERAGE_ZEALOTS_PER_EYE, BIRCH_PARK_RAINMAKER_TIMER, ENDSTONE_PROTECTOR_DISPLAY, BAIT_LIST, DUNGEONS_MAP_DISPLAY, SHOW_DUNGEON_MILESTONE,
DUNGEONS_COLLECTED_ESSENCES_DISPLAY, REVENANT_SLAYER_TRACKER, TARANTULA_SLAYER_TRACKER, SVEN_SLAYER_TRACKER, DRAGON_STATS_TRACKER, DUNGEON_DEATH_COUNTER,
ROCK_PET_TRACKER, DOLPHIN_PET_TRACKER, DUNGEONS_SECRETS_DISPLAY, CANDY_POINTS_COUNTER, DRILL_FUEL_TEXT,
ROCK_PET_TRACKER, DOLPHIN_PET_TRACKER, DUNGEONS_SECRETS_DISPLAY, CANDY_POINTS_COUNTER, DRILL_FUEL_TEXT, INFERNO_SLAYER_TRACKER,
TREVOR_TRACKED_ENTITY_PROXIMITY_INDICATOR, FETCHUR_TODAY, VOIDGLOOM_SLAYER_TRACKER, OTHER_DEFENCE_STATS, SPIRIT_SCEPTRE_DISPLAY, FARM_EVENT_TIMER,
CRIMSON_ARMOR_ABILITY_STACKS, HIDE_TRUE_DEFENSE));

Expand All @@ -283,7 +294,7 @@ public enum Feature {
*/
@Getter
private static final Set<Feature> generalTabFeatures = new LinkedHashSet<>(Arrays.asList(TEXT_STYLE, WARNING_TIME, CHROMA_SPEED, CHROMA_MODE,
CHROMA_SIZE, TURN_ALL_FEATURES_CHROMA, CHROMA_SATURATION, CHROMA_BRIGHTNESS, USE_NEW_CHROMA_EFFECT, DEVELOPER_MODE));
CHROMA_SIZE, TURN_ALL_FEATURES_CHROMA, CHROMA_SATURATION, CHROMA_BRIGHTNESS, USE_NEW_CHROMA_EFFECT, NUMBER_SEPARATORS, DEVELOPER_MODE));

private static final int ID_AT_PREVIOUS_UPDATE = 199;

Expand Down Expand Up @@ -313,7 +324,7 @@ public enum Feature {
}

/**
* Called when a features enable state is changed.
* Called right after a feature's enable state is changed.
*/
public void onToggle() {
if (this.id == DEVELOPER_MODE.id) {
Expand Down
23 changes: 20 additions & 3 deletions src/main/java/codes/biscuit/skyblockaddons/core/Location.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ public enum Location {
// TODO: Jsonify all of these
ISLAND("Your Island"), // TODO RPC
GUEST_ISLAND("'s Island", "island"), // TODO RPC
GARDEN("The Garden"),
GARDEN_PLOT("Plot"), //TODO RPC

// Hub
AUCTION_HOUSE("Auction House"),
Expand Down Expand Up @@ -113,11 +115,16 @@ public enum Location {
OVERGROWN_MUSHROOM_CAVE("Overgrown Mushroom Cave"),
JAKES_HOUSE("Jake's House"),
SHEPHERDS_KEEP("Shepherds Keep"),
TRAPPERS_DEN("Trappers Den"),
TRAPPERS_DEN("Trapper's Den"),

// Spider's Den
SPIDERS_DEN("Spider's Den"),

BLAZING_FORTRESS("Blazing Fortress"),
SPIDER_MOUND("Spider Mound"),
ARACHNES_BURROW("Arachne's Burrow"),
ARACHNES_SANCTUARY("Arachnes's Sanctuary"),
GRANDMAS_HOUSE("Grandma's House"),
ARCHAEOLOGISTS_CAMP("Archaeologist's Camp"),
GRAVEL_MINES("Gravel Mines"),

// The End
THE_END("The End"),
Expand All @@ -127,8 +134,18 @@ public enum Location {
VOID_SLATE("Void Slate"),

// Jerry's workshop
// TODO check is it correct
JERRY_POND("Jerry Pond"), // TODO RPC
JERRYS_WORKSHOP("Jerry's Workshop"), // TODO RPC
MOUNT_JERRY("Mount Jerry"),
GARYS_SHACK("Gary's Shack"),
GLACIAL_CAVE("Glacial Cave"),
TERRYS_SHACK("Terry's Shack"),
HOT_SPRINGS("Hot Springs"),
REFLECTIVE_POND("Reflective Pond"),
SUNKEN_JERRY_POND("Sunken Jerry Pond"),
SHERRYS_SHOWROOM("Sherry's Showroom"),
EINARYS_EMPORIUM("Einary's Emporium"),

// Dungeons
THE_CATACOMBS("The Catacombs"), // TODO RPC
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import codes.biscuit.skyblockaddons.utils.TextUtils;

import java.text.DecimalFormat;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -120,7 +119,7 @@ public String toString() {
monthName,
DAY + TextUtils.getOrdinalSuffix(DAY),
HOUR,
TextUtils.NUMBER_FORMAT.format(MINUTE),
TextUtils.formatNumber(MINUTE),
PERIOD);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
import net.minecraft.client.Minecraft;
import net.minecraft.client.network.NetHandlerPlayClient;
import net.minecraft.client.network.NetworkPlayerInfo;
import org.apache.logging.log4j.Logger;

import java.text.ParseException;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
Expand All @@ -22,13 +24,13 @@
* This class contains a set of utility methods for Skyblock Dungeons.
*/
public class DungeonManager {

private static final Pattern PATTERN_MILESTONE = Pattern.compile("^.+?(Healer|Tank|Mage|Archer|Berserk) Milestone .+?([❶-❿]).+?§r§.(\\d+)§.§7 .+?");
private static final Pattern PATTERN_COLLECTED_ESSENCES = Pattern.compile("§.+?(\\d+) (Wither|Spider|Undead|Dragon|Gold|Diamond|Ice) Essence");
private static final Pattern PATTERN_BONUS_ESSENCE = Pattern.compile("^§.+?[^You] .+?found a .+?(Wither|Spider|Undead|Dragon|Gold|Diamond|Ice) Essence.+?");
private static final Pattern PATTERN_SALVAGE_ESSENCES = Pattern.compile("\\+(?<essenceNum>[0-9]+) (?<essenceType>Wither|Spider|Undead|Dragon|Gold|Diamond|Ice) Essence!");
private static final Logger logger = SkyblockAddons.getLogger();
private static final Pattern PATTERN_MILESTONE = Pattern.compile("^.+?(Healer|Tank|Mage|Archer|Berserk) Milestone .+?([❶-❿]).+?§r§.([\\d,]+)");
private static final Pattern PATTERN_COLLECTED_ESSENCES = Pattern.compile("§.+?(\\d+) (Wither|Spider|Undead|Dragon|Gold|Diamond|Ice|Crimson) Essence");
private static final Pattern PATTERN_BONUS_ESSENCE = Pattern.compile("^§.+?[^You] .+?found a .+?(Wither|Spider|Undead|Dragon|Gold|Diamond|Ice|Crimson) Essence.+?");
private static final Pattern PATTERN_SALVAGE_ESSENCES = Pattern.compile("\\+(?<essenceNum>[0-9]+) (?<essenceType>Wither|Spider|Undead|Dragon|Gold|Diamond|Ice|Crimson) Essence!");
private static final Pattern PATTERN_SECRETS = Pattern.compile("§7([0-9]+)/([0-9]+) Secrets");
private static final Pattern PATTERN_PLAYER_LINE = Pattern.compile("^§.\\[(?<classLetter>.)] (?<name>[\\w§]+) (?:§.)*?§(?<healthColor>.)(?<health>[\\w]+)(?:§c❤)?");
private static final Pattern PATTERN_PLAYER_LINE = Pattern.compile("^§.\\[(?<classLetter>.)] (?<name>[\\w§]+) (?:§.)*?§(?<healthColor>.)(?<health>[\\w,]+)(?:§c❤)?");
private static final Pattern PLAYER_LIST_INFO_DEATHS_PATTERN = Pattern.compile("Deaths: \\((?<deaths>\\d+)\\)");

/** The last dungeon server the player played on */
Expand Down Expand Up @@ -223,7 +225,12 @@ public void updateDungeonPlayer(String scoreboardLine) {
if (healthText.equals("DEAD")) {
health = 0;
} else {
health = Integer.parseInt(healthText);
try {
health = TextUtils.NUMBER_FORMAT.parse(healthText).intValue();
} catch (ParseException ex) {
logger.error("Failed to parse player "+ name + " health: " + healthText, ex);
return;
}
}

for (DungeonPlayer player: teammates.values()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public class FeatureTrackerQuest {
Location.SHEPHERDS_KEEP, Location.OVERGROWN_MUSHROOM_CAVE, Location.JAKES_HOUSE, Location.TREASURE_HUNTER_CAMP);

private static final Pattern TRACKED_ANIMAL_NAME_PATTERN = Pattern.compile("\\[Lv[0-9]+] (?<rarity>[a-zA-Z]+) (?<animal>[a-zA-Z]+) .*❤");
private static final Pattern TREVOR_FIND_ANIMAL_PATTERN = Pattern.compile("\\[NPC] Trevor The Trapper: You can find your [A-Z]+ animal near the [a-zA-Z ]+.");
private static final Pattern TREVOR_FIND_ANIMAL_PATTERN = Pattern.compile("\\[NPC] Trevor: You can find your [A-Z]+ animal near the [a-zA-Z ]+.");
private static final Pattern ANIMAL_DIED_PATTERN = Pattern.compile("Your mob died randomly, you are rewarded [0-9]+ pelts?.");
private static final Pattern ANIMAL_KILLED_PATTERN = Pattern.compile("Killing the animal rewarded you [0-9]+ pelts?.");

Expand Down Expand Up @@ -190,7 +190,7 @@ public void onNameTagRender(Pre<EntityLivingBase> e) {
if (SkyblockAddons.getInstance().getConfigValues().isEnabled(Feature.TREVOR_THE_TRAPPER_FEATURES) &&
!e.isCanceled() && SkyblockAddons.getInstance().getConfigValues().isEnabled(Feature.TREVOR_SHOW_QUEST_COOLDOWN) &&
CooldownManager.isOnCooldown("TREVOR_THE_TRAPPER_RETURN")) {
Pattern p = Pattern.compile("Trevor The Trapper");
Pattern p = Pattern.compile("Trevor");
String s = TextUtils.stripColor(entity.getCustomNameTag());
if (p.matcher(s).matches()) {
String str = Utils.MESSAGE_PREFIX_SHORT + Translations.getMessage("messages.worldRenderedCooldownTime",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ public enum DiscordStatus implements ButtonSelect.SelectItem {
String coinString = " Coin";

if (coins == 1) {
return TextUtils.formatDouble(coins) + coinString;
return TextUtils.formatNumber(coins) + coinString;
} else {
return TextUtils.formatDouble(coins) + coinString + 's';
return TextUtils.formatNumber(coins) + coinString + 's';
}
}),

Expand All @@ -48,9 +48,9 @@ public enum DiscordStatus implements ButtonSelect.SelectItem {
String bitString = " Bit";

if (bits == 1) {
return TextUtils.formatDouble(bits) + bitString;
return TextUtils.formatNumber(bits) + bitString;
} else {
return TextUtils.formatDouble(bits) + bitString + 's';
return TextUtils.formatNumber(bits) + bitString + 's';
}
}),

Expand Down Expand Up @@ -107,6 +107,8 @@ public enum DiscordStatus implements ButtonSelect.SelectItem {
if (slayerQuest == EnumUtils.SlayerQuest.REVENANT_HORROR) return DiscordStatus.valueOf("REVENANT").displayMessageSupplier.get();
if (slayerQuest == EnumUtils.SlayerQuest.SVEN_PACKMASTER) return DiscordStatus.valueOf("SVEN").displayMessageSupplier.get();
if (slayerQuest == EnumUtils.SlayerQuest.TARANTULA_BROODFATHER) return DiscordStatus.valueOf("TARANTULA").displayMessageSupplier.get();
if (slayerQuest == EnumUtils.SlayerQuest.VOIDGLOOM_SERAPH) return DiscordStatus.valueOf("VOIDGLOOM").displayMessageSupplier.get();
if (slayerQuest == EnumUtils.SlayerQuest.INFERNO_DEMONLORD) return DiscordStatus.valueOf("INFERNO").displayMessageSupplier.get();
}

if ("AUTO_STATUS".equals(main.getConfigValues().getDiscordAutoDefault().name())) { // Avoid self reference.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ public class DungeonMapManager {
/** The factor the player's coordinates are multiplied by to calculate their map marker coordinates */
private static final float COORDINATE_FACTOR = 1.33F;

/** {@link EntityPlayerSP#lastReportedPosX} */
/** {@code EntityPlayerSP#lastReportedPosX} */
static final Field lastReportedPosX;
/** {@link EntityPlayerSP#lastReportedPosZ} */
/** {@code EntityPlayerSP#lastReportedPosZ} */
static final Field lastReportedPosZ;

private static MapData mapData;
Expand Down Expand Up @@ -505,9 +505,9 @@ public static void decreaseZoomByStep() {
}

/**
* Returns the map zoom factor from {@link codes.biscuit.skyblockaddons.config.ConfigValues#mapZoom}.
* Returns the map zoom factor from {@code codes.biscuit.skyblockaddons.config.ConfigValues#mapZoom}.
*
* @return the map zoom factor from {@link codes.biscuit.skyblockaddons.config.ConfigValues#mapZoom}
* @return the map zoom factor from {@code codes.biscuit.skyblockaddons.config.ConfigValues#mapZoom}
*/
public static float getMapZoom() {
return main.getConfigValues().getMapZoom().getValue();
Expand All @@ -526,7 +526,7 @@ public static void setDenormalizedMapZoom(float value){
}

/**
* Sets the map zoom factor in {@link codes.biscuit.skyblockaddons.config.ConfigValues#mapZoom}.
* Sets the map zoom factor in {@code codes.biscuit.skyblockaddons.config.ConfigValues#mapZoom}.
* The new value must be between 0.5f and 5f inclusive.
*
* @param value the new map zoom factor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.util.Locale;

import static codes.biscuit.skyblockaddons.features.slayertracker.SlayerDrop.*;
import static codes.biscuit.skyblockaddons.features.slayertracker.SlayerDrop.SUBZERO_INVERTER;

public enum SlayerBoss {

Expand All @@ -23,8 +24,12 @@ public enum SlayerBoss {
VOIDGLOOM("Enderman", NULL_SPHERE, TWILIGHT_ARROW_POISON, ENDERSNAKE_RUNE, SUMMONING_EYE, MANA_STEAL_ONE,
TRANSMISSION_TUNER, NULL_ATOM, HAZMAT_ENDERMAN, POCKET_ESPRESSO_MACHINE, SMARTY_PANTS_ONE, END_RUNE,
HANDY_BLOOD_CHALICE, SINFUL_DICE, EXCEEDINGLY_RARE_ENDER_ARTIFACT_UPGRADER, VOID_CONQUEROR_ENDERMAN_SKIN,
ETHERWARP_MERGER, JUDGEMENT_CORE, ENCHANT_RUNE, ENDER_SLAYER_SEVEN);

ETHERWARP_MERGER, JUDGEMENT_CORE, ENCHANT_RUNE, ENDER_SLAYER_SEVEN),

INFERNO("Blaze", DERELICT_ASHE, LAVATEARS_RUNE, WISP_ICE_FLAVORED_WATER, BUNDLE_OF_MAGMA, MANA_DISINTEGRATOR,
SCORCHED_BOOKS, KELVIN_INVERTER, BLAZE_ROD_DISTILLATE, GLOWSTONE_DISTILLATE, MAGMA_CREAM_DISTILLATE, NETHER_WART_DISTILLATE,
GABAGOOL_DISTILLATE, SCORCHED_POWER_CRYSTAL, ARCHFIEND_DICE, FIRE_ASPECT, FIERY_BURST_RUNE, FLAWED_OPAL_GEMSTONE,
DUPLEX, HIGH_CLASS_ARCHFIEND_DICE, WILSON_ENGINEERING_PLANS, SUBZERO_INVERTER);

@Getter
private final List<SlayerDrop> drops;
Expand Down
Loading