Skip to content

Commit d05fccf

Browse files
Merge pull request #46 from CodeMonkeysMods/feat/add-items
Add loads more blocks
2 parents 0622131 + 52ff02c commit d05fccf

File tree

5 files changed

+192
-78
lines changed

5 files changed

+192
-78
lines changed

src/client/java/com/tcm/MineTale/datagen/ModBlockTagProvider.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,20 @@ public ModBlockTagProvider(FabricDataOutput output, CompletableFuture<HolderLook
3030
protected void addTags(HolderLookup.Provider provider) {
3131
valueLookupBuilder(BlockTags.LOGS)
3232
.add(ModBlocks.AMBER_LOG)
33-
.add(ModBlocks.ASH_LOG)
34-
.add(ModBlocks.ASPEN_LOG)
35-
.add(ModBlocks.AZURE_LOG)
3633
.add(ModBlocks.BAMBOO_LOG)
3734
.add(ModBlocks.BAMBOO_LOG_DECO)
3835
.add(ModBlocks.BANYAN_LOG)
3936
.add(ModBlocks.BEECH_LOG)
4037
.add(ModBlocks.BOTTLETREE_LOG)
4138
.add(ModBlocks.BURNT_LOG)
4239
.add(ModBlocks.CAMPHOR_LOG)
43-
.add(ModBlocks.CEDAR_LOG)
4440
.add(ModBlocks.CRYSTALWOOD_LOG)
45-
.add(ModBlocks.DRY_LOG)
46-
.add(ModBlocks.BLUE_FIG_LOG)
4741
.add(ModBlocks.FIRE_LOG)
4842
.add(ModBlocks.GUMBOAB_LOG)
4943
.add(ModBlocks.ICE_LOG)
5044
.add(ModBlocks.MAPLE_LOG)
5145
.add(ModBlocks.PALM_TREE_LOG)
5246
.add(ModBlocks.PALO_LOG)
53-
.add(ModBlocks.PETRIFIED_LOG)
5447
.add(ModBlocks.POISONED_LOG)
5548
.add(ModBlocks.REDWOOD_LOG)
5649
.add(ModBlocks.SALLOW_LOG)

src/client/java/com/tcm/MineTale/datagen/ModModelProvider.java

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,37 +31,30 @@ public class ModModelProvider extends FabricModelProvider {
3131
.select(Direction.WEST, BlockModelGenerators.Y_ROT_270);
3232

3333
/**
34-
* Registers block state and model definitions for the mod's custom log blocks and furnace workbenches.
35-
*
36-
* Configures horizontal and vertical variants for each custom log block and registers the wood model for
37-
* WILD_WISTERIA_LOG; registers blockstate variants and item models for the mod's furnace workbench blocks.
38-
*
39-
* @param blockStateModelGenerator generator used to create block state and model entries
40-
*/
34+
* Register block state and model definitions for the mod's custom log blocks and furnace workbenches.
35+
*
36+
* Generates horizontal/vertical variants and associated wood models for the mod's logs (including a wood model for
37+
* WILD_WISTERIA_LOG) and registers blockstate variants and item models for the furnace workbench blocks.
38+
*
39+
* @param blockStateModelGenerator generator used to create block state and model entries
40+
*/
4141
@Override
4242
public void generateBlockStateModels(BlockModelGenerators blockStateModelGenerator) {
4343
blockStateModelGenerator.woodProvider(ModBlocks.AMBER_LOG).logWithHorizontal(ModBlocks.AMBER_LOG);
44-
blockStateModelGenerator.woodProvider(ModBlocks.ASH_LOG).logWithHorizontal(ModBlocks.ASH_LOG);
45-
blockStateModelGenerator.woodProvider(ModBlocks.ASPEN_LOG).logWithHorizontal(ModBlocks.ASPEN_LOG);
46-
blockStateModelGenerator.woodProvider(ModBlocks.AZURE_LOG).logWithHorizontal(ModBlocks.AZURE_LOG);
4744
blockStateModelGenerator.woodProvider(ModBlocks.BAMBOO_LOG).logWithHorizontal(ModBlocks.BAMBOO_LOG);
4845
blockStateModelGenerator.woodProvider(ModBlocks.BAMBOO_LOG_DECO).logWithHorizontal(ModBlocks.BAMBOO_LOG_DECO);
4946
blockStateModelGenerator.woodProvider(ModBlocks.BANYAN_LOG).logWithHorizontal(ModBlocks.BANYAN_LOG);
5047
blockStateModelGenerator.woodProvider(ModBlocks.BEECH_LOG).logWithHorizontal(ModBlocks.BEECH_LOG);
5148
blockStateModelGenerator.woodProvider(ModBlocks.BOTTLETREE_LOG).logWithHorizontal(ModBlocks.BOTTLETREE_LOG);
5249
blockStateModelGenerator.woodProvider(ModBlocks.BURNT_LOG).logWithHorizontal(ModBlocks.BURNT_LOG);
5350
blockStateModelGenerator.woodProvider(ModBlocks.CAMPHOR_LOG).logWithHorizontal(ModBlocks.CAMPHOR_LOG);
54-
blockStateModelGenerator.woodProvider(ModBlocks.CEDAR_LOG).logWithHorizontal(ModBlocks.CEDAR_LOG);
5551
blockStateModelGenerator.woodProvider(ModBlocks.CRYSTALWOOD_LOG).logWithHorizontal(ModBlocks.CRYSTALWOOD_LOG);
56-
blockStateModelGenerator.woodProvider(ModBlocks.DRY_LOG).logWithHorizontal(ModBlocks.DRY_LOG);
57-
blockStateModelGenerator.woodProvider(ModBlocks.BLUE_FIG_LOG).logWithHorizontal(ModBlocks.BLUE_FIG_LOG);
5852
blockStateModelGenerator.woodProvider(ModBlocks.FIRE_LOG).logWithHorizontal(ModBlocks.FIRE_LOG);
5953
blockStateModelGenerator.woodProvider(ModBlocks.GUMBOAB_LOG).logWithHorizontal(ModBlocks.GUMBOAB_LOG);
6054
blockStateModelGenerator.woodProvider(ModBlocks.ICE_LOG).logWithHorizontal(ModBlocks.ICE_LOG);
6155
blockStateModelGenerator.woodProvider(ModBlocks.MAPLE_LOG).logWithHorizontal(ModBlocks.MAPLE_LOG);
6256
blockStateModelGenerator.woodProvider(ModBlocks.PALM_TREE_LOG).logWithHorizontal(ModBlocks.PALM_TREE_LOG);
6357
blockStateModelGenerator.woodProvider(ModBlocks.PALO_LOG).logWithHorizontal(ModBlocks.PALO_LOG);
64-
blockStateModelGenerator.woodProvider(ModBlocks.PETRIFIED_LOG).logWithHorizontal(ModBlocks.PETRIFIED_LOG);
6558
blockStateModelGenerator.woodProvider(ModBlocks.POISONED_LOG).logWithHorizontal(ModBlocks.POISONED_LOG);
6659
blockStateModelGenerator.woodProvider(ModBlocks.REDWOOD_LOG).logWithHorizontal(ModBlocks.REDWOOD_LOG);
6760
blockStateModelGenerator.woodProvider(ModBlocks.SALLOW_LOG).logWithHorizontal(ModBlocks.SALLOW_LOG);

src/main/java/com/tcm/MineTale/item/ModCreativeTab.java

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -15,43 +15,6 @@ public class ModCreativeTab {
1515
public static final CreativeModeTab MINETALE_CREATIVE_TAB = FabricItemGroup.builder()
1616
.icon(() -> new ItemStack(ModBlocks.FURNACE_WORKBENCH_BLOCK_T1))
1717
.title(Component.translatable("minetale.creative_tab.title"))
18-
.displayItems((params, output) -> {
19-
output.accept(ModBlocks.FURNACE_WORKBENCH_BLOCK_T1);
20-
output.accept(ModBlocks.FURNACE_WORKBENCH_BLOCK_T2);
21-
output.accept(ModBlocks.CAMPFIRE_WORKBENCH_BLOCK);
22-
output.accept(ModBlocks.WORKBENCH_WORKBENCH_BLOCK);
23-
output.accept(ModBlocks.ARMORERS_WORKBENCH_BLOCK);
24-
output.accept(ModBlocks.AMBER_LOG);
25-
output.accept(ModBlocks.ASH_LOG);
26-
output.accept(ModBlocks.ASPEN_LOG);
27-
output.accept(ModBlocks.AZURE_LOG);
28-
output.accept(ModBlocks.BAMBOO_LOG);
29-
output.accept(ModBlocks.BAMBOO_LOG_DECO);
30-
output.accept(ModBlocks.BANYAN_LOG);
31-
output.accept(ModBlocks.BEECH_LOG);
32-
output.accept(ModBlocks.BOTTLETREE_LOG);
33-
output.accept(ModBlocks.BURNT_LOG);
34-
output.accept(ModBlocks.CAMPHOR_LOG);
35-
output.accept(ModBlocks.CEDAR_LOG);
36-
output.accept(ModBlocks.CRYSTALWOOD_LOG);
37-
output.accept(ModBlocks.DRY_LOG);
38-
output.accept(ModBlocks.BLUE_FIG_LOG);
39-
output.accept(ModBlocks.FIRE_LOG);
40-
output.accept(ModBlocks.GUMBOAB_LOG);
41-
output.accept(ModBlocks.ICE_LOG);
42-
output.accept(ModBlocks.MAPLE_LOG);
43-
output.accept(ModBlocks.PALM_TREE_LOG);
44-
output.accept(ModBlocks.PALO_LOG);
45-
output.accept(ModBlocks.PETRIFIED_LOG);
46-
output.accept(ModBlocks.POISONED_LOG);
47-
output.accept(ModBlocks.REDWOOD_LOG);
48-
output.accept(ModBlocks.SALLOW_LOG);
49-
output.accept(ModBlocks.SPIRAL_LOG);
50-
output.accept(ModBlocks.STORMBARK_LOG);
51-
output.accept(ModBlocks.STRIPPED_LOG);
52-
output.accept(ModBlocks.WINDWILLOW_LOG);
53-
output.accept(ModBlocks.WILD_WISTERIA_LOG);
54-
})
5518
.build();
5619
}
5720

0 commit comments

Comments
 (0)