Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed create valuebox rendering, on 1.18 #662

Merged
merged 1 commit into from
Dec 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
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);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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:
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,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",
Expand Down

This file was deleted.

3 changes: 1 addition & 2 deletions fabric/src/main/resources/valkyrienskies-fabric.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,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
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion forge/src/main/resources/valkyrienskies-forge.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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"
Expand Down
Loading