fixed create valuebox rendering on ships (#637)

ValkyrienSkies · Nov 30, 2023 · c2e8c77 · c2e8c77
1 parent b370b41
commit c2e8c77
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 51 deletions.
diff --git a/...on/src/main/java/org/valkyrienskies/mod/mixin/mod_compat/create/client/MixinValueBox.java b/...on/src/main/java/org/valkyrienskies/mod/mixin/mod_compat/create/client/MixinValueBox.java
@@ -0,0 +1,38 @@
+package org.valkyrienskies.mod.mixin.mod_compat.create.client;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox;
+import net.minecraft.client.Minecraft;
+import net.minecraft.core.BlockPos;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.valkyrienskies.core.api.ships.ClientShip;
+import org.valkyrienskies.mod.common.VSClientGameUtils;
+
+@Mixin(ValueBox.class)
+public class MixinValueBox {
+
+    @Shadow
+    protected BlockPos pos;
+
+    @WrapOperation(
+        method = "render",
+        at = @At(
+            value = "INVOKE",
+            target = "Lcom/mojang/blaze3d/vertex/PoseStack;translate(DDD)V",
+            ordinal = 0
+        )
+    )
+    public void wrapOpTranslate(final PoseStack instance, final double x, final double y, final double z, final Operation<Void> operation) {
+        final ClientShip ship = VSClientGameUtils.getClientShip(x, y, z);
+        if (ship != null) {
+            final var camera = Minecraft.getInstance().gameRenderer.getMainCamera().getPosition();
+            VSClientGameUtils.transformRenderWithShip(ship.getRenderTransform(), instance, pos.getX(),pos.getY(),pos.getZ(), camera.x, camera.y, camera.z );
+        } else {
+            operation.call(instance, x, y, z);
+        }
+    }
+}
diff --git a/common/src/main/kotlin/org/valkyrienskies/mod/common/VSClientGameUtils.kt b/common/src/main/kotlin/org/valkyrienskies/mod/common/VSClientGameUtils.kt
@@ -33,6 +33,11 @@ object VSClientGameUtils {
         }
     }
 
+    @JvmStatic
+    fun getClientShip(offsetX: Double, offsetY: Double, offsetZ: Double): ClientShip? {
+        return Minecraft.getInstance().level?.getShipObjectManagingPos(offsetX, offsetY, offsetZ)
+    }
+
     /**
      * Modify the last transform of [poseStack] to be the following:
      *

diff --git a/common/src/main/resources/valkyrienskies-common.mixins.json b/common/src/main/resources/valkyrienskies-common.mixins.json
@@ -75,6 +75,7 @@
     "mod_compat.create.blockentity.MixinCrushingWheelControllerTileEntity",
     "mod_compat.create.blockentity.MixinEjectorTileEntity",
     "mod_compat.create.blockentity.MixinEncasedFanTileEntity",
+    "mod_compat.create.client.MixinValueBox",
     "mod_compat.create.entity.MixinAbstractContraptionEntity",
     "mod_compat.create.entity.MixinCarriageContraptionEntity",
     "mod_compat.create.entity.MixinControlledContraptionEntity",

diff --git a/...src/main/java/org/valkyrienskies/mod/fabric/mixin/compat/create/client/MixinValueBox.java b/...src/main/java/org/valkyrienskies/mod/fabric/mixin/compat/create/client/MixinValueBox.java
diff --git a/fabric/src/main/resources/valkyrienskies-fabric.mixins.json b/fabric/src/main/resources/valkyrienskies-fabric.mixins.json
@@ -21,8 +21,7 @@
     "compat.create.client.MixinContraptionRenderInfo",
     "compat.create.client.MixinCullingBlockEntityIterator",
     "compat.create.client.MixinFlwContraption",
-    "compat.create.client.MixinSuperGlueSelectionHandler",
-    "compat.create.client.MixinValueBox"
+    "compat.create.client.MixinSuperGlueSelectionHandler"
   ],
   "injectors": {
     "defaultRequire": 1

diff --git a/.../src/main/java/org/valkyrienskies/mod/forge/mixin/compat/create/client/MixinValueBox.java b/.../src/main/java/org/valkyrienskies/mod/forge/mixin/compat/create/client/MixinValueBox.java
diff --git a/forge/src/main/resources/valkyrienskies-forge.mixins.json b/forge/src/main/resources/valkyrienskies-forge.mixins.json
@@ -23,7 +23,6 @@
     "compat.create.client.MixinContraptionRenderInfo",
     "compat.create.client.MixinFlwContraption",
     "compat.create.client.MixinSuperGlueSelectionHandler",
-    "compat.create.client.MixinValueBox",
     "compat.sodium.MixinRenderSectionManager",
     "compat.tis3d.MixinCasingTileEntityRender",
     "compat.tis3d.MixinRenderContextImpl"