diff --git a/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java b/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java index 87609a632..55402a469 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java +++ b/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java @@ -380,21 +380,52 @@ public class BlockShapes { ); public static final BlockShape PLATE_PRESS_IDLE = new BlockShape( - new SimpleCuboid(0d, 0d, 0d, 1d, 0.5d, 1d), - new SimpleCuboid(0d, 0.5d, 0.4375d, 1d, 0.75d, 1d), - new SimpleCuboid(0.75d, 0.5d, 0.0625d, 1d, 0.75d, 0.4375d), - new SimpleCuboid(0.125d, 0.5d, 0.25d, 0.6875d, 1d, 0.8125d), - new SimpleCuboid(0.8125d, 0.5d, 0d, 0.9375d, 0.75d, 0.0625d), - new SimpleCuboid(0.9375d, 0.75d, 0.9375d, 1d, 0.875d, 1d), - new SimpleCuboid(0d, 0.75d, 0.9375d, 0.0625d, 0.875d, 1d), - new SimpleCuboid(0.01875d, 0.8125d, 0.0625d, 0.05d, 0.875d, 0.9375d), - new SimpleCuboid(0d, 0.5d, 0d, 0.0625d, 0.875d, 0.0625d), - new SimpleCuboid(0.0625d, 0.8125d, 0.95d, 0.9375d, 0.875d, 0.98125d), - new SimpleCuboid(0.6875d, 0.5d, 0.5625d, 0.75d, 0.875d, 0.75d), - new SimpleCuboid(0.6875d, 0.5d, 0.3125d, 0.75d, 0.875d, 0.5d), - new SimpleCuboid(0.0625d, 0.5d, 0.3125d, 0.125d, 0.875d, 0.5d), - new SimpleCuboid(0.0625d, 0.5d, 0.5625d, 0.125d, 0.875d, 0.75d), - new SimpleCuboid(0.775d, 0.75d, 0.125d, 0.9625d, 0.9375d, 0.875d) + new SimpleCuboid(0.625d, 0d, 0d, 1d, 0.375d, 1d), + new SimpleCuboid(0.625d, 0.625d, 0d, 1d, 1d, 1d), + new SimpleCuboid(0.625d, 0.375d, 0.125d, 1d, 0.625d, 1d), + new SimpleCuboid(0.6875d, 0.375d, 0.0625d, 0.9375d, 0.625d, 0.125d), + new SimpleCuboid(0.0625d, 0.5d, 0.1875d, 0.5625d, 0.9375d, 0.9375d), + new SimpleCuboid(0.0625d, 0d, 0d, 0.5625d, 0.4375d, 1d), + new SimpleCuboid(0.5625d, 0d, 0.0625d, 0.625d, 1d, 0.1875d), + new SimpleCuboid(0.5625d, 0d, 0.8125d, 0.625d, 1d, 0.9375d), + new SimpleCuboid(0d, 0d, 0.0625d, 0.0625d, 1d, 0.1875d), + new SimpleCuboid(0d, 0d, 0.8125d, 0.0625d, 1d, 0.9375d), + new SimpleCuboid(0.5625d, 0.8125d, 0.1875d, 0.625d, 0.9375d, 0.8125d), + new SimpleCuboid(0.5625d, 0.0625d, 0.1875d, 0.625d, 0.1875d, 0.8125d), + new SimpleCuboid(0d, 0.8125d, 0.1875d, 0.0625d, 0.9375d, 0.8125d), + new SimpleCuboid(0d, 0.0625d, 0.1875d, 0.0625d, 0.1875d, 0.8125d), + new SimpleCuboid(0.125d, 0.5625d, -0.0625d, 0.5d, 0.5625d, 0.0625d), + new SimpleCuboid(0.0625d, 0.5d, 0.0625d, 0.5625d, 0.5625d, 0.1875d), + new SimpleCuboid(0.0625d, 0.875d, 0.0625d, 0.5625d, 0.9375d, 0.1875d), + new SimpleCuboid(0.5d, 0.5625d, 0.0625d, 0.5625d, 0.875d, 0.1875d), + new SimpleCuboid(0.0625d, 0.5625d, 0.0625d, 0.125d, 0.875d, 0.1875d) + ); + + public static final BlockShape TWIN_PLATE_PRESS_IDLE = new BlockShape( + new SimpleCuboid(0.625d, 0d, 0d, 1d, 0.375d, 1d), + new SimpleCuboid(0.625d, 0.625d, 0d, 1d, 1d, 1d), + new SimpleCuboid(0.625d, 0.375d, 0.125d, 1d, 0.625d, 1d), + new SimpleCuboid(0.6875d, 0.375d, 0.0625d, 0.9375d, 0.625d, 0.125d), + new SimpleCuboid(0.0625d, 0.5d, 0.1875d, 0.5625d, 0.9375d, 0.9375d), + new SimpleCuboid(0.5625d, 0d, 0.0625d, 0.625d, 1d, 0.1875d), + new SimpleCuboid(0.5625d, 0d, 0.8125d, 0.625d, 1d, 0.9375d), + new SimpleCuboid(0d, 0d, 0.0625d, 0.0625d, 1d, 0.1875d), + new SimpleCuboid(0d, 0d, 0.8125d, 0.0625d, 1d, 0.9375d), + new SimpleCuboid(0.5625d, 0.8125d, 0.1875d, 0.625d, 0.9375d, 0.8125d), + new SimpleCuboid(0.5625d, 0.0625d, 0.1875d, 0.625d, 0.1875d, 0.8125d), + new SimpleCuboid(0d, 0.8125d, 0.1875d, 0.0625d, 0.9375d, 0.8125d), + new SimpleCuboid(0d, 0.0625d, 0.1875d, 0.0625d, 0.1875d, 0.8125d), + new SimpleCuboid(0.125d, 0.5625d, -0.0625d, 0.5d, 0.5625d, 0.0625d), + new SimpleCuboid(0.0625d, 0.5d, 0.0625d, 0.5625d, 0.5625d, 0.1875d), + new SimpleCuboid(0.0625d, 0.875d, 0.0625d, 0.5625d, 0.9375d, 0.1875d), + new SimpleCuboid(0.5d, 0.5625d, 0.0625d, 0.5625d, 0.875d, 0.1875d), + new SimpleCuboid(0.0625d, 0.5625d, 0.0625d, 0.125d, 0.875d, 0.1875d), + new SimpleCuboid(0.0625d, 0d, 0.1875d, 0.5625d, 0.4375d, 0.9375d), + new SimpleCuboid(0.5d, 0.0625d, 0.0625d, 0.5625d, 0.375d, 0.1875d), + new SimpleCuboid(0.0625d, 0.375d, 0.0625d, 0.5625d, 0.4375d, 0.1875d), + new SimpleCuboid(0.0625d, 0.0625d, 0.0625d, 0.125d, 0.375d, 0.1875d), + new SimpleCuboid(0.0625d, 0d, 0.0625d, 0.5625d, 0.0625d, 0.1875d), + new SimpleCuboid(0.125d, 0.0625d, -0.0625d, 0.5d, 0.0625d, 0.0625d) ); public static final BlockShape GRAVITATION_STABILIZER = new BlockShape( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PlatePressBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PlatePressBlock.kt index 2a9b889ec..01810fb82 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PlatePressBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PlatePressBlock.kt @@ -57,7 +57,7 @@ class PlatePressBlock(properties: Properties = DEFAULT_PROPERTIES, val isTwin: B MatteryWorkerBlockEntity.appendHoverText(p_49816_, p_49817_, p_49818_, p_49819_) } - private val shapes = getShapeForEachState(rotationProperty) { BlockShapes.PLATE_PRESS_IDLE.rotateFromNorth(it[rotationProperty]).computeShape() } + private val shapes = getShapeForEachState(rotationProperty) { (if (isTwin) BlockShapes.TWIN_PLATE_PRESS_IDLE else BlockShapes.PLATE_PRESS_IDLE).rotateFromNorth(it[rotationProperty]).computeShape() } @Suppress("override_deprecation") override fun getShape(