Skip to content

Commit

Permalink
[~] Patch port from Fabric
Browse files Browse the repository at this point in the history
  • Loading branch information
@crispytwig
crispytwig committed May 21, 2024
1 parent 55b9ca2 commit 400a72d
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 13 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.+
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/com/starfish_studios/bbb/block/FrameBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/com/starfish_studios/bbb/registry/BBBBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,17 +257,17 @@ public class BBBBlocks {
// endregion

// region FRAMES
public static final RegistryObject<Block> OAK_FRAME = BLOCKS.register("oak_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.OAK_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK)));
public static final RegistryObject<Block> SPRUCE_FRAME = BLOCKS.register("spruce_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.SPRUCE_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK)));
public static final RegistryObject<Block> BIRCH_FRAME = BLOCKS.register("birch_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.BIRCH_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK)));
public static final RegistryObject<Block> JUNGLE_FRAME = BLOCKS.register("jungle_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.JUNGLE_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK)));
public static final RegistryObject<Block> ACACIA_FRAME = BLOCKS.register("acacia_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.ACACIA_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK)));
public static final RegistryObject<Block> 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<Block> MANGROVE_FRAME = BLOCKS.register("mangrove_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.MANGROVE_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK)));
public static final RegistryObject<Block> CHERRY_FRAME = BLOCKS.register("cherry_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.CHERRY_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK)));
public static final RegistryObject<Block> BAMBOO_FRAME = BLOCKS.register("bamboo_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.BAMBOO_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK)));
public static final RegistryObject<Block> CRIMSON_FRAME = BLOCKS.register("crimson_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.CRIMSON_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK)));
public static final RegistryObject<Block> WARPED_FRAME = BLOCKS.register("warped_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.WARPED_PLANKS)).noOcclusion().noCollission().pushReaction(BLOCK)));
public static final RegistryObject<Block> OAK_FRAME = BLOCKS.register("oak_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.OAK_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY)));
public static final RegistryObject<Block> SPRUCE_FRAME = BLOCKS.register("spruce_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.SPRUCE_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY)));
public static final RegistryObject<Block> BIRCH_FRAME = BLOCKS.register("birch_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.BIRCH_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY)));
public static final RegistryObject<Block> JUNGLE_FRAME = BLOCKS.register("jungle_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.JUNGLE_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY)));
public static final RegistryObject<Block> ACACIA_FRAME = BLOCKS.register("acacia_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.ACACIA_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY)));
public static final RegistryObject<Block> 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<Block> MANGROVE_FRAME = BLOCKS.register("mangrove_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.MANGROVE_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY)));
public static final RegistryObject<Block> CHERRY_FRAME = BLOCKS.register("cherry_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.CHERRY_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY)));
public static final RegistryObject<Block> BAMBOO_FRAME = BLOCKS.register("bamboo_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.BAMBOO_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY)));
public static final RegistryObject<Block> CRIMSON_FRAME = BLOCKS.register("crimson_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.CRIMSON_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY)));
public static final RegistryObject<Block> WARPED_FRAME = BLOCKS.register("warped_frame", () -> new FrameBlock(BlockBehaviour.Properties.copy((Blocks.WARPED_PLANKS)).noOcclusion().noCollission().pushReaction(PushReaction.DESTROY)));
// endregion

// region WOODEN LANTERNS
Expand Down
6 changes: 6 additions & 0 deletions src/main/resources/data/create/tags/blocks/movable_empty_collider.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"#bbb:frames"
]
}

0 comments on commit 400a72d

Please sign in to comment.