diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/integration/vivecraft/CobblemonVRClient.kt b/common/src/main/kotlin/com/cobblemon/mod/common/integration/vivecraft/CobblemonVRClient.kt index 3c3f43b605..c2ba7e0ab8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/integration/vivecraft/CobblemonVRClient.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/integration/vivecraft/CobblemonVRClient.kt @@ -1,6 +1,7 @@ package com.cobblemon.mod.common.integration.vivecraft import net.minecraft.client.Minecraft +import org.vivecraft.api.VRAPI import org.vivecraft.api.client.VRClientAPI import org.vivecraft.client_vr.ClientDataHolderVR @@ -9,13 +10,11 @@ class CobblemonVRClient { PokeballSwingTracker(Minecraft.getInstance(), VRClient) fun init() { - VRClient.addClientRegistrationHandler { client -> - client.registerTrackers(pokeballSwingTracker) - - } + VRAPI.instance().register(pokeballSwingTracker) } companion object { val VRClient: VRClientAPI = VRClientAPI.instance() + val VR: VRAPI = VRAPI.instance() } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/integration/vivecraft/PokeballSwingTracker.kt b/common/src/main/kotlin/com/cobblemon/mod/common/integration/vivecraft/PokeballSwingTracker.kt index 38a15ee72b..acf559ec96 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/integration/vivecraft/PokeballSwingTracker.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/integration/vivecraft/PokeballSwingTracker.kt @@ -5,42 +5,17 @@ import com.cobblemon.mod.common.CobblemonNetwork import com.cobblemon.mod.common.api.tags.CobblemonItemTags import com.cobblemon.mod.common.net.messages.server.SendOutPokeballPacket import net.minecraft.client.Minecraft -import net.minecraft.client.player.LocalPlayer import net.minecraft.world.item.ItemStack -import org.vivecraft.api.client.Tracker import org.vivecraft.api.client.VRClientAPI import org.vivecraft.api.client.tracker.swing.SwingContext -import org.vivecraft.api.client.tracker.swing.SwingTracker import org.vivecraft.api.data.VRBodyPart -import org.vivecraft.client_vr.gameplay.trackers.DebugRenderTracker import net.minecraft.world.phys.Vec3 -import org.vivecraft.api.client.tracker.swing.SwingSource +import org.vivecraft.api.client.tracker.swing.SwingListener class PokeballSwingTracker( private val minecraft: Minecraft, private val clientData: VRClientAPI -) : SwingTracker, DebugRenderTracker { - - private var swingSource: SwingSource? = null - - override fun processType(): Tracker.ProcessType = Tracker.ProcessType.PER_TICK - - override fun isActive(localPlayer: LocalPlayer?): Boolean = true - - override fun activeProcess(localPlayer: LocalPlayer?) { - val source = clientData.getTrackerSource(SwingSource::class.java) - if (this.swingSource === source) return - this.swingSource?.removeListener(this) - this.swingSource = source - this.swingSource?.addListener(this) - } - - override fun inactiveProcess(player: LocalPlayer?) { - this.swingSource?.removeListener(this) - this.swingSource = null - } - - override fun renderDebug() {} +) : SwingListener { private fun changeForVelocity(bodyPart: VRBodyPart, ticks: Int = 10): Vec3? { val history = clientData.historicalVRPoses ?: return null diff --git a/common/temp/vivecraft-1.21.1-1.3.4.jar b/common/temp/vivecraft-1.21.1-1.3.4.jar index cbbd2110a2..ddd9917c9a 100644 Binary files a/common/temp/vivecraft-1.21.1-1.3.4.jar and b/common/temp/vivecraft-1.21.1-1.3.4.jar differ diff --git a/fabric/temp/vivecraft-1.21.1-1.3.4-fabric.jar b/fabric/temp/vivecraft-1.21.1-1.3.4-fabric.jar index 012431c4ec..63e9f080af 100644 Binary files a/fabric/temp/vivecraft-1.21.1-1.3.4-fabric.jar and b/fabric/temp/vivecraft-1.21.1-1.3.4-fabric.jar differ diff --git a/neoforge/temp/vivecraft-1.21.1-1.3.4-neoforge.jar b/neoforge/temp/vivecraft-1.21.1-1.3.4-neoforge.jar index 23c57e4cc9..918a4b2f35 100644 Binary files a/neoforge/temp/vivecraft-1.21.1-1.3.4-neoforge.jar and b/neoforge/temp/vivecraft-1.21.1-1.3.4-neoforge.jar differ