Skip to content

Commit b7b6b14

Browse files
committed
chore: do some TODOs
1 parent ba12bd2 commit b7b6b14

File tree

6 files changed

+4
-25
lines changed

6 files changed

+4
-25
lines changed

src/main/kotlin/com/github/itsempa/nautilus/Nautilus.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ object Nautilus {
5858
PositionLinkManager.init(feature)
5959
}
6060

61-
// TODO: figure out why this errors on startup
6261
NautilusRepoManager.initRepo()
6362

6463
NautilusPreInitFinishedEvent.post()

src/main/kotlin/com/github/itsempa/nautilus/events/FishingEventUpdate.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.github.itsempa.nautilus.events
33
import at.hannibal2.skyhanni.api.event.GenericSkyHanniEvent
44
import com.github.itsempa.nautilus.data.fishingevents.FishingEvent
55

6-
// TODO: confirm that the generic works properly
76
sealed class FishingEventUpdate<T : FishingEvent>(val event: T) : GenericSkyHanniEvent<T>(event.javaClass) {
87
class Start<T : FishingEvent>(event: T) : FishingEventUpdate<T>(event)
98
class End<T : FishingEvent>(event: T) : FishingEventUpdate<T>(event)

src/main/kotlin/com/github/itsempa/nautilus/features/misc/update/UpdateManager.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ package com.github.itsempa.nautilus.features.misc.update
22

33
import at.hannibal2.skyhanni.api.event.HandleEvent
44
import at.hannibal2.skyhanni.config.commands.CommandCategory
5-
import at.hannibal2.skyhanni.events.minecraft.SkyHanniTickEvent
65
import at.hannibal2.skyhanni.utils.ApiUtils
76
import at.hannibal2.skyhanni.utils.DelayedRun
87
import com.github.itsempa.nautilus.Nautilus
98
import com.github.itsempa.nautilus.events.BrigadierRegisterEvent
109
import com.github.itsempa.nautilus.utils.NautilusChat
11-
import com.github.itsempa.nautilus.utils.helpers.McClient
10+
import com.github.itsempa.nautilus.utils.helpers.McPlayer
1211
import me.owdding.ktmodules.Module
1312
import moe.nea.libautoupdate.GithubReleaseUpdateSource
1413
import moe.nea.libautoupdate.PotentialUpdate
@@ -56,10 +55,10 @@ object UpdateManager {
5655

5756
// TODO: change this
5857
@HandleEvent
59-
fun onTick(event: SkyHanniTickEvent) {
58+
fun onTick() {
6059
if (checked) return
6160
if (!config.notifyUpdates) return
62-
McClient.self.thePlayer ?: return
61+
if (!McPlayer.exists) return
6362
checked = true
6463
checkUpdate()
6564
}

src/main/kotlin/com/github/itsempa/nautilus/mixins/transformers/MixinEntityFishHook.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,4 @@ public boolean fixBobberLava(World instance, AxisAlignedBB aabb, Material materi
2323
return LavaBobberHook.fixBobberLava(instance, aabb);
2424
}
2525

26-
// TODO: figure out if its possible to use mixin extras
27-
/*
28-
@WrapOperation(
29-
method = "onUpdate",
30-
at = @At(
31-
value = "INVOKE",
32-
target = "Lnet/minecraft/world/World;isAABBInMaterial(Lnet/minecraft/util/AxisAlignedBB;Lnet/minecraft/block/material/Material;)Z"
33-
)
34-
)
35-
36-
public boolean fixBobberLava(World instance, AxisAlignedBB aabb, Material material, Operation<Boolean> original) {
37-
if (!LavaBobberHook.isEnabled()) return original.call(instance, aabb, material);
38-
return LavaBobberHook.fixBobberLava(instance, aabb);
39-
}*/
40-
4126
}

src/main/kotlin/com/github/itsempa/nautilus/utils/NautilusChat.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ object NautilusChat {
155155
private fun getUniqueMessageIdForString(string: String): Int =
156156
uniqueMessageIdStorage.getOrPut(string, ::getUniqueMessageId)
157157

158-
// TODO: find a reason to use number?
159-
private var lastUniqueMessageId = 223242
158+
private var lastUniqueMessageId = 680545
160159

161160
fun getUniqueMessageId() = lastUniqueMessageId++
162161

src/main/kotlin/com/github/itsempa/nautilus/utils/NautilusUtilsFun.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.github.itsempa.nautilus.utils
22

3-
// TODO: get a better file name
4-
53
@Suppress("NOTHING_TO_INLINE")
64
inline fun <T : Comparable<T>> min(a: T, b: T): T = if (a < b) a else b
75

0 commit comments

Comments
 (0)