Skip to content

Commit c50c4b5

Browse files
Brandcraf06Brandcraf06
committed
Changed block bundles Registration (Inspired by Artisanat mod)
1 parent ab6edee commit c50c4b5

29 files changed

Lines changed: 1765 additions & 1605 deletions

‎src/main/generated/data/blockus/tags/block/concrete_blocks.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,81 +3,97 @@
33
"blockus:white_concrete_bricks",
44
"blockus:white_concrete_brick_stairs",
55
"blockus:white_concrete_brick_slab",
6+
"blockus:white_concrete_brick_wall",
67
"blockus:chiseled_white_concrete",
78
"blockus:white_concrete_pillar",
89
"blockus:light_gray_concrete_bricks",
910
"blockus:light_gray_concrete_brick_stairs",
1011
"blockus:light_gray_concrete_brick_slab",
12+
"blockus:light_gray_concrete_brick_wall",
1113
"blockus:chiseled_light_gray_concrete",
1214
"blockus:light_gray_concrete_pillar",
1315
"blockus:gray_concrete_bricks",
1416
"blockus:gray_concrete_brick_stairs",
1517
"blockus:gray_concrete_brick_slab",
18+
"blockus:gray_concrete_brick_wall",
1619
"blockus:chiseled_gray_concrete",
1720
"blockus:gray_concrete_pillar",
1821
"blockus:black_concrete_bricks",
1922
"blockus:black_concrete_brick_stairs",
2023
"blockus:black_concrete_brick_slab",
24+
"blockus:black_concrete_brick_wall",
2125
"blockus:chiseled_black_concrete",
2226
"blockus:black_concrete_pillar",
2327
"blockus:brown_concrete_bricks",
2428
"blockus:brown_concrete_brick_stairs",
2529
"blockus:brown_concrete_brick_slab",
30+
"blockus:brown_concrete_brick_wall",
2631
"blockus:chiseled_brown_concrete",
2732
"blockus:brown_concrete_pillar",
2833
"blockus:red_concrete_bricks",
2934
"blockus:red_concrete_brick_stairs",
3035
"blockus:red_concrete_brick_slab",
36+
"blockus:red_concrete_brick_wall",
3137
"blockus:chiseled_red_concrete",
3238
"blockus:red_concrete_pillar",
3339
"blockus:orange_concrete_bricks",
3440
"blockus:orange_concrete_brick_stairs",
3541
"blockus:orange_concrete_brick_slab",
42+
"blockus:orange_concrete_brick_wall",
3643
"blockus:chiseled_orange_concrete",
3744
"blockus:orange_concrete_pillar",
3845
"blockus:yellow_concrete_bricks",
3946
"blockus:yellow_concrete_brick_stairs",
4047
"blockus:yellow_concrete_brick_slab",
48+
"blockus:yellow_concrete_brick_wall",
4149
"blockus:chiseled_yellow_concrete",
4250
"blockus:yellow_concrete_pillar",
4351
"blockus:lime_concrete_bricks",
4452
"blockus:lime_concrete_brick_stairs",
4553
"blockus:lime_concrete_brick_slab",
54+
"blockus:lime_concrete_brick_wall",
4655
"blockus:chiseled_lime_concrete",
4756
"blockus:lime_concrete_pillar",
4857
"blockus:green_concrete_bricks",
4958
"blockus:green_concrete_brick_stairs",
5059
"blockus:green_concrete_brick_slab",
60+
"blockus:green_concrete_brick_wall",
5161
"blockus:chiseled_green_concrete",
5262
"blockus:green_concrete_pillar",
5363
"blockus:cyan_concrete_bricks",
5464
"blockus:cyan_concrete_brick_stairs",
5565
"blockus:cyan_concrete_brick_slab",
66+
"blockus:cyan_concrete_brick_wall",
5667
"blockus:chiseled_cyan_concrete",
5768
"blockus:cyan_concrete_pillar",
5869
"blockus:light_blue_concrete_bricks",
5970
"blockus:light_blue_concrete_brick_stairs",
6071
"blockus:light_blue_concrete_brick_slab",
72+
"blockus:light_blue_concrete_brick_wall",
6173
"blockus:chiseled_light_blue_concrete",
6274
"blockus:light_blue_concrete_pillar",
6375
"blockus:blue_concrete_bricks",
6476
"blockus:blue_concrete_brick_stairs",
6577
"blockus:blue_concrete_brick_slab",
78+
"blockus:blue_concrete_brick_wall",
6679
"blockus:chiseled_blue_concrete",
6780
"blockus:blue_concrete_pillar",
6881
"blockus:purple_concrete_bricks",
6982
"blockus:purple_concrete_brick_stairs",
7083
"blockus:purple_concrete_brick_slab",
84+
"blockus:purple_concrete_brick_wall",
7185
"blockus:chiseled_purple_concrete",
7286
"blockus:purple_concrete_pillar",
7387
"blockus:magenta_concrete_bricks",
7488
"blockus:magenta_concrete_brick_stairs",
7589
"blockus:magenta_concrete_brick_slab",
90+
"blockus:magenta_concrete_brick_wall",
7691
"blockus:chiseled_magenta_concrete",
7792
"blockus:magenta_concrete_pillar",
7893
"blockus:pink_concrete_bricks",
7994
"blockus:pink_concrete_brick_stairs",
8095
"blockus:pink_concrete_brick_slab",
96+
"blockus:pink_concrete_brick_wall",
8197
"blockus:chiseled_pink_concrete",
8298
"blockus:pink_concrete_pillar"
8399
]

‎src/main/generated/data/blockus/tags/block/large_flower_pots.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
"blockus:potted_huge_warped_fungus",
2222
"blockus:potted_cactus_large",
2323
"blockus:potted_bamboo_large",
24-
"blockus:potted_pitcher_plant"
24+
"blockus:potted_azalea_large",
25+
"blockus:potted_flowering_azalea_large",
26+
"blockus:potted_pitcher_plant",
27+
"blockus:potted_legacy_tree"
2528
]
2629
}

‎src/main/java/com/brand/blockus/BlockusClient.java‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ public void onInitializeClient() {
2424
registerBlockColor(BlockusBlocks.ACACIA_HEDGE, Blocks.ACACIA_LEAVES);
2525
registerBlockColor(BlockusBlocks.DARK_OAK_HEDGE, Blocks.DARK_OAK_LEAVES);
2626
registerBlockColor(BlockusBlocks.MANGROVE_HEDGE, Blocks.MANGROVE_LEAVES);
27-
registerBlockColor(BlockusBlocks.POTTED_LARGE_FERN.block, Blocks.POTTED_FERN);
28-
registerBlockColor(BlockusBlocks.POTTED_OAK.block, Blocks.OAK_LEAVES);
29-
registerBlockColor(BlockusBlocks.POTTED_SPRUCE.block, Blocks.SPRUCE_LEAVES);
30-
registerBlockColor(BlockusBlocks.POTTED_BIRCH.block, Blocks.BIRCH_LEAVES);
31-
registerBlockColor(BlockusBlocks.POTTED_JUNGLE.block, Blocks.JUNGLE_LEAVES);
32-
registerBlockColor(BlockusBlocks.POTTED_ACACIA.block, Blocks.ACACIA_LEAVES);
33-
registerBlockColor(BlockusBlocks.POTTED_DARK_OAK.block, Blocks.DARK_OAK_LEAVES);
34-
registerBlockColor(BlockusBlocks.POTTED_MANGROVE.block, Blocks.MANGROVE_LEAVES);
27+
registerBlockColor(BlockusBlocks.POTTED_LARGE_FERN.block(), Blocks.POTTED_FERN);
28+
registerBlockColor(BlockusBlocks.POTTED_OAK.block(), Blocks.OAK_LEAVES);
29+
registerBlockColor(BlockusBlocks.POTTED_SPRUCE.block(), Blocks.SPRUCE_LEAVES);
30+
registerBlockColor(BlockusBlocks.POTTED_BIRCH.block(), Blocks.BIRCH_LEAVES);
31+
registerBlockColor(BlockusBlocks.POTTED_JUNGLE.block(), Blocks.JUNGLE_LEAVES);
32+
registerBlockColor(BlockusBlocks.POTTED_ACACIA.block(), Blocks.ACACIA_LEAVES);
33+
registerBlockColor(BlockusBlocks.POTTED_DARK_OAK.block(), Blocks.DARK_OAK_LEAVES);
34+
registerBlockColor(BlockusBlocks.POTTED_MANGROVE.block(), Blocks.MANGROVE_LEAVES);
3535
registerBlockColor(BlockusBlocks.RAINBOW_PETALS, Blocks.PINK_PETALS);
3636

3737
BlockRenderLayerMap.putBlocks(BlockRenderLayer.CUTOUT,
38-
BlockusBlocks.RAW_BAMBOO.door,
39-
BlockusBlocks.RAW_BAMBOO.trapdoor,
38+
BlockusBlocks.RAW_BAMBOO.door(),
39+
BlockusBlocks.RAW_BAMBOO.trapdoor(),
4040
BlockusBlocks.LEGACY_SAPLING,
4141
BlockusBlocks.POTTED_LEGACY_SAPLING,
4242
BlockusBlocks.WHITE_OAK_SAPLING,
@@ -46,26 +46,26 @@ public void onInitializeClient() {
4646
BlockusBlocks.RAINBOW_ROSE,
4747
BlockusBlocks.POTTED_RAINBOW_ROSE,
4848
BlockusBlocks.RAINBOW_PETALS,
49-
BlockusBlocks.POTTED_ROSE_BUSH.block,
50-
BlockusBlocks.POTTED_LILAC.block,
51-
BlockusBlocks.POTTED_PEONY.block,
52-
BlockusBlocks.POTTED_LARGE_FERN.block,
53-
BlockusBlocks.POTTED_OAK.block,
54-
BlockusBlocks.POTTED_SPRUCE.block,
55-
BlockusBlocks.POTTED_BIRCH.block,
56-
BlockusBlocks.POTTED_JUNGLE.block,
57-
BlockusBlocks.POTTED_ACACIA.block,
58-
BlockusBlocks.POTTED_DARK_OAK.block,
59-
BlockusBlocks.POTTED_MANGROVE.block,
60-
BlockusBlocks.POTTED_CHERRY_BLOSSOM.block,
61-
BlockusBlocks.POTTED_PALE_OAK.block,
62-
BlockusBlocks.POTTED_WHITE_OAK.block,
63-
BlockusBlocks.POTTED_CACTUS_LARGE.block,
64-
BlockusBlocks.POTTED_BAMBOO_LARGE.block,
65-
BlockusBlocks.POTTED_AZALEA_LARGE.block,
66-
BlockusBlocks.POTTED_FLOWERING_AZALEA_LARGE.block,
67-
BlockusBlocks.POTTED_LEGACY_TREE.block,
68-
BlockusBlocks.POTTED_PITCHER_PLANT.block,
49+
BlockusBlocks.POTTED_ROSE_BUSH.block(),
50+
BlockusBlocks.POTTED_LILAC.block(),
51+
BlockusBlocks.POTTED_PEONY.block(),
52+
BlockusBlocks.POTTED_LARGE_FERN.block(),
53+
BlockusBlocks.POTTED_OAK.block(),
54+
BlockusBlocks.POTTED_SPRUCE.block(),
55+
BlockusBlocks.POTTED_BIRCH.block(),
56+
BlockusBlocks.POTTED_JUNGLE.block(),
57+
BlockusBlocks.POTTED_ACACIA.block(),
58+
BlockusBlocks.POTTED_DARK_OAK.block(),
59+
BlockusBlocks.POTTED_MANGROVE.block(),
60+
BlockusBlocks.POTTED_CHERRY_BLOSSOM.block(),
61+
BlockusBlocks.POTTED_PALE_OAK.block(),
62+
BlockusBlocks.POTTED_WHITE_OAK.block(),
63+
BlockusBlocks.POTTED_CACTUS_LARGE.block(),
64+
BlockusBlocks.POTTED_BAMBOO_LARGE.block(),
65+
BlockusBlocks.POTTED_AZALEA_LARGE.block(),
66+
BlockusBlocks.POTTED_FLOWERING_AZALEA_LARGE.block(),
67+
BlockusBlocks.POTTED_LEGACY_TREE.block(),
68+
BlockusBlocks.POTTED_PITCHER_PLANT.block(),
6969
BlockusBlocks.BLACKSTONE_DOOR,
7070
BlockusBlocks.BLACKSTONE_TRAPDOOR,
7171
BlockusBlocks.AMETHYST_LANTERN,
@@ -101,11 +101,11 @@ public void onInitializeClient() {
101101
);
102102

103103
for (TimberFrameBundle timberFrameBundle : TimberFrameBundle.values()) {
104-
BlockRenderLayerMap.putBlocks(BlockRenderLayer.CUTOUT_MIPPED, timberFrameBundle.lattice, timberFrameBundle.grate);
104+
BlockRenderLayerMap.putBlocks(BlockRenderLayer.CUTOUT_MIPPED, timberFrameBundle.lattice(), timberFrameBundle.grate());
105105
}
106106

107107
for (WoodenPostBundle woodenPostBundle : WoodenPostBundle.values()) {
108-
BlockRenderLayerMap.putBlocks(BlockRenderLayer.CUTOUT, woodenPostBundle.block, woodenPostBundle.stripped);
108+
BlockRenderLayerMap.putBlocks(BlockRenderLayer.CUTOUT, woodenPostBundle.block(), woodenPostBundle.stripped());
109109
}
110110

111111
BlockRenderLayerMap.putBlocks(BlockRenderLayer.TRANSLUCENT,

‎src/main/java/com/brand/blockus/Instance.java‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ public static void init() {
5353
FlammableBlockRegistry.getDefaultInstance().add(BURNT_PAPER_BLOCK, 5, 60);
5454

5555
// Thatch
56-
FlammableBlockRegistry.getDefaultInstance().add(THATCH.block, 60, 20);
57-
FlammableBlockRegistry.getDefaultInstance().add(THATCH.slab, 60, 20);
58-
FlammableBlockRegistry.getDefaultInstance().add(THATCH.stairs, 60, 20);
56+
FlammableBlockRegistry.getDefaultInstance().add(THATCH.block(), 60, 20);
57+
FlammableBlockRegistry.getDefaultInstance().add(THATCH.slab(), 60, 20);
58+
FlammableBlockRegistry.getDefaultInstance().add(THATCH.stairs(), 60, 20);
5959

6060
// Timber frames
6161
for (TimberFrameBundle timberFrameBundle : TimberFrameBundle.values()) {
62-
for (Block block : timberFrameBundle.all) {
63-
if (timberFrameBundle.isBurnable()) {
62+
for (Block block : timberFrameBundle.all()) {
63+
if (timberFrameBundle.burnable()) {
6464
FlammableBlockRegistry.getDefaultInstance().add(block, 5, 20);
6565
FuelRegistryEvents.BUILD.register((builder, context) -> builder.add(block, 300));
6666
}
@@ -69,27 +69,27 @@ public static void init() {
6969

7070
// Patterned wools
7171
for (WoolBundle woolBundle : WoolBundle.values()) {
72-
FlammableBlockRegistry.getDefaultInstance().add(woolBundle.block, 30, 60);
73-
FlammableBlockRegistry.getDefaultInstance().add(woolBundle.stairs, 30, 60);
74-
FlammableBlockRegistry.getDefaultInstance().add(woolBundle.slab, 30, 60);
75-
FlammableBlockRegistry.getDefaultInstance().add(woolBundle.carpet, 60, 20);
72+
FlammableBlockRegistry.getDefaultInstance().add(woolBundle.block(), 30, 60);
73+
FlammableBlockRegistry.getDefaultInstance().add(woolBundle.stairs(), 30, 60);
74+
FlammableBlockRegistry.getDefaultInstance().add(woolBundle.slab(), 30, 60);
75+
FlammableBlockRegistry.getDefaultInstance().add(woolBundle.carpet(), 60, 20);
7676
FuelRegistryEvents.BUILD.register((builder, context) -> {
77-
builder.add(woolBundle.stairs, 100);
78-
builder.add(woolBundle.slab, 50);
77+
builder.add(woolBundle.stairs(), 100);
78+
builder.add(woolBundle.slab(), 50);
7979
});
8080
}
8181

8282
// Wood set
8383
for (WoodBundle woodBundle : WoodBundle.values()) {
84-
if (woodBundle.isBurnable()) {
85-
FlammableBlockRegistry.getDefaultInstance().add(woodBundle.planks, 5, 20);
86-
FlammableBlockRegistry.getDefaultInstance().add(woodBundle.stairs, 5, 20);
87-
FlammableBlockRegistry.getDefaultInstance().add(woodBundle.slab, 5, 20);
88-
FlammableBlockRegistry.getDefaultInstance().add(woodBundle.fence, 5, 20);
89-
FlammableBlockRegistry.getDefaultInstance().add(woodBundle.fence_gate, 5, 20);
84+
if (woodBundle.burnable()) {
85+
FlammableBlockRegistry.getDefaultInstance().add(woodBundle.planks(), 5, 20);
86+
FlammableBlockRegistry.getDefaultInstance().add(woodBundle.stairs(), 5, 20);
87+
FlammableBlockRegistry.getDefaultInstance().add(woodBundle.slab(), 5, 20);
88+
FlammableBlockRegistry.getDefaultInstance().add(woodBundle.fence(), 5, 20);
89+
FlammableBlockRegistry.getDefaultInstance().add(woodBundle.fenceGate(), 5, 20);
9090
FuelRegistryEvents.BUILD.register((builder, context) -> {
91-
builder.add(woodBundle.fence, 300);
92-
builder.add(woodBundle.fence_gate, 300);
91+
builder.add(woodBundle.fence(), 300);
92+
builder.add(woodBundle.fenceGate(), 300);
9393
});
9494
}
9595
}
@@ -103,14 +103,14 @@ public static void init() {
103103

104104
// Wooden mosaic
105105
for (BSSWBundle block : BSSWBundle.values()) {
106-
if (BlockChecker.isWoodenMosaic(block.type, BlockChecker.FLAMMABLE_WOODS) || BlockChecker.isMossyPlanks(block.type, BlockChecker.FLAMMABLE_WOODS)) {
107-
FlammableBlockRegistry.getDefaultInstance().add(block.block, 5, 20);
108-
FlammableBlockRegistry.getDefaultInstance().add(block.stairs, 5, 20);
109-
FlammableBlockRegistry.getDefaultInstance().add(block.slab, 5, 20);
106+
if (BlockChecker.isWoodenMosaic(block.type(), BlockChecker.FLAMMABLE_WOODS) || BlockChecker.isMossyPlanks(block.type(), BlockChecker.FLAMMABLE_WOODS)) {
107+
FlammableBlockRegistry.getDefaultInstance().add(block.block(), 5, 20);
108+
FlammableBlockRegistry.getDefaultInstance().add(block.stairs(), 5, 20);
109+
FlammableBlockRegistry.getDefaultInstance().add(block.slab(), 5, 20);
110110
FuelRegistryEvents.BUILD.register((builder, context) -> {
111-
builder.add(block.block, 300);
112-
builder.add(block.stairs, 300);
113-
builder.add(block.slab, 150);
111+
builder.add(block.block(), 300);
112+
builder.add(block.stairs(), 300);
113+
builder.add(block.slab(), 150);
114114
});
115115
}
116116
}
@@ -141,9 +141,9 @@ public static void init() {
141141

142142
// Posts
143143
for (WoodenPostBundle woodenPost : WoodenPostBundle.values()) {
144-
if (woodenPost.isBurnable()) {
145-
FlammableBlockRegistry.getDefaultInstance().add(woodenPost.block, 5, 5);
146-
FlammableBlockRegistry.getDefaultInstance().add(woodenPost.stripped, 5, 5);
144+
if (woodenPost.burnable()) {
145+
FlammableBlockRegistry.getDefaultInstance().add(woodenPost.block(), 5, 5);
146+
FlammableBlockRegistry.getDefaultInstance().add(woodenPost.stripped(), 5, 5);
147147
}
148148
}
149149

@@ -172,9 +172,9 @@ public static void init() {
172172
CompostingChanceRegistry.INSTANCE.add(MOSS_HEDGE, 0.65f);
173173
CompostingChanceRegistry.INSTANCE.add(PALE_MOSS_HEDGE, 0.65f);
174174
CompostingChanceRegistry.INSTANCE.add(RAINBOW_ROSE, 0.65f);
175-
CompostingChanceRegistry.INSTANCE.add(THATCH.slab, 0.65f);
176-
CompostingChanceRegistry.INSTANCE.add(THATCH.block, 0.75f);
177-
CompostingChanceRegistry.INSTANCE.add(THATCH.stairs, 0.75f);
175+
CompostingChanceRegistry.INSTANCE.add(THATCH.slab(), 0.65f);
176+
CompostingChanceRegistry.INSTANCE.add(THATCH.block(), 0.75f);
177+
CompostingChanceRegistry.INSTANCE.add(THATCH.stairs(), 0.75f);
178178
CompostingChanceRegistry.INSTANCE.add(WARPED_HEDGE, 0.85f);
179179
CompostingChanceRegistry.INSTANCE.add(CRIMSON_HEDGE, 0.85f);
180180
CompostingChanceRegistry.INSTANCE.add(APPLE_CRATE, 0.95f);
@@ -196,7 +196,7 @@ public static void addStrippables() {
196196
StrippableBlockRegistry.register(WHITE_OAK_LOG, STRIPPED_WHITE_OAK_LOG);
197197
StrippableBlockRegistry.register(WHITE_OAK_WOOD, STRIPPED_WHITE_OAK_WOOD);
198198
for (WoodenPostBundle woodenPost : WoodenPostBundle.values()) {
199-
StrippableBlockRegistry.register(woodenPost.block, woodenPost.stripped);
199+
StrippableBlockRegistry.register(woodenPost.block(), woodenPost.stripped());
200200
}
201201
}
202202

@@ -216,10 +216,10 @@ public static void registerOxidizable(Block block, Block exposed, Block weathere
216216
}
217217

218218
public static void registerOxidizable(CopperBundle block, CopperBundle exposed, CopperBundle weathered, CopperBundle oxidized) {
219-
registerOxidizable(block.block, exposed.block, weathered.block, oxidized.block, block.blockWaxed, exposed.blockWaxed, weathered.blockWaxed, oxidized.blockWaxed);
220-
registerOxidizable(block.stairs, exposed.stairs, weathered.stairs, oxidized.stairs, block.stairsWaxed, exposed.stairsWaxed, weathered.stairsWaxed, oxidized.stairsWaxed);
221-
registerOxidizable(block.slab, exposed.slab, weathered.slab, oxidized.slab, block.slabWaxed, exposed.slabWaxed, weathered.slabWaxed, oxidized.slabWaxed);
222-
registerOxidizable(block.wall, exposed.wall, weathered.wall, oxidized.wall, block.wallWaxed, exposed.wallWaxed, weathered.wallWaxed, oxidized.wallWaxed);
219+
registerOxidizable(block.block(), exposed.block(), weathered.block(), oxidized.block(), block.blockWaxed(), exposed.blockWaxed(), weathered.blockWaxed(), oxidized.blockWaxed());
220+
registerOxidizable(block.stairs(), exposed.stairs(), weathered.stairs(), oxidized.stairs(), block.stairsWaxed(), exposed.stairsWaxed(), weathered.stairsWaxed(), oxidized.stairsWaxed());
221+
registerOxidizable(block.slab(), exposed.slab(), weathered.slab(), oxidized.slab(), block.slabWaxed(), exposed.slabWaxed(), weathered.slabWaxed(), oxidized.slabWaxed());
222+
registerOxidizable(block.wall(), exposed.wall(), weathered.wall(), oxidized.wall(), block.wallWaxed(), exposed.wallWaxed(), weathered.wallWaxed(), oxidized.wallWaxed());
223223
}
224224

225225
public static void addPathBlocks() {

0 commit comments

Comments
 (0)