From 400a72d9f981da04cac395900ab9049f3c4409c2 Mon Sep 17 00:00:00 2001 From: crispytwig <48872606+crispytwig@users.noreply.github.com> Date: Tue, 21 May 2024 18:24:07 -0500 Subject: [PATCH] [~] Patch port from Fabric --- gradle.properties | 2 +- .../bbb/block/FrameBlock.java | 7 +++++- .../bbb/registry/BBBBlocks.java | 22 +++++++++---------- .../tags/blocks/movable_empty_collider.json | 6 +++++ 4 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/data/create/tags/blocks/movable_empty_collider.json diff --git a/gradle.properties b/gradle.properties index 07936c3..b56d6ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ mappings_channel=official mappings_version=1.20.1 minecraft_version = 1.20.1 -mod_version = 1.0.0 +mod_version = 1.0.1 forge_version = 47.1.0 forgegradle_version = 5.1.+ diff --git a/src/main/java/com/starfish_studios/bbb/block/FrameBlock.java b/src/main/java/com/starfish_studios/bbb/block/FrameBlock.java index 045760a..0aaf7a5 100644 --- a/src/main/java/com/starfish_studios/bbb/block/FrameBlock.java +++ b/src/main/java/com/starfish_studios/bbb/block/FrameBlock.java @@ -209,7 +209,12 @@ public BlockState getConnections(BlockState state, LevelAccessor level, BlockPos } public boolean validConnection(BlockState state) { - if (state.isSolid()) { + if (state.isFaceSturdy(null, null, Direction.UP) || + state.isFaceSturdy(null, null, Direction.DOWN) || + state.isFaceSturdy(null, null, Direction.NORTH) || + state.isFaceSturdy(null, null, Direction.EAST) || + state.isFaceSturdy(null, null, Direction.SOUTH) || + state.isFaceSturdy(null, null, Direction.WEST)) { return true; } return state.is(BBBTags.BBBBlockTags.FRAMES); diff --git a/src/main/java/com/starfish_studios/bbb/registry/BBBBlocks.java b/src/main/java/com/starfish_studios/bbb/registry/BBBBlocks.java index d7b2b6c..5d50772 100644 --- a/src/main/java/com/starfish_studios/bbb/registry/BBBBlocks.java +++ b/src/main/java/com/starfish_studios/bbb/registry/BBBBlocks.java @@ -257,17 +257,17 @@ public class BBBBlocks { // endregion // region FRAMES - public static final RegistryObject OAK_FRAME = BLOCKS.register("oak_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.OAK_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK))); - public static final RegistryObject SPRUCE_FRAME = BLOCKS.register("spruce_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.SPRUCE_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK))); - public static final RegistryObject BIRCH_FRAME = BLOCKS.register("birch_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.BIRCH_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK))); - public static final RegistryObject JUNGLE_FRAME = BLOCKS.register("jungle_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.JUNGLE_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK))); - public static final RegistryObject ACACIA_FRAME = BLOCKS.register("acacia_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.ACACIA_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK))); - public static final RegistryObject DARK_OAK_FRAME = BLOCKS.register("dark_oak_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.DARK_OAK_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK))); - public static final RegistryObject MANGROVE_FRAME = BLOCKS.register("mangrove_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.MANGROVE_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK))); - public static final RegistryObject CHERRY_FRAME = BLOCKS.register("cherry_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.CHERRY_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK))); - public static final RegistryObject BAMBOO_FRAME = BLOCKS.register("bamboo_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.BAMBOO_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK))); - public static final RegistryObject CRIMSON_FRAME = BLOCKS.register("crimson_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.CRIMSON_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK))); - public static final RegistryObject WARPED_FRAME = BLOCKS.register("warped_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.WARPED_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK))); + public static final RegistryObject OAK_FRAME = BLOCKS.register("oak_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.OAK_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY))); + public static final RegistryObject SPRUCE_FRAME = BLOCKS.register("spruce_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.SPRUCE_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY))); + public static final RegistryObject BIRCH_FRAME = BLOCKS.register("birch_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.BIRCH_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY))); + public static final RegistryObject JUNGLE_FRAME = BLOCKS.register("jungle_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.JUNGLE_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY))); + public static final RegistryObject ACACIA_FRAME = BLOCKS.register("acacia_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.ACACIA_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY))); + public static final RegistryObject DARK_OAK_FRAME = BLOCKS.register("dark_oak_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.DARK_OAK_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY))); + public static final RegistryObject MANGROVE_FRAME = BLOCKS.register("mangrove_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.MANGROVE_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY))); + public static final RegistryObject CHERRY_FRAME = BLOCKS.register("cherry_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.CHERRY_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY))); + public static final RegistryObject BAMBOO_FRAME = BLOCKS.register("bamboo_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.BAMBOO_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY))); + public static final RegistryObject CRIMSON_FRAME = BLOCKS.register("crimson_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.CRIMSON_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY))); + public static final RegistryObject WARPED_FRAME = BLOCKS.register("warped_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.WARPED_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY))); // endregion // region WOODEN LANTERNS diff --git a/src/main/resources/data/create/tags/blocks/movable_empty_collider.json b/src/main/resources/data/create/tags/blocks/movable_empty_collider.json new file mode 100644 index 0000000..6556317 --- /dev/null +++ b/src/main/resources/data/create/tags/blocks/movable_empty_collider.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#bbb:frames" + ] +} \ No newline at end of file