preparing for release

Author: FinchyMcFinch

gradle.properties

@@ -22,10 +22,10 @@ mod_id=pipeorgans
 mod_name=Create: Sound of Steam
 mod_license=All Rights Reserved
 # The mod version. See https://semver.org/
-mod_version=0.6.2+1.20.1
+mod_version=0.7+1.20.1
 
 mod_group_id=com.finchy.pipeorgans
-mod_authors=FinchyMcFinch, nacho
+mod_authors=FinchyMcFinch
 mod_description=Adds pipe organs to Create.
 
 create_version = 6.0.4-79

src/main/java/com/finchy/pipeorgans/content/midi/keyboardRelay/KeyboardRelayBlock.java

@@ -2,6 +2,7 @@
 
 import com.finchy.pipeorgans.content.midi.stopMaster.StopMasterBlockItem;
 import com.finchy.pipeorgans.init.AllBlockEntities;
+import com.finchy.pipeorgans.init.AllShapes;
 import com.simibubi.create.content.equipment.wrench.IWrenchable;
 import com.simibubi.create.foundation.block.IBE;
 import net.minecraft.core.BlockPos;
@@ -10,6 +11,7 @@
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.context.BlockPlaceContext;
+import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntityType;
@@ -19,6 +21,8 @@
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.phys.shapes.VoxelShape;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
@@ -31,6 +35,15 @@ public class KeyboardRelayBlock extends Block implements IBE<KeyboardRelayBlockE
 
     public KeyboardRelayBlock(Properties pProperties) {
         super(pProperties);
+        registerDefaultState(defaultBlockState()
+                .setValue(FACING, Direction.NORTH)
+                .setValue(POWERED, false)
+        );
+    }
+
+    @Override
+    public VoxelShape getShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, CollisionContext pContext) {
+        return AllShapes.KBR.get(pState.getValue(FACING));
     }
 
     // define blockstate params

src/main/java/com/finchy/pipeorgans/content/midi/keyboardRelay/KeyboardRelayBlockEntity.java

@@ -10,7 +10,6 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
-import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
@@ -138,7 +137,6 @@ public void tryStopUsing(Player player) {
 
     private void startUsing(Player player) {
         user = player.getUUID();
-        player.sendSystemMessage(Component.literal("START"));
         player.getPersistentData().putIntArray("UsingKBRelayPos", new int[]{worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()});
 
         level.setBlock(worldPosition, getBlockState().setValue(BlockStateProperties.POWERED, false), 3); //  turn power off
@@ -150,7 +148,6 @@ private void stopUsing(Player player) {
         user = null;
         if (player != null) {
             player.getPersistentData().remove("UsingKBRelayPos");
-            player.sendSystemMessage(Component.literal("STOP"));
         }
         level.setBlock(worldPosition, getBlockState().setValue(BlockStateProperties.POWERED, false), 3); //  turn power off
         deactivatedThisTick = true;

src/main/java/com/finchy/pipeorgans/init/AllShapes.java

@@ -4,16 +4,10 @@
 import net.createmod.catnip.math.VoxelShaper;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.phys.shapes.BooleanOp;
-import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class AllShapes {
 
-    public static VoxelShape add(VoxelShape a, VoxelShape b) {
-        return Shapes.join(a, b, BooleanOp.OR);
-    }
-
     public static VoxelShape getGenericPipeShape(GenericWhistleProperties.WhistleSize size) {
         return switch (size) {
             case TINY -> GENERIC_TINY_BASE;
@@ -23,7 +17,6 @@ public static VoxelShape getGenericPipeShape(GenericWhistleProperties.WhistleSiz
             case HUGE -> GENERIC_HUGE_BASE;
         };
     }
-
     public static VoxelShape getGenericExtensionShape(GenericWhistleProperties.QuadrupleExtensionShape shape, GenericWhistleProperties.WhistleSize size) {
         return switch (shape) {
             case SINGLE -> switch (size) {
@@ -66,7 +59,6 @@ public static VoxelShape getSlimPipeShape(GenericWhistleProperties.WhistleSize s
             case HUGE -> SLIM_HUGE_BASE;
         };
     }
-
     public static VoxelShape getSlimExtensionShape(GenericWhistleProperties.QuadrupleExtensionShape shape, GenericWhistleProperties.WhistleSize size) {
         return switch (shape) {
             case SINGLE -> switch (size) {
@@ -176,16 +168,23 @@ public static VoxelShape getCompleteWhistleShape(GenericWhistleProperties.Whistl
         GENERIC_EXTENSION_HUGE_TRIPLE = shape(1, 0, 1, 15, 12, 15).build(),
         GENERIC_EXTENSION_HUGE_QUADRUPLE = shape(1, 0, 1, 15, 16, 15).build();
 
+    // OTHER VOXELSHAPERS
+    public static VoxelShaper
 
-    public static VoxelShaper BASE = shape(1, 0, 1, 15, 3, 15)
-            .add(5, 3, 5, 11, 11, 11)
-            .forDirectional(Direction.UP);
+        BASE = shape(1, 0, 1, 15, 3, 15)
+                .add(5, 3, 5, 11, 11, 11)
+                .forDirectional(Direction.UP),
 
-    // shape for floor variant is BASE.get(UP)
-    public static VoxelShaper BASE_BLOCK_WALL = shape(1, 1, 0, 15, 15, 3)
-            .add(5, 3, 3, 11, 9, 11)
+        // shape for floor variant is BASE.get(UP)
+        BASE_BLOCK_WALL = shape(1, 1, 0, 15, 15, 3)
+                .add(5, 3, 3, 11, 9, 11)
             .add(5, 9, 5, 11, 11, 11)
-            .forDirectional(Direction.NORTH);
+                .forHorizontal(Direction.NORTH),
+
+        KBR = shape(0, 0, 4, 16, 2, 16)
+                .add(0, 2, 6, 16, 16, 16)
+                .forHorizontal(Direction.NORTH);
+
 
 
     private static com.simibubi.create.AllShapes.Builder shape(VoxelShape shape) {

src/main/resources/assets/pipeorgans/textures/block/keyboard_relay/kbr.png

@@ -0,0 +1,30 @@
+ {
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "pattern": [
+    "TR",
+    "IP",
+    " C"
+  ],
+  "key": {
+    "T": {
+      "item": "create:transmitter"
+    },
+    "C": {
+      "item": "create:brass_casing"
+    },
+    "R": {
+      "item": "minecraft:redstone"
+    },
+    "I": {
+      "tag": "forge:ingots/iron"
+    },
+    "P": {
+      "item": "create:precision_mechanism"
+    }
+  },
+  "result": {
+    "item": "pipeorgans:keyboard_relay",
+    "count": 1
+  }
+}

src/main/resources/data/pipeorgans/recipes/crafting/keyboard_relay.json

@@ -0,0 +1,26 @@
+ {
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "pattern": [
+    "TRT",
+    "ICI"
+  ],
+  "key": {
+    "T": {
+      "item": "create:transmitter"
+    },
+    "C": {
+      "item": "create:brass_casing"
+    },
+    "R": {
+      "item": "minecraft:redstone"
+    },
+    "I": {
+      "tag": "forge:ingots/iron"
+    }
+  },
+  "result": {
+    "item": "pipeorgans:stop_master",
+    "count": 1
+  }
+}