diff --git a/src/main/java/codes/biscuit/skyblockaddons/core/Feature.java b/src/main/java/codes/biscuit/skyblockaddons/core/Feature.java index adcd6f0ffa..cc0d57ddd5 100644 --- a/src/main/java/codes/biscuit/skyblockaddons/core/Feature.java +++ b/src/main/java/codes/biscuit/skyblockaddons/core/Feature.java @@ -216,6 +216,10 @@ public enum Feature { 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), + HIDE_WHEN_NOT_IN_CRIMSON(221, null, false), + INFERNO_SLAYER_TRACKER(222, "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(223, null, false), + INFERNO_TEXT_MODE(224, null, true), WARNING_TIME(-1, "settings.warningDuration", null, false), WARP_ADVANCED_MODE(-1, "settings.advancedMode", null, true), @@ -252,9 +256,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_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_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, ENCHANTMENT_COMMA_COLOR, ENCHANTMENT_PERFECT_COLOR, ENCHANTMENT_GREAT_COLOR, ENCHANTMENT_GOOD_COLOR, ENCHANTMENT_POOR_COLOR, BIGGER_WAKE, LEG_MONKEY_LEVEL_100, HIDE_ENCHANT_DESCRIPTION, HIDE_GREY_ENCHANTS, TREVOR_TRACKED_ENTITY_PROXIMITY_INDICATOR, TREVOR_HIGHLIGHT_TRACKED_ENTITY, TREVOR_SHOW_QUEST_COOLDOWN, @@ -274,7 +279,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)); diff --git a/src/main/java/codes/biscuit/skyblockaddons/features/slayertracker/SlayerBoss.java b/src/main/java/codes/biscuit/skyblockaddons/features/slayertracker/SlayerBoss.java index 315dfae075..f3cee966d8 100644 --- a/src/main/java/codes/biscuit/skyblockaddons/features/slayertracker/SlayerBoss.java +++ b/src/main/java/codes/biscuit/skyblockaddons/features/slayertracker/SlayerBoss.java @@ -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 { @@ -18,13 +19,17 @@ public enum SlayerBoss { FLY_SWATTER, TARANTULA_TALISMAN, DIGESTED_MOSQUITO), SVEN("Wolf", WOLF_TOOTH, HAMSTER_WHEEL, SPIRIT_RUNE, CRITICAL_SIX, FURBALL, RED_CLAW_EGG, COUTURE_RUNE, OVERFLUX_CAPACITOR, - GRIZZLY_BAIT), + GRIZZLY_BAIT), 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 drops; diff --git a/src/main/java/codes/biscuit/skyblockaddons/features/slayertracker/SlayerDrop.java b/src/main/java/codes/biscuit/skyblockaddons/features/slayertracker/SlayerDrop.java index 981a720e9c..e9c706f4a5 100644 --- a/src/main/java/codes/biscuit/skyblockaddons/features/slayertracker/SlayerDrop.java +++ b/src/main/java/codes/biscuit/skyblockaddons/features/slayertracker/SlayerDrop.java @@ -67,7 +67,30 @@ public enum SlayerDrop { ETHERWARP_MERGER("Etherwarp Merger", "ETHERWARP_MERGER", ItemRarity.EPIC, "209e7834-3376-36e1-84eb-da13ef083836", "3e5314f4919691ccbf807743dae47ae45ac2e3ff08f79eecdd452fe602eff7f6"), JUDGEMENT_CORE("Judgement Core", "JUDGEMENT_CORE", ItemRarity.LEGENDARY, "ed896594-8655-3212-933e-c67bca300084", "2f3ddd7f81089c85b26ed597675519f03a1dcd6d1713e0cfc66afb8743cbe0"), ENCHANT_RUNE("Enchant Rune", "RUNE", "ENCHANT", ItemRarity.LEGENDARY, "1a34ecd4-6a5f-35aa-b5d3-617be4684d9a", "59ffacec6ee5a23d9cb24a2fe9dc15b24488f5f71006924560bf12148421ae6d"), - ENDER_SLAYER_SEVEN("Enchanted Book", "ENCHANTED_BOOK", ItemRarity.RARE, "ender_slayer", 7); + ENDER_SLAYER_SEVEN("Enchanted Book", "ENCHANTED_BOOK", ItemRarity.RARE, "ender_slayer", 7), + + // Blaze Drops + DERELICT_ASHE(Items.gunpowder, "Derelict Ashe", "DERELICT_ASHE", ItemRarity.UNCOMMON, true), + LAVATEARS_RUNE("Lavatears Rune I", "RUNE", "LAVATEARS", ItemRarity.LEGENDARY, "9a960dcb-e362-3642-bf8e-510574a20cd7", "4f01ec6331a3bc30a8204ec56398d08ca38788556bca9b81d776f6238d567367"), + WISP_ICE_FLAVORED_WATER(Items.potionitem, "Wisp's Ice-Flavored Water I Splash Potion", "POTION", ItemRarity.COMMON), + BUNDLE_OF_MAGMA("Bundle of Magma Arrows", "ARROW_BUNDLE_MAGMA", ItemRarity.EPIC, "17c69624-a342-3d09-a976-d0c155aaafec", "68392651a1a4cbb5982b13ace0829a75b98c11e13b68868fe349aea24014ffbd"), + MANA_DISINTEGRATOR("Mana Disintegrator", "MANA_DISINTEGRATOR", ItemRarity.RARE, "b9d84e23-a8e5-3992-bace-b6f3b32e34d8", "818f83eb64f438e3f6ae3a5c2dea8ed10303bad85ac34a798659a275aa096506"), + SCORCHED_BOOKS("Scorched Books", "SCORCHED_BOOKS", ItemRarity.MYTHIC, "d15a5bd9-33f1-3336-9679-9d4887b84e9c", "46ee7e906686abd5ec192b079314c45f1fb8171d9e13caa4cf9f63afc2263fd5"), + KELVIN_INVERTER("Kelvin Inverter", "KELVIN_INVERTER", ItemRarity.RARE, "be00aa7f-9080-3862-8d7d-2c6e4cbfd7c8", "b247f2658aebbb2766046624da85ee04cd2b18a8252045d4260bd81d62c7b6d8"), + BLAZE_ROD_DISTILLATE("Blaze Rod Distillate", "BLAZE_ROD_DISTILLATE", ItemRarity.RARE, "8056c161-527f-3c65-87c7-6c6240874d2e", "41e813a3a380e3eb201c24b9661f6edb39bdf42a88989f81a90f771997d6f5cd"), + GLOWSTONE_DISTILLATE("Glowstone Distillate", "GLOWSTONE_DUST_DISTILLATE", ItemRarity.RARE, "2f04f258-da20-330c-a415-f03d3b8ffd91", "18a2be157f2380931d697f1169af4eac09cfddaa4e052b53d76ef1cfd19cdaf"), + MAGMA_CREAM_DISTILLATE("Magma Cream Distillate", "MAGMA_CREAM_DISTILLATE", ItemRarity.RARE, "c95d296c-9b74-3f50-b97e-2108f6f86e6a", "41e813a3a380e3eb201c24b9661f6edb39bdf42a88989f81a90f771997d6f5cd"), + NETHER_WART_DISTILLATE("Nether Wart Distillate", "NETHER_STALK_DISTILLATE", ItemRarity.RARE, "57e7938b-2d98-3ede-86fb-48ba0d3deb4e", "7aff47f07df632bdafbf0b4ab8f3227d1f94c89aefaa28c5a3463b4ca5bfe6c5"), + GABAGOOL_DISTILLATE("Gabagool Distillate", "CRUDE_GABAGOOL_DISTILLATE", ItemRarity.RARE, "e33f8341-3ece-364c-a26b-a1d3b460645f", "595231147189ac4b9f53487ce35ba0205bf377f3986c0e5ceb942e77f1c39cc"), + SCORCHED_POWER_CRYSTAL("Scorched Power Crystal", "SCORCHED_POWER_CRYSTAL", ItemRarity.LEGENDARY, "3c4d9142-a59b-4e72-8f48-5e48b1650163", "2cf0ccf5a5f97097262e773bbf65c4d7d9a39938015bf00de4918620f034f9b0"), + ARCHFIEND_DICE("Archfiend Dice", "ARCHFIEND_DICE", ItemRarity.EPIC, "9c3c19b2-84e6-3eb6-8aec-450e133a569a", "6e22c298e7c6336af17909ac1f1ee6834b58b1a3cc99aba255ca7eaeb476173"), + FIRE_ASPECT("Enchanted Book", "ENCHANTED_BOOK", ItemRarity.COMMON, "fire_aspect", 3), + FIERY_BURST_RUNE("Fiery Burst Rune I", "RUNE", "FIERY_BURST", ItemRarity.LEGENDARY, "983fd05e-d9e2-3dbc-9185-28e3138ccb34", "8d620e4e3d3abfed6ad81a58a56bcd085d9e9efc803cabb21fa6c9e3969e2d2e"), + FLAWED_OPAL_GEMSTONE("Flawed Opal Gemstone", "FLAWED_OPAL_GEM", ItemRarity.UNCOMMON, "f1fa016a-e25d-3e5b-90c5-b9928ecf14c4", "eadc3bcdd7c701b63f8b8b4a96e429316a08388669d9a98c1a98791729b961df"), + DUPLEX("Enchanted Book", "ENCHANTED_BOOK", ItemRarity.COMMON, "ultimate_reiterate", 1), + HIGH_CLASS_ARCHFIEND_DICE("High Class Archfiend Dice", "HIGH_CLASS_ARCHFIEND_DICE", ItemRarity.LEGENDARY, "9c3c19b2-84e6-3eb6-8aec-450e133a569a"/*change*/, "915f7c313bca9c2f958e68ab14ab393867d67503affff8f20cb13fbe917fd31"), + WILSON_ENGINEERING_PLANS(Items.paper, "Wilson's Engineering Plans", "WILSON_ENGINEERING_PLANS", ItemRarity.LEGENDARY, true), + SUBZERO_INVERTER("Subzero Inverter", "SUBZERO_INVERTER", ItemRarity.LEGENDARY, "5ab20327-b51e-36b3-b65a-a772bc225067", "1cf677ca6209961e81beeb3aa274e0ec8d21d36778e5a94b80b1d8425b04ac6e"); @Getter private final String skyblockID; @@ -185,6 +208,27 @@ public enum SlayerDrop { internalItemTranslations.put("judgementCore", "Judgement Core"); internalItemTranslations.put("enchantRune", "Enchant Rune"); internalItemTranslations.put("enderSlayerSeven", "Ender Slayer 7"); + internalItemTranslations.put("derelictAshe", "Derelict Ashe"); + internalItemTranslations.put("lavatearsRune", "Lavatears Rune"); + internalItemTranslations.put("wispIceFlavored", "Wisp's Ice-Flavored Water"); + internalItemTranslations.put("bundleOfMagmaArrows", "Bundle of Magma Arrows"); + internalItemTranslations.put("manaDisintegrator", "Mana Disintegrator"); + internalItemTranslations.put("scorchedBooks", "Scorched Books"); + internalItemTranslations.put("kelvinInverter", "Kelvin Inverter"); + internalItemTranslations.put("blazeRodDisillate", "Blaze Rod Distillate"); + internalItemTranslations.put("glowstoneDistillate", "Glowstone Distillate"); + internalItemTranslations.put("magmaCreamDistillate", "Magma Cream Distillate"); + internalItemTranslations.put("netherWartDistillate", "Nether Wart Distillate"); + internalItemTranslations.put("gabagoolDistillate", "Gabagool Distillate"); + internalItemTranslations.put("scorchedPowerCrystal", "Scorched Power Crystal"); + internalItemTranslations.put("archfiendDice", "Archfiend Dice"); + internalItemTranslations.put("fireAspect", "Fire Aspect 3"); + internalItemTranslations.put("fieryBurstRune", "Fiery Burst Rune"); + internalItemTranslations.put("flawedOpalGemstone", "Flawed Opal Gemstone"); + internalItemTranslations.put("duplex", "Duplex 1"); + internalItemTranslations.put("highClassArchfiendDice", "High Class Archfiend Dice"); + internalItemTranslations.put("wilsonEngineeringPlans", "Wilson's Engineering Plans"); + internalItemTranslations.put("subzeroInverter", "Subzero Inverter"); } public String getDisplayName() { diff --git a/src/main/java/codes/biscuit/skyblockaddons/features/slayertracker/SlayerTracker.java b/src/main/java/codes/biscuit/skyblockaddons/features/slayertracker/SlayerTracker.java index c0c0a016d8..39d9f5d03b 100644 --- a/src/main/java/codes/biscuit/skyblockaddons/features/slayertracker/SlayerTracker.java +++ b/src/main/java/codes/biscuit/skyblockaddons/features/slayertracker/SlayerTracker.java @@ -43,7 +43,8 @@ public boolean isTrackerEnabled() { return main.getConfigValues().isEnabled(Feature.REVENANT_SLAYER_TRACKER) || main.getConfigValues().isEnabled(Feature.TARANTULA_SLAYER_TRACKER) || main.getConfigValues().isEnabled(Feature.SVEN_SLAYER_TRACKER) || - main.getConfigValues().isEnabled(Feature.VOIDGLOOM_SLAYER_TRACKER); + main.getConfigValues().isEnabled(Feature.VOIDGLOOM_SLAYER_TRACKER) || + main.getConfigValues().isEnabled(Feature.INFERNO_SLAYER_TRACKER); } /** diff --git a/src/main/java/codes/biscuit/skyblockaddons/gui/SettingsGui.java b/src/main/java/codes/biscuit/skyblockaddons/gui/SettingsGui.java index cd8c89f30f..0dc08f609b 100644 --- a/src/main/java/codes/biscuit/skyblockaddons/gui/SettingsGui.java +++ b/src/main/java/codes/biscuit/skyblockaddons/gui/SettingsGui.java @@ -416,6 +416,9 @@ public void sliderUpdated(float value) { } else if (feature == Feature.VOIDGLOOM_SLAYER_TRACKER) { settingFeature = Feature.ENDERMAN_COLOR_BY_RARITY; + } else if (feature == Feature.INFERNO_SLAYER_TRACKER) { + settingFeature = Feature.INFERNO_COLOR_BY_RARITY; + } else if (feature == Feature.DRAGON_STATS_TRACKER) { settingFeature = Feature.DRAGON_STATS_TRACKER_COLOR_BY_RARITY; } @@ -440,6 +443,9 @@ public void sliderUpdated(float value) { } else if (feature == Feature.VOIDGLOOM_SLAYER_TRACKER) { settingFeature = Feature.ENDERMAN_TEXT_MODE; + } else if (feature == Feature.INFERNO_SLAYER_TRACKER) { + settingFeature = Feature.INFERNO_TEXT_MODE; + } else if (feature == Feature.DRAGON_STATS_TRACKER_TEXT_MODE) { settingFeature = Feature.DRAGON_STATS_TRACKER_TEXT_MODE; } diff --git a/src/main/java/codes/biscuit/skyblockaddons/listeners/RenderListener.java b/src/main/java/codes/biscuit/skyblockaddons/listeners/RenderListener.java index 095215fc90..e39423f836 100644 --- a/src/main/java/codes/biscuit/skyblockaddons/listeners/RenderListener.java +++ b/src/main/java/codes/biscuit/skyblockaddons/listeners/RenderListener.java @@ -43,10 +43,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.monster.EntityCaveSpider; -import net.minecraft.entity.monster.EntityEnderman; -import net.minecraft.entity.monster.EntitySpider; -import net.minecraft.entity.monster.EntityZombie; +import net.minecraft.entity.monster.*; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -117,6 +114,7 @@ public class RenderListener { private static EntityCaveSpider caveSpider; private static EntityWolf sven; private static EntityEnderman enderman; + private static EntityBlaze inferno; private final SkyblockAddons main = SkyblockAddons.getInstance(); @@ -1550,6 +1548,15 @@ public void drawSlayerTrackers(Feature feature, Minecraft mc, float scale, Butto colorByRarity = config.isEnabled(Feature.ENDERMAN_COLOR_BY_RARITY); textMode = config.isEnabled(Feature.ENDERMAN_TEXT_MODE); slayerBoss = SlayerBoss.VOIDGLOOM; + } else if (feature == Feature.INFERNO_SLAYER_TRACKER) { + if (buttonLocation == null && config.isEnabled(Feature.HIDE_WHEN_NOT_IN_CRIMSON) && + (quest != EnumUtils.SlayerQuest.INFERNO_DEMONLORD || (location != Location.CRIMSON_ISLE && location != Location.STRONGHOLD && location != Location.SMOLDERING_TOMB && location != Location.THE_WASTELAND))) { + return; + } + + colorByRarity = config.isEnabled(Feature.INFERNO_COLOR_BY_RARITY); + textMode = config.isEnabled(Feature.INFERNO_TEXT_MODE); + slayerBoss = SlayerBoss.INFERNO; } else { return; } @@ -1636,6 +1643,9 @@ public void drawSlayerTrackers(Feature feature, Minecraft mc, float scale, Butto } else if (feature == Feature.VOIDGLOOM_SLAYER_TRACKER) { entityRenderY = 25; textCenterX = 20; + } else if (feature == Feature.INFERNO_SLAYER_TRACKER) { + entityRenderY = 25; + textCenterX = 20; } else { entityRenderY = 36; textCenterX = 15; @@ -1717,6 +1727,16 @@ public void drawSlayerTrackers(Feature feature, Minecraft mc, float scale, Butto drawEntity(enderman, (x + 15) / .7F, (y + 51) / .7F, -30); GlStateManager.scale(1 / .7, 1 / .7, 1); + } else if (feature == Feature.INFERNO_SLAYER_TRACKER) { + if (inferno == null) { + inferno = new EntityBlaze(Utils.getDummyWorld()); + inferno.setOnFire(true); + + } + GlStateManager.color(1, 1, 1, 1); + inferno.ticksExisted = (int) main.getNewScheduler().getTotalTicks(); + drawEntity(inferno, x + 15, y + 53, -15); + } else { if (sven == null) { sven = new EntityWolf(Utils.getDummyWorld()); diff --git a/src/main/java/codes/biscuit/skyblockaddons/utils/EnumUtils.java b/src/main/java/codes/biscuit/skyblockaddons/utils/EnumUtils.java index 600c960c04..387ce2ab93 100644 --- a/src/main/java/codes/biscuit/skyblockaddons/utils/EnumUtils.java +++ b/src/main/java/codes/biscuit/skyblockaddons/utils/EnumUtils.java @@ -215,6 +215,7 @@ public enum FeatureSetting { CHANGE_DUNGEON_MAP_ZOOM_WITH_KEYBOARD("settings.changeDungeonMapZoomWithKeyboard", 215), SHOW_PROFILE_TYPE( "settings.showProfileType", 219), SHOW_NETHER_FACTION("settings.showNetherFaction", 220), + HIDE_WHEN_NOT_IN_CRIMSON("settings.hideWhenNotDoingQuest", 221), ZEALOT_SPAWN_AREAS_ONLY("settings.zealotSpawnAreasOnly", -1), DISCORD_RP_STATE(0), @@ -294,7 +295,8 @@ public enum FeatureCredit { TIMOLOB("TimoLob", "github.com/TimoLob", Feature.BROOD_MOTHER_ALERT), NOPOTHEGAMER("NopoTheGamer", "twitch.tv/nopothegamer", Feature.BAL_BOSS_ALERT), CATFACE("CatFace","github.com/CattoFace",Feature.PLAYER_SYMBOLS_IN_CHAT), - HANNIBAL2("Hannibal2", "github.com/hannibal00212", Feature.CRIMSON_ARMOR_ABILITY_STACKS, Feature.HIDE_TRUE_DEFENSE); + HANNIBAL2("Hannibal2", "github.com/hannibal00212", Feature.CRIMSON_ARMOR_ABILITY_STACKS, Feature.HIDE_TRUE_DEFENSE), + JASON54("jason54jg", "github.com/jason54jg", Feature.INFERNO_SLAYER_TRACKER, Feature.INFERNO_COLOR_BY_RARITY, Feature.INFERNO_TEXT_MODE); private final Set features; private final String author; diff --git a/src/main/java/codes/biscuit/skyblockaddons/utils/Utils.java b/src/main/java/codes/biscuit/skyblockaddons/utils/Utils.java index 6646dc7b65..b8c4d14740 100644 --- a/src/main/java/codes/biscuit/skyblockaddons/utils/Utils.java +++ b/src/main/java/codes/biscuit/skyblockaddons/utils/Utils.java @@ -89,7 +89,7 @@ public class Utils { /** * Matches the active slayer quest type line on the Skyblock scoreboard */ - private static final Pattern SLAYER_TYPE_REGEX = Pattern.compile("(?Tarantula Broodfather|Revenant Horror|Sven Packmaster|Voidgloom Seraph) (?[IV]+)"); + private static final Pattern SLAYER_TYPE_REGEX = Pattern.compile("(?Tarantula Broodfather|Revenant Horror|Sven Packmaster|Voidgloom Seraph|Inferno Demonlord) (?[IV]+)"); /** * Matches the active slayer quest progress line on the Skyblock scoreboard */ diff --git a/src/main/resources/lang/en_US.json b/src/main/resources/lang/en_US.json index b75dfe533e..0859b061c8 100644 --- a/src/main/resources/lang/en_US.json +++ b/src/main/resources/lang/en_US.json @@ -223,7 +223,8 @@ "hideTrueDefense": "Hide True Defense", "showProfileType": "Show Profile Type", "showNetherFaction": "Show Nether Faction", - "zealotSpawnAreasOnly": "Show Only in Zealot Spawn Areas" + "zealotSpawnAreasOnly": "Show Only in Zealot Spawn Areas", + "infernoSlayerTracker": "Slayer Tracker - Inferno/Blaze" }, "messages": { "enchants": "Enchants",