Fix Rotation in Overlay Render, Multiblock Render Preview and Multiblock Patterns (GregTechCEu#1619)

Author: YoungOnionMC

src/main/java/com/gregtechceu/gtceu/api/pattern/BlockPattern.java

@@ -611,9 +611,9 @@ private BlockPos setActualRelativeOffset(int x, int y, int z, Direction facing,
                 }
             }
             if (upwardsFacing == Direction.WEST || upwardsFacing == Direction.EAST) {
-                int xOffset = upwardsFacing == Direction.WEST ? facing.getClockWise().getStepX() :
+                int xOffset = upwardsFacing == Direction.EAST ? facing.getClockWise().getStepX() :
                         facing.getClockWise().getOpposite().getStepX();
-                int zOffset = upwardsFacing == Direction.WEST ? facing.getClockWise().getStepZ() :
+                int zOffset = upwardsFacing == Direction.EAST ? facing.getClockWise().getStepZ() :
                         facing.getClockWise().getOpposite().getStepZ();
                 int tmp;
                 if (xOffset == 0) {

src/main/java/com/gregtechceu/gtceu/client/model/WorkableOverlayModel.java

@@ -150,10 +150,13 @@ public List<BakedQuad> bakeQuads(@Nullable Direction side, Direction frontFacing
             if (upwardsFacing.getAxis() == Direction.Axis.Z) {
                 matrix.rotate(Mth.PI, 0, 0, upwardsFacing.getStepZ());
             }
+            if (frontFacing.getAxisDirection() == Direction.AxisDirection.NEGATIVE) {
+                matrix.rotate(Mth.PI, 0, 0, 1);
+            }
         }
 
         Quaternionf rot = new Quaternionf().rotationAxis(degree, 0, 0,
-                frontFacing.getAxisDirection() == Direction.AxisDirection.POSITIVE ? 1 : -1);
+                frontFacing.getAxisDirection() == Direction.AxisDirection.NEGATIVE ? 1 : -1);
 
         if (frontFacing.getAxisDirection() == Direction.AxisDirection.POSITIVE &&
                 frontFacing.getAxis() != Direction.Axis.Y) {

src/main/java/com/gregtechceu/gtceu/client/renderer/MultiblockInWorldPreviewRenderer.java

@@ -165,8 +165,8 @@ public static void showPreview(BlockPos pos, MultiblockControllerMachine control
                     offset = switch (front) {
                         case NORTH, UP, DOWN -> offset.rotate(Rotation.NONE);
                         case SOUTH -> offset.rotate(Rotation.CLOCKWISE_180);
-                        case WEST -> offset.rotate(Rotation.COUNTERCLOCKWISE_90);
-                        case EAST -> offset.rotate(Rotation.CLOCKWISE_90);
+                        case EAST -> offset.rotate(Rotation.COUNTERCLOCKWISE_90);
+                        case WEST -> offset.rotate(Rotation.CLOCKWISE_90);
                     };
 
                     Rotation r = up == Direction.NORTH ? Rotation.NONE : up == Direction.EAST ? Rotation.CLOCKWISE_90 :
@@ -217,32 +217,36 @@ public static void showPreview(BlockPos pos, MultiblockControllerMachine control
     private static BlockPos rotateByFrontAxis(BlockPos pos, Direction front, Rotation rotation) {
         if (front.getAxis() == Direction.Axis.X) {
             return switch (rotation) {
-                default -> pos;
-                case CLOCKWISE_90 -> new BlockPos(pos.getX(), -front.getAxisDirection().getStep() * pos.getZ(),
-                        -front.getAxisDirection().getStep() * -pos.getY());
-                case CLOCKWISE_180 -> new BlockPos(pos.getX(), -pos.getY(), -pos.getZ());
-                case COUNTERCLOCKWISE_90 -> new BlockPos(pos.getX(), front.getAxisDirection().getStep() * pos.getZ(),
-                        -front.getAxisDirection().getStep() * pos.getY());
+                default -> new BlockPos(-pos.getX(), pos.getY(), -pos.getZ());
+                case CLOCKWISE_90 -> new BlockPos(-pos.getX(), -front.getAxisDirection().getStep() * pos.getZ(),
+                        front.getAxisDirection().getStep() * -pos.getY());
+                case CLOCKWISE_180 -> new BlockPos(-pos.getX(), -pos.getY(), pos.getZ());
+                case COUNTERCLOCKWISE_90 -> new BlockPos(-pos.getX(), front.getAxisDirection().getStep() * pos.getZ(),
+                        front.getAxisDirection().getStep() * pos.getY());
             };
         } else if (front.getAxis() == Direction.Axis.Y) {
             return switch (rotation) {
-                default -> new BlockPos(-pos.getX(), -front.getAxisDirection().getStep() * pos.getZ(),
-                        -front.getAxisDirection().getStep() * pos.getY());
-                case CLOCKWISE_90 -> new BlockPos(-front.getAxisDirection().getStep() * pos.getY(),
-                        -front.getAxisDirection().getStep() * pos.getZ(), pos.getX());
-                case CLOCKWISE_180 -> new BlockPos(pos.getX(), -front.getAxisDirection().getStep() * pos.getZ(),
-                        front.getAxisDirection().getStep() * pos.getY());
-                case COUNTERCLOCKWISE_90 -> new BlockPos(front.getAxisDirection().getStep() * pos.getY(),
-                        -front.getAxisDirection().getStep() * pos.getZ(), -pos.getX());
+                default -> new BlockPos(-front.getAxisDirection().getStep() * pos.getX(),
+                        -front.getAxisDirection().getStep() * pos.getZ(),
+                        -pos.getY());
+                case CLOCKWISE_90 -> new BlockPos(pos.getY(),
+                        -front.getAxisDirection().getStep() * pos.getZ(),
+                        -front.getAxisDirection().getStep() * pos.getX());
+                case CLOCKWISE_180 -> new BlockPos(front.getAxisDirection().getStep() * pos.getX(),
+                        -front.getAxisDirection().getStep() * pos.getZ(),
+                        pos.getY());
+                case COUNTERCLOCKWISE_90 -> new BlockPos(-pos.getY(),
+                        -front.getAxisDirection().getStep() * pos.getZ(),
+                        front.getAxisDirection().getStep() * pos.getX());
             };
         } else if (front.getAxis() == Direction.Axis.Z) {
             return switch (rotation) {
                 default -> pos;
-                case CLOCKWISE_90 -> new BlockPos(-front.getAxisDirection().getStep() * pos.getY(),
-                        front.getAxisDirection().getStep() * pos.getX(), pos.getZ());
-                case CLOCKWISE_180 -> new BlockPos(-pos.getX(), -pos.getY(), pos.getZ());
-                case COUNTERCLOCKWISE_90 -> new BlockPos(-front.getAxisDirection().getStep() * -pos.getY(),
+                case CLOCKWISE_90 -> new BlockPos(front.getAxisDirection().getStep() * pos.getY(),
                         -front.getAxisDirection().getStep() * pos.getX(), pos.getZ());
+                case CLOCKWISE_180 -> new BlockPos(-pos.getX(), -pos.getY(), pos.getZ());
+                case COUNTERCLOCKWISE_90 -> new BlockPos(front.getAxisDirection().getStep() * -pos.getY(),
+                        front.getAxisDirection().getStep() * pos.getX(), pos.getZ());
             };
         }
         return pos;