port: mixins

Author: realRobotix

src/main/java/rbasamoyai/createbigcannons/cannon_control/contraption/MountedBigCannonContraption.java

@@ -84,6 +84,7 @@ public class MountedBigCannonContraption extends AbstractMountedCannonContraptio
 	public boolean assemble(Level level, BlockPos pos) throws AssemblyException {
 		if (!this.collectCannonBlocks(level, pos)) return false;
 		this.bounds = this.createBoundsFromExtensionLengths();
+        startMoving(level);
 		return !this.blocks.isEmpty();
 	}
 

src/main/java/rbasamoyai/createbigcannons/mixin/client/PitchOrientedContraptionEntityMixin.java

@@ -1,12 +1,12 @@
 package rbasamoyai.createbigcannons.mixin.client;
-/* fixme
+import net.minecraft.util.Mth;
 
 import org.spongepowered.asm.mixin.Mixin;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.content.contraptions.OrientedContraptionEntity;
 
-import dev.engine_room.flywheel.util.transform.TransformStack;
+import dev.engine_room.flywheel.lib.transform.TransformStack;
 import net.minecraft.core.Direction;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.Level;
@@ -27,18 +27,17 @@ public void applyLocalTransforms(PoseStack stack, float partialTicks) {
 
 		stack.translate(-0.5f, 0.0f, -0.5f);
 
-		TransformStack tstack = TransformStack.cast(stack)
+		TransformStack tstack = TransformStack.of(stack)
 			.nudge(this.getId())
-			.centre()
-			.rotateY(yaw);
+			.center()
+			.rotateY(yaw + Mth.TWO_PI);
 
 		if (this.getInitialOrientation().getAxis() == Direction.Axis.X) {
 			tstack.rotateZ(pitch);
 		} else {
 			tstack.rotateX(pitch);
 		}
-		tstack.unCentre();
+		tstack.uncenter();
 	}
 
 }
-*/

src/main/java/rbasamoyai/createbigcannons/mixin/compat/create/ChassisBlockEntityMixin.java

@@ -46,7 +46,7 @@ public abstract class ChassisBlockEntityMixin extends SmartBlockEntity {
 	}
 
 	@ModifyExpressionValue(method = "getIncludedBlockPositionsRadial",
-			at = @At(value = "INVOKE", target = "Lcom/simibubi/create/content/contraptions/BlockMovementChecks;isNotSupportive(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Z"))
+			at = @At(value = "INVOKE", target = "Lcom/simibubi/create/api/contraption/BlockMovementChecks;isNotSupportive(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Z"))
 	private boolean createbigcannons$getIncludedBlockPositionsRadial$1(boolean original, Direction forcedMovement, boolean visualize,
 																	   @Local(ordinal = 0) List<BlockPos> positions,
 																	   @Local(ordinal = 1) BlockPos searchPos,
@@ -63,7 +63,7 @@ public abstract class ChassisBlockEntityMixin extends SmartBlockEntity {
 	}
 
 	@ModifyExpressionValue(method = "getIncludedBlockPositionsLinear",
-		at = @At(value = "INVOKE", target = "Lcom/simibubi/create/content/contraptions/BlockMovementChecks;isNotSupportive(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Z"))
+		at = @At(value = "INVOKE", target = "Lcom/simibubi/create/api/contraption/BlockMovementChecks;isNotSupportive(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Z"))
 	private boolean createbigcannons$getIncludedBlockPositionsLinear$1(boolean original, Direction forcedMovement, boolean visualize,
 																	   @Local List<BlockPos> positions,
 																	   @Local BlockPos currentPos,

src/main/java/rbasamoyai/createbigcannons/mixin/compat/create/ContraptionMixin.java

@@ -58,18 +58,16 @@ public abstract class ContraptionMixin {
 
 	@Shadow
 	public boolean disassembled;
-/* fixme
 
 	@Inject(method = "searchMovedStructure",
-		at = @At(value = "INVOKE", target = "Lcom/simibubi/create/content/contraptions/BlockMovementChecks;isBrittle(Lnet/minecraft/world/level/block/state/BlockState;)Z", shift = At.Shift.BEFORE))
+		at = @At(value = "INVOKE", target = "Lcom/simibubi/create/api/contraption/BlockMovementChecks;isBrittle(Lnet/minecraft/world/level/block/state/BlockState;)Z", shift = At.Shift.BEFORE))
 	private void createbigcannons$searchMovedStructure$setForcedDirection(Level level, BlockPos pos, Direction forcedDirection,
 																		  CallbackInfoReturnable<Boolean> cir,
 																		  @Local(argsOnly = true) LocalRef<Direction> forcedDirectionRef) {
 		if (!(CBCModifiedContraptionRegistry.canLoadBigCannon(this.createbigcannons$self))) return;
 		if (forcedDirectionRef.get() == null)
 			forcedDirectionRef.set(((CanLoadBigCannon) this.createbigcannons$self).createbigcannons$getAssemblyMovementDirection(level));
 	}
-*/
 
 	@Inject(method = "searchMovedStructure",
 		at = @At(value = "INVOKE", target = "Ljava/util/Queue;add(Ljava/lang/Object;)Z", shift = At.Shift.AFTER),
@@ -171,7 +169,7 @@ public abstract class ContraptionMixin {
 	}
 
 	@Inject(method = "moveBlock",
-		at = @At(value = "INVOKE", target = "Lcom/simibubi/create/content/contraptions/BlockMovementChecks;isBrittle(Lnet/minecraft/world/level/block/state/BlockState;)Z"))
+		at = @At(value = "INVOKE", target = "Lcom/simibubi/create/api/contraption/BlockMovementChecks;isBrittle(Lnet/minecraft/world/level/block/state/BlockState;)Z"))
 	private void createbigcannons$moveBlock$addFrontier$0(Level level, Direction forcedDirection, Queue<BlockPos> frontier,
 														  Set<BlockPos> visited, CallbackInfoReturnable<Boolean> cir,
 														  @Local(ordinal = 0) BlockPos pos,

src/main/resources/createbigcannons-common.mixins.json

@@ -15,7 +15,8 @@
     "client.LightingMixin",
     "client.RPLClientHandlersMixin",
     "client.SoundEngineMixin",
-    "client.ValueSettingsClientMixin"
+    "client.ValueSettingsClientMixin",
+    "client.PitchOrientedContraptionEntityMixin"
   ],
   "mixins": [
     "ArmorStandMixin",
@@ -29,7 +30,9 @@
     "compat.create.AbstractContraptionEntityMixin",
     "compat.create.AllSoundEventsMixin",
     "compat.create.BeltMovementHandlerMixin",
+    "compat.create.ChassisBlockEntityMixin",
     "compat.create.ContraptionColliderMixin",
+    "compat.create.ContraptionMixin",
     "compat.create.FilterItemMixin",
     "compat.create.GantryContraptionMixin",
     "compat.create.MechanicalBearingBlockEntityMixin",