Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes Valkyrien Skies 2 incompatibility with `use_optimized_entity_tr…
…acking`
- Loading branch information
Showing
5 changed files
with
125 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
src/main/java/com/ishland/vmp/common/playerwatching/compat/EntityPositionTransformer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package com.ishland.vmp.common.playerwatching.compat; | ||
|
|
||
| import net.minecraft.entity.Entity; | ||
| import net.minecraft.util.math.ChunkPos; | ||
| import net.minecraft.util.math.Vec3d; | ||
|
|
||
| public abstract class EntityPositionTransformer { | ||
|
|
||
| protected abstract Vec3d transform0(Entity entity, Vec3d pos); | ||
|
|
||
| public final Vec3d transform(Entity entity, Vec3d pos) { | ||
| final Vec3d pos1; | ||
| try { | ||
| pos1 = transform0(entity, pos); | ||
| } catch (Throwable t) { | ||
| System.err.println("EntityPositionTransformer %s threw an exception for %s at %s".formatted(getClass().getName(), entity, pos)); | ||
| t.printStackTrace(); | ||
| return pos; | ||
| } | ||
| if (pos1 == null) { | ||
| System.err.println("EntityPositionTransformer %s returned null for %s at %s".formatted(getClass().getName(), entity, pos)); | ||
| return pos; | ||
| } | ||
| return pos1; | ||
| } | ||
|
|
||
| } |
47 changes: 47 additions & 0 deletions
47
.../com/ishland/vmp/common/playerwatching/compat/ValkyrienSkies2ShipPositionTransformer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package com.ishland.vmp.common.playerwatching.compat; | ||
|
|
||
| import net.minecraft.entity.Entity; | ||
| import net.minecraft.util.math.ChunkPos; | ||
| import net.minecraft.util.math.ChunkSectionPos; | ||
| import net.minecraft.util.math.Vec3d; | ||
| import net.minecraft.world.World; | ||
| import org.joml.Matrix4dc; | ||
| import org.joml.Vector3d; | ||
|
|
||
| import java.lang.invoke.MethodHandle; | ||
| import java.lang.invoke.MethodHandles; | ||
| import java.lang.invoke.MethodType; | ||
|
|
||
| public class ValkyrienSkies2ShipPositionTransformer extends EntityPositionTransformer { | ||
|
|
||
| private static final MethodHandle methodVSGameUtilsKt$getShipManagingPos; | ||
| private static final MethodHandle methodShip$getShipToWorld; | ||
|
|
||
| static { | ||
| try { | ||
| final Class<?> clazzVSGameUtilsKt = Class.forName("org.valkyrienskies.mod.common.VSGameUtilsKt"); | ||
| final Class<?> clazzShip = Class.forName("org.valkyrienskies.core.api.ships.Ship"); | ||
| methodVSGameUtilsKt$getShipManagingPos = MethodHandles.lookup().findStatic(clazzVSGameUtilsKt, | ||
| "getShipManagingPos", MethodType.methodType(clazzShip, World.class, int.class, int.class)); | ||
| methodShip$getShipToWorld = MethodHandles.lookup().findVirtual(clazzShip, | ||
| "getShipToWorld", MethodType.methodType(Matrix4dc.class)); | ||
| } catch (Throwable t) { | ||
| throw new RuntimeException(t); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public Vec3d transform0(Entity entity, Vec3d pos) { | ||
| try { | ||
| final Object ship = methodVSGameUtilsKt$getShipManagingPos.invoke(entity.world, ChunkSectionPos.getSectionCoord(pos.x), ChunkSectionPos.getSectionCoord(pos.z)); | ||
| if (ship != null) { | ||
| final Matrix4dc shipToWorld = (Matrix4dc) methodShip$getShipToWorld.invoke(ship); | ||
| final Vector3d transformedPosition = shipToWorld.transformPosition(new Vector3d(pos.x, pos.y, pos.z)); | ||
| return new Vec3d(transformedPosition.x, transformedPosition.y, transformedPosition.z); | ||
| } | ||
| } catch (Throwable t) { | ||
| throw new RuntimeException(t); | ||
| } | ||
| return pos; | ||
| } | ||
| } |