aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authornea <nea@nea.moe>2023-07-30 20:00:38 +0200
committernea <nea@nea.moe>2023-07-30 20:00:38 +0200
commitdbc56fb352134839800fad2a9d71dce6ab67349a (patch)
tree7e10d144bfbe1a064045d9b27b9f92746c1a3297 /src
parentb9a22305dce467764b55b81cd0ae4e8fa6f6990d (diff)
downloadFirmament-dbc56fb352134839800fad2a9d71dce6ab67349a.tar.gz
Firmament-dbc56fb352134839800fad2a9d71dce6ab67349a.tar.bz2
Firmament-dbc56fb352134839800fad2a9d71dce6ab67349a.zip
Add more fishing debug stats. (waiting on admins lol)
Diffstat (limited to 'src')
-rw-r--r--src/main/java/moe/nea/firmament/mixins/MixinClientPacketHandler.java6
-rw-r--r--src/main/kotlin/moe/nea/firmament/features/debug/DebugView.kt28
-rw-r--r--src/main/kotlin/moe/nea/firmament/features/fishing/FishingWarning.kt92
3 files changed, 97 insertions, 29 deletions
diff --git a/src/main/java/moe/nea/firmament/mixins/MixinClientPacketHandler.java b/src/main/java/moe/nea/firmament/mixins/MixinClientPacketHandler.java
index 9d8463e..1c527ab 100644
--- a/src/main/java/moe/nea/firmament/mixins/MixinClientPacketHandler.java
+++ b/src/main/java/moe/nea/firmament/mixins/MixinClientPacketHandler.java
@@ -22,6 +22,7 @@ import moe.nea.firmament.events.OutgoingPacketEvent;
import moe.nea.firmament.events.ParticleSpawnEvent;
import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.network.packet.Packet;
+import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket;
import net.minecraft.network.packet.s2c.play.ParticleS2CPacket;
import net.minecraft.util.math.Vec3d;
import org.spongepowered.asm.mixin.Mixin;
@@ -41,6 +42,11 @@ public class MixinClientPacketHandler {
));
}
+ @Inject(method = "onEntityPosition", at = @At(value = "TAIL"))
+ public void onEntityPosition(EntityPositionS2CPacket packet, CallbackInfo ci) {
+ System.out.printf("Got position update for %d", packet.getId());
+ }
+
@Inject(method = "sendPacket(Lnet/minecraft/network/packet/Packet;)V", at = @At("HEAD"), cancellable = true)
public void onSendPacket(Packet<?> packet, CallbackInfo ci) {
if (OutgoingPacketEvent.Companion.publish(new OutgoingPacketEvent(packet)).getCancelled()) {
diff --git a/src/main/kotlin/moe/nea/firmament/features/debug/DebugView.kt b/src/main/kotlin/moe/nea/firmament/features/debug/DebugView.kt
index e8c85d8..96ea7aa 100644
--- a/src/main/kotlin/moe/nea/firmament/features/debug/DebugView.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/debug/DebugView.kt
@@ -2,8 +2,11 @@ package moe.nea.firmament.features.debug
import io.github.cottonmc.cotton.gui.client.CottonHud
import io.github.cottonmc.cotton.gui.widget.WBox
+import io.github.cottonmc.cotton.gui.widget.WDynamicLabel
+import io.github.cottonmc.cotton.gui.widget.WLabel
import io.github.cottonmc.cotton.gui.widget.data.Axis
import java.util.Optional
+import java.util.stream.Collectors
import kotlin.time.Duration.Companion.seconds
import net.minecraft.scoreboard.Scoreboard
import net.minecraft.scoreboard.Team
@@ -23,7 +26,7 @@ object DebugView : FirmamentFeature {
val timer: TimeMark,
)
- private val storedVariables: MutableMap<String, StoredVariable<*>> = mutableMapOf()
+ private val storedVariables: MutableMap<String, StoredVariable<*>> = sortedMapOf()
override val identifier: String
get() = "debug-view"
override val defaultEnabled: Boolean
@@ -35,18 +38,29 @@ object DebugView : FirmamentFeature {
}
}
+ fun recalculateDebugWidget() {
+ storedVariables.entries.removeIf { it.value.timer.passedTime() > 1.seconds }
+ debugWidget.streamChildren().collect(Collectors.toList()).forEach {
+ debugWidget.remove(it)
+ }
+ storedVariables.entries.forEach {
+ debugWidget.add(WDynamicLabel({ "${it.key}: ${it.value.obj}" }))
+ }
+ debugWidget.layout()
+ if (storedVariables.isNotEmpty()) {
+ CottonHud.add(debugWidget, 20, 20)
+ } else {
+ CottonHud.remove(debugWidget)
+ }
+ }
+
val debugWidget = WBox(Axis.VERTICAL)
override fun onLoad() {
TickEvent.subscribe {
synchronized(this) {
- storedVariables.entries.removeIf { it.value.timer.passedTime() > 1.seconds }
- if (storedVariables.isEmpty()) {
- CottonHud.add(debugWidget, 20, 20)
- } else {
- CottonHud.remove(debugWidget)
- }
+ recalculateDebugWidget()
}
}
}
diff --git a/src/main/kotlin/moe/nea/firmament/features/fishing/FishingWarning.kt b/src/main/kotlin/moe/nea/firmament/features/fishing/FishingWarning.kt
index 4c20450..e133d97 100644
--- a/src/main/kotlin/moe/nea/firmament/features/fishing/FishingWarning.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/fishing/FishingWarning.kt
@@ -20,18 +20,22 @@ package moe.nea.firmament.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.cos
+import kotlin.math.min
+import kotlin.math.sin
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.MathHelper
import net.minecraft.util.math.Vec3d
+import moe.nea.firmament.Firmament
import moe.nea.firmament.events.ParticleSpawnEvent
import moe.nea.firmament.events.WorldReadyEvent
import moe.nea.firmament.events.WorldRenderLastEvent
import moe.nea.firmament.features.FirmamentFeature
+import moe.nea.firmament.features.debug.DebugView
import moe.nea.firmament.gui.config.ManagedConfig
import moe.nea.firmament.util.MC
import moe.nea.firmament.util.TimeMark
@@ -67,8 +71,8 @@ object FishingWarning : FirmamentFeature {
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))
+ var angleX = Math.toDegrees(Math.acos(xOffset / 0.04))
+ var angleZ = Math.toDegrees(Math.asin(zOffset / 0.04))
if (xOffset < 0) {
// Old: angleZ = 180 - angleZ;
angleZ = 180 - angleZ
@@ -83,21 +87,24 @@ object FishingWarning : FirmamentFeature {
var dist = angleX - angleZ
if (dist < -180) dist += 360.0
if (dist > 180) dist -= 360.0
- return angleZ + dist / 2
+ return Math.toDegrees(Math.atan2(xOffset, zOffset))
+ return angleZ + dist / 2 + 180
}
- private fun toDegrees(d: Double) = d * 180 / Math.PI
- private fun toRadians(d: Double) = d / 180 * Math.PI
+ val π = Math.PI
+ val τ = Math.PI * 2
+
+ private fun toDegrees(d: Double) = Math.toDegrees(d).mod(360.0)
+ private fun toRadians(d: Double) = Math.toRadians(d).mod(τ)
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 dx = particlePos.x - hook.trackedPosition.withDelta(0, 0, 0).x
+ val dz = particlePos.z - hook.trackedPosition.withDelta(0, 0, 0).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
+ val angleToHook = toDegrees(atan2(dz, dx))
return areAnglesClose(angle1, angleToHook, tolerance) || areAnglesClose(angle2, angleToHook, tolerance)
}
@@ -118,9 +125,9 @@ object FishingWarning : FirmamentFeature {
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)
- recentCandidates.add(Candidate(candidate1, candidate2, hook.pos, event.position))
+ val candidate1 = calculateAngleFromOffsets(-actualOffset.x, (-actualOffset.z))
+ val candidate2 = calculateAngleFromOffsets(actualOffset.x, actualOffset.z)
+ recentCandidates.add(Candidate(candidate1, candidate2, hook.trackedPosition.withDelta(0, 0, 0), event.position))
if (isHookPossible(hook, event.position, candidate1, candidate2)) {
recentParticles.add(Pair(event.position, TimeMark.now()))
@@ -141,14 +148,55 @@ object FishingWarning : FirmamentFeature {
tinyBlock(it.first, 0.1F)
}
- recentCandidates.forEach {
- println(it)
- color(1f, 1f, 0f, 1f)
- line(it.hookOrigin, it.position)
- color(1f, 0f, 0f, 1f)
- line(it.position, Vec3d.fromPolar(0F, it.angle1.toFloat()).add(it.position))
- color(0f, 1f, 0f, 1f)
- line(it.position, Vec3d.fromPolar(0F, it.angle2.toFloat()).add(it.position))
+ if (Firmament.DEBUG) {
+ recentCandidates.forEach {
+ color(1f, 1f, 0f, 1f)
+ line(it.hookOrigin, it.position)
+ color(1f, 0f, 0f, 1f)
+ fun P(yaw: Double) = Vec3d(cos(yaw), 0.0, sin(yaw))
+ line(
+ it.position,
+ P(π - toRadians(it.angle1)).multiply(5.0).add(it.position)
+ )
+ color(0f, 1f, 0f, 1f)
+ line(
+ it.position,
+ P(π - toRadians(it.angle2)).multiply(5.0).add(it.position)
+ )
+ val tolerance = (atan2(0.03125, it.position.distanceTo(it.hookOrigin))).absoluteValue * 1.5
+ val diff = it.hookOrigin.subtract(it.position)
+ val rd = atan2(diff.z, diff.x).mod(τ)
+ color(0.8f, 0f, 0.8f, 1f)
+ DebugView.showVariable("tolerance", tolerance)
+ DebugView.showVariable("angle1Rad", toRadians(180 - it.angle1))
+ DebugView.showVariable("angle1Diff", (toRadians(it.angle1) - rd).mod(τ))
+ DebugView.showVariable("angle1Deg", it.angle1.mod(360.0))
+ DebugView.showVariable("angle2Rad", toRadians(180 - it.angle2))
+ DebugView.showVariable("angle2Deg", it.angle2.mod(360.0))
+ DebugView.showVariable("angle2Diff", (toRadians(it.angle2) - rd).mod(τ))
+ DebugView.showVariable("rd", rd)
+ DebugView.showVariable("minT", (rd + tolerance).mod(τ))
+ DebugView.showVariable("maxT", (rd - tolerance).mod(τ))
+ DebugView.showVariable(
+ "passes",
+ if (min(
+ (rd - toRadians(180 - it.angle2)).mod(τ),
+ (rd - toRadians(180 - it.angle1)).mod(τ)
+ ) < tolerance
+ ) {
+ "§aPasses"
+ } else {
+ "§cNo Pass"
+ }
+ )
+
+ line(it.position, P(rd + tolerance).add(it.position))
+ line(it.position, P(rd - tolerance).add(it.position))
+ }
+ color(0.8F, 0.8F, 0.8f, 1f)
+ val fishHook = MC.player?.fishHook
+ if (fishHook != null)
+ tinyBlock(fishHook.trackedPosition.withDelta(0, 0, 0), 0.2f)
}
}
}