aboutsummaryrefslogtreecommitdiff
path: root/src/main/kotlin/moe/nea/notenoughupdates/features
diff options
context:
space:
mode:
authornea <nea@nea.moe>2023-05-07 12:22:36 +0200
committernea <nea@nea.moe>2023-05-08 00:17:34 +0200
commit942dd629efbf12183b1c5f5a966c36d4b0647a6b (patch)
tree407e8d2cdcfefa77673c768e5126857a86ddb89a /src/main/kotlin/moe/nea/notenoughupdates/features
parent229f724ef4a0a4cbc426f31e27f9a57e9b1307c9 (diff)
downloadFirmament-942dd629efbf12183b1c5f5a966c36d4b0647a6b.tar.gz
Firmament-942dd629efbf12183b1c5f5a966c36d4b0647a6b.tar.bz2
Firmament-942dd629efbf12183b1c5f5a966c36d4b0647a6b.zip
Add fishing particle highlighter
Currently does not work when sneaking or when the bobber moves too much, since the position desyncs with the server
Diffstat (limited to 'src/main/kotlin/moe/nea/notenoughupdates/features')
-rw-r--r--src/main/kotlin/moe/nea/notenoughupdates/features/FeatureManager.kt2
-rw-r--r--src/main/kotlin/moe/nea/notenoughupdates/features/fishing/FishingWarning.kt117
-rw-r--r--src/main/kotlin/moe/nea/notenoughupdates/features/world/FairySouls.kt2
3 files changed, 120 insertions, 1 deletions
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/features/FeatureManager.kt b/src/main/kotlin/moe/nea/notenoughupdates/features/FeatureManager.kt
index bc9a916..2512992 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/features/FeatureManager.kt
+++ b/src/main/kotlin/moe/nea/notenoughupdates/features/FeatureManager.kt
@@ -3,6 +3,7 @@ package moe.nea.notenoughupdates.features
import kotlinx.serialization.Serializable
import kotlinx.serialization.serializer
import moe.nea.notenoughupdates.NotEnoughUpdates
+import moe.nea.notenoughupdates.features.fishing.FishingWarning
import moe.nea.notenoughupdates.features.world.FairySouls
import moe.nea.notenoughupdates.util.data.DataHolder
@@ -24,6 +25,7 @@ object FeatureManager : DataHolder<FeatureManager.Config>(serializer(), "feature
synchronized(this) {
if (hasAutoloaded) return
loadFeature(FairySouls)
+ loadFeature(FishingWarning)
hasAutoloaded = true
}
}
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/features/fishing/FishingWarning.kt b/src/main/kotlin/moe/nea/notenoughupdates/features/fishing/FishingWarning.kt
new file mode 100644
index 0000000..c44201c
--- /dev/null
+++ b/src/main/kotlin/moe/nea/notenoughupdates/features/fishing/FishingWarning.kt
@@ -0,0 +1,117 @@
+package moe.nea.notenoughupdates.features.fishing
+
+import kotlin.math.abs
+import kotlin.math.absoluteValue
+import kotlin.math.acos
+import kotlin.math.asin
+import kotlin.math.atan2
+import kotlin.math.sqrt
+import kotlin.time.Duration.Companion.seconds
+import net.minecraft.entity.projectile.FishingBobberEntity
+import net.minecraft.particle.ParticleTypes
+import net.minecraft.util.math.Vec3d
+import moe.nea.notenoughupdates.events.ParticleSpawnEvent
+import moe.nea.notenoughupdates.events.WorldReadyEvent
+import moe.nea.notenoughupdates.events.WorldRenderLastEvent
+import moe.nea.notenoughupdates.features.NEUFeature
+import moe.nea.notenoughupdates.util.MC
+import moe.nea.notenoughupdates.util.TimeMark
+import moe.nea.notenoughupdates.util.config.ManagedConfig
+import moe.nea.notenoughupdates.util.render.RenderBlockContext.Companion.renderBlocks
+
+object FishingWarning : NEUFeature {
+ override val name: String
+ get() = "Fishing Warning"
+ override val identifier: String
+ get() = "fishing-warning"
+
+ object TConfig : ManagedConfig("fishing-warning") {
+ // Display a warning when you are about to hook a fish
+ val displayWarning by toggle("display-warning") { false }
+ val highlightWakeChain by toggle("highlight-wake-chain") { false }
+ }
+
+ override val config: ManagedConfig get() = TConfig
+
+
+ data class WakeChain(
+ val delta: Vec3d,
+ val momentum: Vec3d,
+ val lastContinued: TimeMark,
+ )
+
+
+ val chains = mutableListOf<WakeChain>()
+
+ private fun areAnglesClose(a: Double, b: Double, tolerance: Double): Boolean {
+ var dist = (a - b).absoluteValue
+ if (180 < dist) dist = 360 - dist;
+ return dist <= tolerance
+ }
+
+ private fun calculateAngleFromOffsets(xOffset: Double, zOffset: Double): Double {
+ // See also: Vanilla 1.8.9 Fishing particle code.
+ var angleX = Math.toDegrees(acos(xOffset / 0.04))
+ var angleZ = Math.toDegrees(asin(zOffset / 0.04))
+ if (xOffset < 0) {
+ // Old: angleZ = 180 - angleZ;
+ angleZ = 180 - angleZ
+ }
+ if (zOffset < 0) {
+ angleX = 360 - angleX
+ }
+ angleX %= 360.0
+ angleZ %= 360.0
+ if (angleX < 0) angleX += 360.0
+ if (angleZ < 0) angleZ += 360.0
+ var dist = angleX - angleZ
+ if (dist < -180) dist += 360.0
+ if (dist > 180) dist -= 360.0
+ return angleZ + dist / 2
+ }
+
+ private fun toDegrees(d: Double) = d * 180 / Math.PI
+
+ fun isHookPossible(hook: FishingBobberEntity, particlePos: Vec3d, angle1: Double, angle2: Double): Boolean {
+ val dx = particlePos.x - hook.pos.x
+ val dz = particlePos.z - hook.pos.z
+ val dist = sqrt(dx * dx + dz * dz)
+
+ if (dist < 0.2) return true
+ val tolerance = toDegrees(atan2(0.03125, dist)) * 1.5
+ var angleToHook = toDegrees(atan2(dx, dz)) % 360
+ if (angleToHook < 0) angleToHook += 360
+ return areAnglesClose(angle1, angleToHook, tolerance) || areAnglesClose(angle2, angleToHook, tolerance)
+ }
+
+ val recentParticles = mutableListOf<Pair<Vec3d, TimeMark>>()
+
+ private fun onParticleSpawn(event: ParticleSpawnEvent) {
+ if (event.particleEffect.type != ParticleTypes.FISHING) return
+ if (!(abs(event.offset.y - 0.01f) < 0.001f)) return
+ val hook = MC.player?.fishHook ?: return
+ val actualOffset = event.offset
+ val candidate1 = calculateAngleFromOffsets(actualOffset.x, -actualOffset.z)
+ val candidate2 = calculateAngleFromOffsets(-actualOffset.x, actualOffset.z)
+
+ if (isHookPossible(hook, event.position, candidate1, candidate2)) {
+ recentParticles.add(Pair(event.position, TimeMark.now()))
+ }
+ }
+
+ override fun onLoad() {
+ ParticleSpawnEvent.subscribe(::onParticleSpawn)
+ WorldReadyEvent.subscribe {
+ recentParticles.clear()
+ }
+ WorldRenderLastEvent.subscribe {
+ recentParticles.removeIf { it.second.passedTime() > 5.seconds }
+ renderBlocks(it.matrices, it.camera) {
+ color(0f, 0f, 1f, 1f)
+ recentParticles.forEach {
+ tinyBlock(it.first, 0.1F)
+ }
+ }
+ }
+ }
+}
diff --git a/src/main/kotlin/moe/nea/notenoughupdates/features/world/FairySouls.kt b/src/main/kotlin/moe/nea/notenoughupdates/features/world/FairySouls.kt
index 2a5219a..ae045c0 100644
--- a/src/main/kotlin/moe/nea/notenoughupdates/features/world/FairySouls.kt
+++ b/src/main/kotlin/moe/nea/notenoughupdates/features/world/FairySouls.kt
@@ -31,7 +31,7 @@ object FairySouls : NEUFeature {
object DConfig : ProfileSpecificDataHolder<Data>(serializer(), "found-fairysouls", ::Data)
- object TConfig : ManagedConfig("fairysouls") {
+ object TConfig : ManagedConfig("fairy-souls") {
val displaySouls by toggle("show") { false }
val resetSouls by button("reset") {