diff options
| author | Fazfoxy <78978526+Fazfoxy@users.noreply.github.com> | 2024-08-09 07:45:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-09 08:45:15 +0200 |
| commit | 30397bb0ac74a11c90f5dccf803361bbd49bea59 (patch) | |
| tree | 92054b4db596da3863909e2e2dbb28b050077a55 | |
| parent | ed31de3b9ee04860cad66f22cc99bee8dcb41f16 (diff) | |
| download | skyhanni-30397bb0ac74a11c90f5dccf803361bbd49bea59.tar.gz skyhanni-30397bb0ac74a11c90f5dccf803361bbd49bea59.tar.bz2 skyhanni-30397bb0ac74a11c90f5dccf803361bbd49bea59.zip | |
Fix: Some Dungeon Features to support changed Master Mode text changes in Artist's Adobe update (#2316)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt | 8 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt | 16 |
2 files changed, 20 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt index 3b9f023d2..eca75bc70 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt @@ -23,9 +23,15 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent object DungeonCleanEnd { private val config get() = SkyHanniMod.feature.dungeon.cleanEnd + + /** + * REGEX-TEST: §f §r§cMaster Mode The Catacombs §r§8- §r§eFloor III + * REGEX-TEST: §f §r§cThe Catacombs §r§8- §r§eFloor VI + * REGEX-TEST: §f §r§cMaster Mode Catacombs §r§8- §r§eFloor II + */ private val catacombsPattern by RepoPattern.pattern( "dungeon.end.chests.spawned", - "(?:§f)?( *)§r§c(The|Master Mode) Catacombs §r§8- §r§eFloor (.*)" + "(?:§f)?( *)§r§c(Master Mode )?The Catacombs §r§8- §r§eFloor (.*)", ) private var bossDone = false diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt index c7a8675fc..93efa204f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt @@ -57,9 +57,14 @@ object DungeonFinderFeatures { "note", "§7§7Note: §f(?<note>.*)" ) + + /** + * REGEX-TEST: The Catacombs + * REGEX-TEST: Master Mode The Catacombs + */ private val floorTypePattern by patternGroup.pattern( "floor.type", - "(The Catacombs).*|.*(MM Catacombs).*" + "(The Catacombs).*|.*(Master Mode The Catacombs).*", ) private val checkIfPartyPattern by patternGroup.pattern( "check.if.party", @@ -87,11 +92,16 @@ object DungeonFinderFeatures { ) private val anyFloorPattern by patternGroup.pattern( "floor.any", - "(Any)" + "(Any)", ) + + /** + * REGEX-TEST: Master Mode The Catacombs + * REGEX-TEST: The Catacombs + */ private val masterModeFloorPattern by patternGroup.pattern( "floor.mastermode", - "(MM )|(.*Master Mode Catacombs)" + "(MM )|(.*Master Mode The Catacombs)" ) private val dungeonFloorPattern by patternGroup.pattern( "floor.dungeon", |