Skip to content

Commit 3c67250

Browse files
Fix3dllFix3dll
committed
1 parent d5f53c0 commit 3c67250

29 files changed

Lines changed: 251 additions & 87 deletions

‎src/main/java/codes/biscuit/skyblockaddons/SkyblockAddons.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
import codes.biscuit.skyblockaddons.misc.scheduler.NewScheduler;
2323
import codes.biscuit.skyblockaddons.misc.scheduler.Scheduler;
2424
import codes.biscuit.skyblockaddons.newgui.GuiManager;
25-
import codes.biscuit.skyblockaddons.utils.EnumUtils;
26-
import codes.biscuit.skyblockaddons.utils.InventoryUtils;
27-
import codes.biscuit.skyblockaddons.utils.SkyblockAddonsMessageFactory;
28-
import codes.biscuit.skyblockaddons.utils.Utils;
25+
import codes.biscuit.skyblockaddons.utils.*;
2926
import codes.biscuit.skyblockaddons.utils.data.DataUtils;
3027
import codes.biscuit.skyblockaddons.utils.gson.GsonInitializableTypeAdapter;
3128
import codes.biscuit.skyblockaddons.utils.gson.PatternAdapter;
@@ -191,6 +188,10 @@ public void init(FMLInitializationEvent e) {
191188
usingLabymod = utils.isModLoaded("labymod");
192189
usingOofModv1 = utils.isModLoaded("refractionoof", "1.0");
193190
usingPatcher = utils.isModLoaded("patcher");
191+
192+
if (!this.configValues.isEnabled(Feature.NUMBER_SEPARATORS)) {
193+
TextUtils.NUMBER_FORMAT.setGroupingUsed(false);
194+
}
194195
}
195196

196197
@Mod.EventHandler

‎src/main/java/codes/biscuit/skyblockaddons/config/ConfigValues.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,6 @@ private <E extends Enum<?>, F extends Enum<?>> void deserializeEnumEnumMapFromID
515515
}
516516
}
517517

518-
@SuppressWarnings("unchecked")
519518
private <E extends Enum<?>, N extends Number> void deserializeEnumNumberMapFromID(Map<E, N> map, String path, Class<E> keyClass, Class<N> numberClass) {
520519
deserializeEnumNumberMapFromID(loadedConfig, map, path, keyClass, numberClass);
521520
}

‎src/main/java/codes/biscuit/skyblockaddons/core/Feature.java‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,18 @@ public enum Feature {
211211
SHOW_SKYBLOCK_ITEM_ID(213, "settings.showSkyblockItemId", null, true),
212212
RESET_SALVAGED_ESSENCES_AFTER_LEAVING_MENU(214, "settings.resetSalvagedEssencesAfterLeavingMenu", null, false),
213213
CHANGE_DUNGEON_MAP_ZOOM_WITH_KEYBOARD(215, "settings.changeDungeonMapZoomWithKeyboard", null, false),
214+
// Release 1.7
214215
PLAYER_SYMBOLS_IN_CHAT(216, "settings.showPlayerSymbolsInChat", null, false, EnumUtils.FeatureSetting.SHOW_PROFILE_TYPE, EnumUtils.FeatureSetting.SHOW_NETHER_FACTION),
215216
CRIMSON_ARMOR_ABILITY_STACKS(217, "settings.crimsonArmorAbilityStacks", new GuiFeatureData(EnumUtils.DrawType.TEXT, ColorCode.GOLD), false),
216217
HIDE_TRUE_DEFENSE(218, "settings.hideTrueDefense", new GuiFeatureData(ColorCode.RED), false),
217218
SHOW_PROFILE_TYPE(219, "settings.showProfileType", false),
218219
SHOW_NETHER_FACTION(220,"settings.showNetherFaction", false),
220+
// Release Fix3dll
221+
NUMBER_SEPARATORS(221, "settings.numberSeparators", null, false),
222+
HIDE_WHEN_NOT_IN_CRIMSON(222, null, false),
223+
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),
224+
INFERNO_COLOR_BY_RARITY(224, null, false),
225+
INFERNO_TEXT_MODE(225, null, true),
219226

220227
WARNING_TIME(-1, "settings.warningDuration", null, false),
221228
WARP_ADVANCED_MODE(-1, "settings.advancedMode", null, true),
@@ -252,6 +259,10 @@ public enum Feature {
252259
REPEAT_SLAYER_BOSS_WARNING, ROTATE_MAP, CENTER_ROTATION_ON_PLAYER, MAP_ZOOM, BASE_STAT_BOOST_COLOR_BY_RARITY,
253260
SHOW_PLAYER_HEADS_ON_MAP, SHOW_GLOWING_ITEMS_ON_ISLAND, SKILL_ACTIONS_LEFT_UNTIL_NEXT_LEVEL, REVENANT_COLOR_BY_RARITY,
254261
TARANTULA_COLOR_BY_RARITY, SVEN_COLOR_BY_RARITY, REVENANT_TEXT_MODE, TARANTULA_TEXT_MODE, SVEN_TEXT_MODE,
262+
DRAGON_STATS_TRACKER_COLOR_BY_RARITY, HIDE_WHEN_NOT_IN_CASTLE, HIDE_WHEN_NOT_IN_SPIDERS_DEN, HIDE_WHEN_NOT_IN_END,
263+
ENDERMAN_COLOR_BY_RARITY, ENDERMAN_TEXT_MODE, HIDE_WHEN_NOT_IN_CRIMSON, INFERNO_COLOR_BY_RARITY, INFERNO_TEXT_MODE,
264+
HIDE_WHEN_NOT_IN_CRYPTS, SHOW_PERSONAL_COMPACTOR_PREVIEW, SHOW_SKILL_PERCENTAGE_INSTEAD_OF_XP,
265+
SHOW_SKILL_XP_GAINED, SHOW_SALVAGE_ESSENCES_COUNTER, HEALING_CIRCLE_OPACITY, COOLDOWN_PREDICTION, ENCHANTMENTS_HIGHLIGHT,
255266
DRAGON_STATS_TRACKER_COLOR_BY_RARITY, HIDE_WHEN_NOT_IN_CASTLE, HIDE_WHEN_NOT_IN_SPIDERS_DEN,
256267
HIDE_WHEN_NOT_IN_CRYPTS, SHOW_PERSONAL_COMPACTOR_PREVIEW, SHOW_SKILL_PERCENTAGE_INSTEAD_OF_XP, SHOW_SKILL_XP_GAINED,
257268
SHOW_SALVAGE_ESSENCES_COUNTER, HEALING_CIRCLE_OPACITY, COOLDOWN_PREDICTION, ENCHANTMENTS_HIGHLIGHT,
@@ -274,7 +285,7 @@ public enum Feature {
274285
SLAYER_INDICATOR, POWER_ORB_STATUS_DISPLAY, ZEALOT_COUNTER, TICKER_CHARGES_DISPLAY, TAB_EFFECT_TIMERS, SHOW_TOTAL_ZEALOT_COUNT, SHOW_SUMMONING_EYE_COUNT,
275286
SHOW_AVERAGE_ZEALOTS_PER_EYE, BIRCH_PARK_RAINMAKER_TIMER, ENDSTONE_PROTECTOR_DISPLAY, BAIT_LIST, DUNGEONS_MAP_DISPLAY, SHOW_DUNGEON_MILESTONE,
276287
DUNGEONS_COLLECTED_ESSENCES_DISPLAY, REVENANT_SLAYER_TRACKER, TARANTULA_SLAYER_TRACKER, SVEN_SLAYER_TRACKER, DRAGON_STATS_TRACKER, DUNGEON_DEATH_COUNTER,
277-
ROCK_PET_TRACKER, DOLPHIN_PET_TRACKER, DUNGEONS_SECRETS_DISPLAY, CANDY_POINTS_COUNTER, DRILL_FUEL_TEXT,
288+
ROCK_PET_TRACKER, DOLPHIN_PET_TRACKER, DUNGEONS_SECRETS_DISPLAY, CANDY_POINTS_COUNTER, DRILL_FUEL_TEXT, INFERNO_SLAYER_TRACKER,
278289
TREVOR_TRACKED_ENTITY_PROXIMITY_INDICATOR, FETCHUR_TODAY, VOIDGLOOM_SLAYER_TRACKER, OTHER_DEFENCE_STATS, SPIRIT_SCEPTRE_DISPLAY, FARM_EVENT_TIMER,
279290
CRIMSON_ARMOR_ABILITY_STACKS, HIDE_TRUE_DEFENSE));
280291

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

288299
private static final int ID_AT_PREVIOUS_UPDATE = 199;
289300

@@ -313,7 +324,7 @@ public enum Feature {
313324
}
314325

315326
/**
316-
* Called when a features enable state is changed.
327+
* Called right after a feature's enable state is changed.
317328
*/
318329
public void onToggle() {
319330
if (this.id == DEVELOPER_MODE.id) {

‎src/main/java/codes/biscuit/skyblockaddons/core/Location.java‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ public enum Location {
1313
// TODO: Jsonify all of these
1414
ISLAND("Your Island"), // TODO RPC
1515
GUEST_ISLAND("'s Island", "island"), // TODO RPC
16+
GARDEN("The Garden"),
17+
GARDEN_PLOT("Plot"), //TODO RPC
1618

1719
// Hub
1820
AUCTION_HOUSE("Auction House"),
@@ -113,11 +115,16 @@ public enum Location {
113115
OVERGROWN_MUSHROOM_CAVE("Overgrown Mushroom Cave"),
114116
JAKES_HOUSE("Jake's House"),
115117
SHEPHERDS_KEEP("Shepherds Keep"),
116-
TRAPPERS_DEN("Trappers Den"),
118+
TRAPPERS_DEN("Trapper's Den"),
117119

120+
// Spider's Den
118121
SPIDERS_DEN("Spider's Den"),
119-
120-
BLAZING_FORTRESS("Blazing Fortress"),
122+
SPIDER_MOUND("Spider Mound"),
123+
ARACHNES_BURROW("Arachne's Burrow"),
124+
ARACHNES_SANCTUARY("Arachnes's Sanctuary"),
125+
GRANDMAS_HOUSE("Grandma's House"),
126+
ARCHAEOLOGISTS_CAMP("Archaeologist's Camp"),
127+
GRAVEL_MINES("Gravel Mines"),
121128

122129
// The End
123130
THE_END("The End"),
@@ -127,8 +134,18 @@ public enum Location {
127134
VOID_SLATE("Void Slate"),
128135

129136
// Jerry's workshop
137+
// TODO check is it correct
130138
JERRY_POND("Jerry Pond"), // TODO RPC
131139
JERRYS_WORKSHOP("Jerry's Workshop"), // TODO RPC
140+
MOUNT_JERRY("Mount Jerry"),
141+
GARYS_SHACK("Gary's Shack"),
142+
GLACIAL_CAVE("Glacial Cave"),
143+
TERRYS_SHACK("Terry's Shack"),
144+
HOT_SPRINGS("Hot Springs"),
145+
REFLECTIVE_POND("Reflective Pond"),
146+
SUNKEN_JERRY_POND("Sunken Jerry Pond"),
147+
SHERRYS_SHOWROOM("Sherry's Showroom"),
148+
EINARYS_EMPORIUM("Einary's Emporium"),
132149

133150
// Dungeons
134151
THE_CATACOMBS("The Catacombs"), // TODO RPC

‎src/main/java/codes/biscuit/skyblockaddons/core/SkyblockDate.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import codes.biscuit.skyblockaddons.utils.TextUtils;
44

5-
import java.text.DecimalFormat;
65
import java.util.regex.Matcher;
76
import java.util.regex.Pattern;
87

@@ -120,7 +119,7 @@ public String toString() {
120119
monthName,
121120
DAY + TextUtils.getOrdinalSuffix(DAY),
122121
HOUR,
123-
TextUtils.NUMBER_FORMAT.format(MINUTE),
122+
TextUtils.formatNumber(MINUTE),
124123
PERIOD);
125124
}
126125
}

‎src/main/java/codes/biscuit/skyblockaddons/core/dungeons/DungeonManager.java‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
import net.minecraft.client.Minecraft;
1010
import net.minecraft.client.network.NetHandlerPlayClient;
1111
import net.minecraft.client.network.NetworkPlayerInfo;
12+
import org.apache.logging.log4j.Logger;
1213

14+
import java.text.ParseException;
1315
import java.util.EnumMap;
1416
import java.util.HashMap;
1517
import java.util.List;
@@ -22,13 +24,13 @@
2224
* This class contains a set of utility methods for Skyblock Dungeons.
2325
*/
2426
public class DungeonManager {
25-
26-
private static final Pattern PATTERN_MILESTONE = Pattern.compile("^.+?(Healer|Tank|Mage|Archer|Berserk) Milestone .+?([❶-❿]).+?§r§.(\\d+)§.§7 .+?");
27+
private static final Logger logger = SkyblockAddons.getLogger();
28+
private static final Pattern PATTERN_MILESTONE = Pattern.compile("^.+?(Healer|Tank|Mage|Archer|Berserk) Milestone .+?([❶-❿]).+?§r§.(\\d,.)§.§7 .+?");
2729
private static final Pattern PATTERN_COLLECTED_ESSENCES = Pattern.compile("§.+?(\\d+) (Wither|Spider|Undead|Dragon|Gold|Diamond|Ice) Essence");
2830
private static final Pattern PATTERN_BONUS_ESSENCE = Pattern.compile("^§.+?[^You] .+?found a .+?(Wither|Spider|Undead|Dragon|Gold|Diamond|Ice) Essence.+?");
2931
private static final Pattern PATTERN_SALVAGE_ESSENCES = Pattern.compile("\\+(?<essenceNum>[0-9]+) (?<essenceType>Wither|Spider|Undead|Dragon|Gold|Diamond|Ice) Essence!");
3032
private static final Pattern PATTERN_SECRETS = Pattern.compile("§7([0-9]+)/([0-9]+) Secrets");
31-
private static final Pattern PATTERN_PLAYER_LINE = Pattern.compile("^§.\\[(?<classLetter>.)] (?<name>[\\w§]+) (?:§.)*?§(?<healthColor>.)(?<health>[\\w]+)(?:§c❤)?");
33+
private static final Pattern PATTERN_PLAYER_LINE = Pattern.compile("^§.\\[(?<classLetter>.)] (?<name>[\\w§]+) (?:§.)*?§(?<healthColor>.)(?<health>[\\w,]+)(?:§c❤)?");
3234
private static final Pattern PLAYER_LIST_INFO_DEATHS_PATTERN = Pattern.compile("Deaths: \\((?<deaths>\\d+)\\)");
3335

3436
/** The last dungeon server the player played on */
@@ -223,7 +225,12 @@ public void updateDungeonPlayer(String scoreboardLine) {
223225
if (healthText.equals("DEAD")) {
224226
health = 0;
225227
} else {
226-
health = Integer.parseInt(healthText);
228+
try {
229+
health = TextUtils.NUMBER_FORMAT.parse(healthText).intValue();
230+
} catch (ParseException ex) {
231+
logger.error("Failed to parse player "+ name + " health: " + healthText, ex);
232+
return;
233+
}
227234
}
228235

229236
for (DungeonPlayer player: teammates.values()) {

‎src/main/java/codes/biscuit/skyblockaddons/features/EntityOutlines/FeatureTrackerQuest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class FeatureTrackerQuest {
4242
Location.SHEPHERDS_KEEP, Location.OVERGROWN_MUSHROOM_CAVE, Location.JAKES_HOUSE, Location.TREASURE_HUNTER_CAMP);
4343

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

@@ -190,7 +190,7 @@ public void onNameTagRender(Pre<EntityLivingBase> e) {
190190
if (SkyblockAddons.getInstance().getConfigValues().isEnabled(Feature.TREVOR_THE_TRAPPER_FEATURES) &&
191191
!e.isCanceled() && SkyblockAddons.getInstance().getConfigValues().isEnabled(Feature.TREVOR_SHOW_QUEST_COOLDOWN) &&
192192
CooldownManager.isOnCooldown("TREVOR_THE_TRAPPER_RETURN")) {
193-
Pattern p = Pattern.compile("Trevor The Trapper");
193+
Pattern p = Pattern.compile("Trevor");
194194
String s = TextUtils.stripColor(entity.getCustomNameTag());
195195
if (p.matcher(s).matches()) {
196196
String str = Utils.MESSAGE_PREFIX_SHORT + Translations.getMessage("messages.worldRenderedCooldownTime",

‎src/main/java/codes/biscuit/skyblockaddons/features/discordrpc/DiscordStatus.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ public enum DiscordStatus implements ButtonSelect.SelectItem {
3636
String coinString = " Coin";
3737

3838
if (coins == 1) {
39-
return TextUtils.formatDouble(coins) + coinString;
39+
return TextUtils.formatNumber(coins) + coinString;
4040
} else {
41-
return TextUtils.formatDouble(coins) + coinString + 's';
41+
return TextUtils.formatNumber(coins) + coinString + 's';
4242
}
4343
}),
4444

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

5050
if (bits == 1) {
51-
return TextUtils.formatDouble(bits) + bitString;
51+
return TextUtils.formatNumber(bits) + bitString;
5252
} else {
53-
return TextUtils.formatDouble(bits) + bitString + 's';
53+
return TextUtils.formatNumber(bits) + bitString + 's';
5454
}
5555
}),
5656

@@ -107,6 +107,8 @@ public enum DiscordStatus implements ButtonSelect.SelectItem {
107107
if (slayerQuest == EnumUtils.SlayerQuest.REVENANT_HORROR) return DiscordStatus.valueOf("REVENANT").displayMessageSupplier.get();
108108
if (slayerQuest == EnumUtils.SlayerQuest.SVEN_PACKMASTER) return DiscordStatus.valueOf("SVEN").displayMessageSupplier.get();
109109
if (slayerQuest == EnumUtils.SlayerQuest.TARANTULA_BROODFATHER) return DiscordStatus.valueOf("TARANTULA").displayMessageSupplier.get();
110+
if (slayerQuest == EnumUtils.SlayerQuest.VOIDGLOOM_SERAPH) return DiscordStatus.valueOf("VOIDGLOOM").displayMessageSupplier.get();
111+
if (slayerQuest == EnumUtils.SlayerQuest.INFERNO_DEMONLORD) return DiscordStatus.valueOf("INFERNO").displayMessageSupplier.get();
110112
}
111113

112114
if ("AUTO_STATUS".equals(main.getConfigValues().getDiscordAutoDefault().name())) { // Avoid self reference.

‎src/main/java/codes/biscuit/skyblockaddons/features/dungeonmap/DungeonMapManager.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ public class DungeonMapManager {
5959
/** The factor the player's coordinates are multiplied by to calculate their map marker coordinates */
6060
private static final float COORDINATE_FACTOR = 1.33F;
6161

62-
/** {@link EntityPlayerSP#lastReportedPosX} */
62+
/** {@code EntityPlayerSP#lastReportedPosX} */
6363
static final Field lastReportedPosX;
64-
/** {@link EntityPlayerSP#lastReportedPosZ} */
64+
/** {@code EntityPlayerSP#lastReportedPosZ} */
6565
static final Field lastReportedPosZ;
6666

6767
private static MapData mapData;
@@ -505,9 +505,9 @@ public static void decreaseZoomByStep() {
505505
}
506506

507507
/**
508-
* Returns the map zoom factor from {@link codes.biscuit.skyblockaddons.config.ConfigValues#mapZoom}.
508+
* Returns the map zoom factor from {@code codes.biscuit.skyblockaddons.config.ConfigValues#mapZoom}.
509509
*
510-
* @return the map zoom factor from {@link codes.biscuit.skyblockaddons.config.ConfigValues#mapZoom}
510+
* @return the map zoom factor from {@code codes.biscuit.skyblockaddons.config.ConfigValues#mapZoom}
511511
*/
512512
public static float getMapZoom() {
513513
return main.getConfigValues().getMapZoom().getValue();
@@ -526,7 +526,7 @@ public static void setDenormalizedMapZoom(float value){
526526
}
527527

528528
/**
529-
* Sets the map zoom factor in {@link codes.biscuit.skyblockaddons.config.ConfigValues#mapZoom}.
529+
* Sets the map zoom factor in {@code codes.biscuit.skyblockaddons.config.ConfigValues#mapZoom}.
530530
* The new value must be between 0.5f and 5f inclusive.
531531
*
532532
* @param value the new map zoom factor

‎src/main/java/codes/biscuit/skyblockaddons/features/slayertracker/SlayerBoss.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.util.Locale;
99

1010
import static codes.biscuit.skyblockaddons.features.slayertracker.SlayerDrop.*;
11+
import static codes.biscuit.skyblockaddons.features.slayertracker.SlayerDrop.SUBZERO_INVERTER;
1112

1213
public enum SlayerBoss {
1314

@@ -23,8 +24,12 @@ public enum SlayerBoss {
2324
VOIDGLOOM("Enderman", NULL_SPHERE, TWILIGHT_ARROW_POISON, ENDERSNAKE_RUNE, SUMMONING_EYE, MANA_STEAL_ONE,
2425
TRANSMISSION_TUNER, NULL_ATOM, HAZMAT_ENDERMAN, POCKET_ESPRESSO_MACHINE, SMARTY_PANTS_ONE, END_RUNE,
2526
HANDY_BLOOD_CHALICE, SINFUL_DICE, EXCEEDINGLY_RARE_ENDER_ARTIFACT_UPGRADER, VOID_CONQUEROR_ENDERMAN_SKIN,
26-
ETHERWARP_MERGER, JUDGEMENT_CORE, ENCHANT_RUNE, ENDER_SLAYER_SEVEN);
27-
27+
ETHERWARP_MERGER, JUDGEMENT_CORE, ENCHANT_RUNE, ENDER_SLAYER_SEVEN),
28+
29+
INFERNO("Blaze", DERELICT_ASHE, LAVATEARS_RUNE, WISP_ICE_FLAVORED_WATER, BUNDLE_OF_MAGMA, MANA_DISINTEGRATOR,
30+
SCORCHED_BOOKS, KELVIN_INVERTER, BLAZE_ROD_DISTILLATE, GLOWSTONE_DISTILLATE, MAGMA_CREAM_DISTILLATE, NETHER_WART_DISTILLATE,
31+
GABAGOOL_DISTILLATE, SCORCHED_POWER_CRYSTAL, ARCHFIEND_DICE, FIRE_ASPECT, FIERY_BURST_RUNE, FLAWED_OPAL_GEMSTONE,
32+
DUPLEX, HIGH_CLASS_ARCHFIEND_DICE, WILSON_ENGINEERING_PLANS, SUBZERO_INVERTER);
2833

2934
@Getter
3035
private final List<SlayerDrop> drops;

0 commit comments

Comments
 (0)