From 830fdb7022ac173b421daeddfbc7e67c0d9f891b Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sat, 21 Oct 2023 11:16:34 +0200 Subject: better repo error handling --- .../features/rift/area/mirrorverse/DanceRoomHelper.kt | 13 ++++++++----- .../features/rift/area/mirrorverse/RiftLavaMazeParkour.kt | 2 +- .../features/rift/area/mirrorverse/RiftUpsideDownParkour.kt | 2 +- .../features/rift/area/mirrorverse/TubulatorParkour.kt | 2 +- .../rift/area/stillgorechateau/RiftBloodEffigies.kt | 9 ++++----- .../features/rift/everywhere/EnigmaSoulWaypoints.kt | 4 ++-- 6 files changed, 17 insertions(+), 15 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/rift') diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt index f7acdfd1d..ec503bcfd 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt @@ -12,7 +12,12 @@ import at.hannibal2.skyhanni.utils.LocationUtils.isPlayerInside import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings import at.hannibal2.skyhanni.utils.StringUtils.firstLetterUppercase import at.hannibal2.skyhanni.utils.jsonobjects.DanceRoomInstructionsJson -import kotlinx.coroutines.* +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.delay +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch import net.minecraft.client.entity.EntityOtherPlayerMP import net.minecraft.util.AxisAlignedBB import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -160,9 +165,7 @@ object DanceRoomHelper { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { - event.getConstant("DanceRoomInstructions")?.let { - instructions = it.instructions - } + instructions = event.getConstant("DanceRoomInstructions").instructions } fun start(interval: Long): Job { @@ -176,4 +179,4 @@ object DanceRoomHelper { } fun isEnabled() = RiftAPI.inRift() && config.enabled -} \ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt index 28ae5b5fa..12bebc3ee 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt @@ -18,7 +18,7 @@ class RiftLavaMazeParkour { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { - val data = event.getConstant("RiftLavaMazeParkour") ?: return + val data = event.getConstant("RiftLavaMazeParkour") parkourHelper = ParkourHelper( data.locations, data.shortCuts, diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt index e8aa8b00f..136c956cf 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt @@ -18,7 +18,7 @@ class RiftUpsideDownParkour { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { - val data = event.getConstant("RiftUpsideDownParkour") ?: return + val data = event.getConstant("RiftUpsideDownParkour") parkourHelper = ParkourHelper( data.locations.map { it.add(-1.0, -1.0, -1.0) },// TODO remove offset. change repo instead data.shortCuts, diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt index 2f3b2bc82..fcd880b3d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt @@ -20,7 +20,7 @@ class TubulatorParkour { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { - val data = event.getConstant("RiftTubulator") ?: return + val data = event.getConstant("RiftTubulator") parkourHelper = ParkourHelper( data.locations, data.shortCuts, diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt index f4fd7415d..b2691210e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt @@ -50,12 +50,11 @@ class RiftBloodEffigies { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { - event.getConstant("RiftEffigies")?.locations?.let { - if (it.size != 6) { - error("Invalid rift effigies size: ${it.size} (expeced 6)") - } - locations = it + val newLocations = event.getConstant("RiftEffigies").locations + if (newLocations.size != 6) { + error("Invalid rift effigies size: ${newLocations.size} (expeced 6)") } + locations = newLocations } @SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt index 292b71539..e58215a68 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt @@ -144,7 +144,7 @@ object EnigmaSoulWaypoints { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { - val data = event.getConstant("EnigmaSouls") ?: return + val data = event.getConstant("EnigmaSouls") val areas = data.areas ?: error("'areas' is null in EnigmaSouls!") soulLocations = buildMap { for ((area, locations) in areas) { @@ -181,4 +181,4 @@ object EnigmaSoulWaypoints { } fun isEnabled() = RiftAPI.inRift() && config.enabled -} \ No newline at end of file +} -- cgit