extended multi rotation

.github/workflows/build-on-push.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Build
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: build
+          arguments: assemble
 
       - name: Upload Artifact
         uses: actions/[email protected]

settings.gradle

@@ -44,7 +44,7 @@ dependencyResolutionManagement {
         def vineFlowerVersion = "1.+"
         def macheteVersion = "1.+"
         def configurationVersion = "2.2.0"
-        def ldLibVersion = "1.0.25.j"
+        def ldLibVersion = "1.0.25.l"
         def mixinextrasVersion = "0.2.0"
         def shimmerVersion = "0.2.2"
 

src/main/java/com/gregtechceu/gtceu/api/block/IMachineBlock.java

@@ -8,6 +8,7 @@
 import com.lowdragmc.lowdraglib.client.renderer.IBlockRendererProvider;
 
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
@@ -16,6 +17,7 @@
 import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.DirectionProperty;
 
 import org.jetbrains.annotations.Nullable;
 
@@ -26,6 +28,8 @@
  */
 public interface IMachineBlock extends IBlockRendererProvider, EntityBlock {
 
+    DirectionProperty UPWARDS_FACING_PROPERTY = DirectionProperty.create("upwards_facing", Direction.Plane.HORIZONTAL);
+
     default Block self() {
         return (Block) this;
     }

src/main/java/com/gregtechceu/gtceu/api/block/MetaMachineBlock.java

@@ -8,6 +8,7 @@
 import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
 import com.gregtechceu.gtceu.api.machine.MachineDefinition;
 import com.gregtechceu.gtceu.api.machine.MetaMachine;
+import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition;
 import com.gregtechceu.gtceu.api.machine.feature.*;
 import com.gregtechceu.gtceu.common.data.GTItems;
 import com.gregtechceu.gtceu.utils.GTUtil;
@@ -60,6 +61,7 @@
  * @date 2023/2/17
  * @implNote GTBlock
  */
+@SuppressWarnings("deprecation")
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
 public class MetaMachineBlock extends AppearanceBlock implements IMachineBlock {
@@ -74,7 +76,12 @@ public MetaMachineBlock(Properties properties, MachineDefinition definition) {
         this.definition = definition;
         this.rotationState = RotationState.get();
         if (rotationState != RotationState.NONE) {
-            registerDefaultState(defaultBlockState().setValue(rotationState.property, rotationState.defaultDirection));
+            BlockState defaultState = this.defaultBlockState().setValue(rotationState.property,
+                    rotationState.defaultDirection);
+            if (definition instanceof MultiblockMachineDefinition multi && multi.isAllowExtendedFacing()) {
+                defaultState = defaultState.setValue(IMachineBlock.UPWARDS_FACING_PROPERTY, Direction.NORTH);
+            }
+            registerDefaultState(defaultState);
         }
     }
 
@@ -84,6 +91,10 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
         RotationState rotationState = RotationState.get();
         if (rotationState != RotationState.NONE) {
             pBuilder.add(rotationState.property);
+            if (MachineDefinition.getBuilt() instanceof MultiblockMachineDefinition multi &&
+                    multi.isAllowExtendedFacing()) {
+                pBuilder.add(IMachineBlock.UPWARDS_FACING_PROPERTY);
+            }
         }
     }
 
@@ -113,11 +124,6 @@ public void animateTick(BlockState state, Level level, BlockPos pos, RandomSourc
         }
     }
 
-    @Override
-    public boolean isCollisionShapeFullBlock(BlockState state, BlockGetter level, BlockPos pos) {
-        return false;
-    }
-
     @Override
     public void setPlacedBy(Level pLevel, BlockPos pPos, BlockState pState, @Nullable LivingEntity player,
                             ItemStack pStack) {
@@ -150,21 +156,29 @@ public BlockState getStateForPlacement(BlockPlaceContext context) {
         var blockPos = context.getClickedPos();
         var state = defaultBlockState();
         if (player != null && rotationState != RotationState.NONE) {
+            if (rotationState == RotationState.Y_AXIS) {
+                state = state.setValue(rotationState.property, Direction.UP);
+            } else {
+                state = state.setValue(rotationState.property, player.getDirection().getOpposite());
+            }
             Vec3 pos = player.position();
             if (Math.abs(pos.x - (double) ((float) blockPos.getX() + 0.5F)) < 2.0D &&
                     Math.abs(pos.z - (double) ((float) blockPos.getZ() + 0.5F)) < 2.0D) {
                 double d0 = pos.y + (double) player.getEyeHeight();
                 if (d0 - (double) blockPos.getY() > 2.0D && rotationState.test(Direction.UP)) {
-                    return state.setValue(rotationState.property, Direction.UP);
+                    state = state.setValue(rotationState.property, Direction.UP);
                 }
                 if ((double) blockPos.getY() - d0 > 0.0D && rotationState.test(Direction.DOWN)) {
-                    return state.setValue(rotationState.property, Direction.DOWN);
+                    state = state.setValue(rotationState.property, Direction.DOWN);
                 }
             }
-            if (rotationState == RotationState.Y_AXIS) {
-                return state.setValue(rotationState.property, Direction.UP);
-            } else {
-                return state.setValue(rotationState.property, player.getDirection().getOpposite());
+            if (getDefinition() instanceof MultiblockMachineDefinition multi && multi.isAllowExtendedFacing()) {
+                Direction frontFacing = state.getValue(rotationState.property);
+                if (frontFacing == Direction.UP) {
+                    state = state.setValue(IMachineBlock.UPWARDS_FACING_PROPERTY, player.getDirection());
+                } else if (frontFacing == Direction.DOWN) {
+                    state = state.setValue(IMachineBlock.UPWARDS_FACING_PROPERTY, player.getDirection().getOpposite());
+                }
             }
         }
         return state;

src/main/java/com/gregtechceu/gtceu/api/machine/MachineDefinition.java

@@ -179,4 +179,18 @@ public boolean equals(Object o) {
     public int hashCode() {
         return id.hashCode();
     }
+
+    static final ThreadLocal<MachineDefinition> STATE = new ThreadLocal<>();
+
+    public static MachineDefinition getBuilt() {
+        return STATE.get();
+    }
+
+    public static void setBuilt(MachineDefinition state) {
+        STATE.set(state);
+    }
+
+    public static void clearBuilt() {
+        STATE.remove();
+    }
 }

src/main/java/com/gregtechceu/gtceu/api/machine/MultiblockMachineDefinition.java

@@ -38,6 +38,14 @@ public class MultiblockMachineDefinition extends MachineDefinition {
     @Setter
     @Getter
     private Supplier<List<MultiblockShapeInfo>> shapes;
+    /** Whether this multi can be rotated or face upwards. */
+    @Getter
+    @Setter
+    private boolean allowExtendedFacing;
+    /** Set this to false only if your multiblock is set up such that it could have a wall-shared controller. */
+    @Getter
+    @Setter
+    private boolean allowFlip;
     @Setter
     @Getter
     @Nullable

src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMultiController.java

@@ -41,7 +41,7 @@ default MultiblockControllerMachine self() {
      * <br>
      * you should always use {@link IMultiController#checkPatternWithLock()} and
      * {@link IMultiController#checkPatternWithTryLock()} instead.
-     * 
+     *
      * @return whether it can be formed.
      */
     default boolean checkPattern() {
@@ -62,7 +62,7 @@ default boolean checkPatternWithLock() {
 
     /**
      * Check pattern with a try lock
-     * 
+     *
      * @return false - checking failed or cant get the lock.
      */
     default boolean checkPatternWithTryLock() {
@@ -101,7 +101,7 @@ default BlockPattern getPattern() {
     /**
      * Called in an async thread. It's unsafe, Don't modify anything of world but checking information.
      * It will be called per 5 tick.
-     * 
+     *
      * @param periodID period Tick
      */
     void asyncCheckPattern(long periodID);
@@ -175,7 +175,7 @@ default InteractionResult onUse(BlockState state, Level world, BlockPos pos, Pla
                                     BlockHitResult hit) {
         if (!self().isFormed() && player.isShiftKeyDown() && player.getItemInHand(hand).isEmpty()) {
             if (world.isClientSide()) {
-                MultiblockInWorldPreviewRenderer.showPreview(pos, self().getFrontFacing(),
+                MultiblockInWorldPreviewRenderer.showPreview(pos, self().getFrontFacing(), self().getUpwardsFacing(),
                         self().getDefinition().getMatchingShapes().get(0),
                         ConfigHolder.INSTANCE.client.inWorldPreviewDuration * 20);
             }

src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/MultiblockControllerMachine.java

@@ -1,12 +1,16 @@
 package com.gregtechceu.gtceu.api.machine.multiblock;
 
+import com.gregtechceu.gtceu.GTCEu;
+import com.gregtechceu.gtceu.api.block.IMachineBlock;
+import com.gregtechceu.gtceu.api.block.MetaMachineBlock;
 import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
 import com.gregtechceu.gtceu.api.machine.MetaMachine;
 import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition;
 import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController;
 import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiPart;
 import com.gregtechceu.gtceu.api.pattern.MultiblockState;
 import com.gregtechceu.gtceu.api.pattern.MultiblockWorldSavedData;
+import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection;
 
 import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced;
 import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted;
@@ -18,9 +22,14 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.BlockHitResult;
 
 import lombok.Getter;
+import lombok.Setter;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -54,6 +63,11 @@ public class MultiblockControllerMachine extends MetaMachine implements IMultiCo
     @DescSynced
     @RequireRerender
     protected boolean isFormed;
+    @Getter
+    @Setter
+    @Persisted
+    @DescSynced
+    protected boolean isFlipped;
 
     public MultiblockControllerMachine(IMachineBlockEntity holder) {
         super(holder);
@@ -204,4 +218,78 @@ public void onRotated(Direction oldFacing, Direction newFacing) {
             mwsd.addAsyncLogic(this);
         }
     }
+
+    public boolean allowExtendedFacing() {
+        return getDefinition().isAllowExtendedFacing();
+    }
+
+    public boolean allowFlip() {
+        return getDefinition().isAllowFlip();
+    }
+
+    @Override
+    public boolean isFacingValid(Direction facing) {
+        return allowExtendedFacing() || super.isFacingValid(facing);
+    }
+
+    public Direction getUpwardsFacing() {
+        return this.allowExtendedFacing() ? this.getBlockState().getValue(IMachineBlock.UPWARDS_FACING_PROPERTY) :
+                Direction.NORTH;
+    }
+
+    public void setUpwardsFacing(@NotNull Direction upwardsFacing) {
+        if (!getDefinition().isAllowExtendedFacing()) return;
+        if (upwardsFacing == null || upwardsFacing == Direction.UP || upwardsFacing == Direction.DOWN) {
+            GTCEu.LOGGER.error("Tried to set upwards facing to invalid facing {}! Skipping", upwardsFacing);
+            return;
+        }
+        BlockState blockState = getBlockState();
+        if (blockState.getBlock() instanceof MetaMachineBlock metaMachineBlock &&
+                blockState.getValue(IMachineBlock.UPWARDS_FACING_PROPERTY) != upwardsFacing) {
+            getLevel().setBlockAndUpdate(getPos(),
+                    blockState.setValue(IMachineBlock.UPWARDS_FACING_PROPERTY, upwardsFacing));
+            if (getLevel() != null && !getLevel().isClientSide) {
+                notifyBlockUpdate();
+                markDirty();
+                checkPattern();
+            }
+        }
+    }
+
+    @Override
+    protected InteractionResult onWrenchClick(Player playerIn, InteractionHand hand, Direction gridSide,
+                                              BlockHitResult hitResult) {
+        if (gridSide == getFrontFacing() && allowExtendedFacing()) {
+            setUpwardsFacing(playerIn.isShiftKeyDown() ? getUpwardsFacing().getCounterClockWise() :
+                    getUpwardsFacing().getClockWise());
+            return InteractionResult.CONSUME;
+        }
+        if (playerIn.isShiftKeyDown()) {
+            if (gridSide == getFrontFacing() || !isFacingValid(gridSide)) {
+                return InteractionResult.FAIL;
+            }
+            if (!isRemote()) {
+                setFrontFacing(gridSide);
+            }
+            return InteractionResult.CONSUME;
+        }
+        return super.onWrenchClick(playerIn, hand, gridSide, hitResult);
+    }
+
+    @Override
+    public void setFrontFacing(Direction facing) {
+        Direction oldFacing = getFrontFacing();
+
+        if (allowExtendedFacing()) {
+            Direction newUpwardsFacing = RelativeDirection.simulateAxisRotation(facing, oldFacing, getUpwardsFacing());
+            setUpwardsFacing(newUpwardsFacing);
+        }
+        super.setFrontFacing(facing);
+
+        if (getLevel() != null && !getLevel().isClientSide) {
+            notifyBlockUpdate();
+            markDirty();
+            checkPattern();
+        }
+    }
 }