Skip to content
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,20 @@ public ModBlockTagProvider(FabricDataOutput output, CompletableFuture<HolderLook
protected void addTags(HolderLookup.Provider provider) {
valueLookupBuilder(BlockTags.LOGS)
.add(ModBlocks.AMBER_LOG)
.add(ModBlocks.ASH_LOG)
.add(ModBlocks.ASPEN_LOG)
.add(ModBlocks.AZURE_LOG)
.add(ModBlocks.BAMBOO_LOG)
.add(ModBlocks.BAMBOO_LOG_DECO)
.add(ModBlocks.BANYAN_LOG)
.add(ModBlocks.BEECH_LOG)
.add(ModBlocks.BOTTLETREE_LOG)
.add(ModBlocks.BURNT_LOG)
.add(ModBlocks.CAMPHOR_LOG)
.add(ModBlocks.CEDAR_LOG)
.add(ModBlocks.CRYSTALWOOD_LOG)
.add(ModBlocks.DRY_LOG)
.add(ModBlocks.BLUE_FIG_LOG)
.add(ModBlocks.FIRE_LOG)
.add(ModBlocks.GUMBOAB_LOG)
.add(ModBlocks.ICE_LOG)
.add(ModBlocks.MAPLE_LOG)
.add(ModBlocks.PALM_TREE_LOG)
.add(ModBlocks.PALO_LOG)
.add(ModBlocks.PETRIFIED_LOG)
.add(ModBlocks.POISONED_LOG)
.add(ModBlocks.REDWOOD_LOG)
.add(ModBlocks.SALLOW_LOG)
Expand Down
21 changes: 7 additions & 14 deletions src/client/java/com/tcm/MineTale/datagen/ModModelProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,37 +31,30 @@ public class ModModelProvider extends FabricModelProvider {
.select(Direction.WEST, BlockModelGenerators.Y_ROT_270);

/**
* Registers block state and model definitions for the mod's custom log blocks and furnace workbenches.
*
* Configures horizontal and vertical variants for each custom log block and registers the wood model for
* WILD_WISTERIA_LOG; registers blockstate variants and item models for the mod's furnace workbench blocks.
*
* @param blockStateModelGenerator generator used to create block state and model entries
*/
* Register block state and model definitions for the mod's custom log blocks and furnace workbenches.
*
* Generates horizontal/vertical variants and associated wood models for the mod's logs (including a wood model for
* WILD_WISTERIA_LOG) and registers blockstate variants and item models for the furnace workbench blocks.
*
* @param blockStateModelGenerator generator used to create block state and model entries
*/
@Override
public void generateBlockStateModels(BlockModelGenerators blockStateModelGenerator) {
blockStateModelGenerator.woodProvider(ModBlocks.AMBER_LOG).logWithHorizontal(ModBlocks.AMBER_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.ASH_LOG).logWithHorizontal(ModBlocks.ASH_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.ASPEN_LOG).logWithHorizontal(ModBlocks.ASPEN_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.AZURE_LOG).logWithHorizontal(ModBlocks.AZURE_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.BAMBOO_LOG).logWithHorizontal(ModBlocks.BAMBOO_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.BAMBOO_LOG_DECO).logWithHorizontal(ModBlocks.BAMBOO_LOG_DECO);
blockStateModelGenerator.woodProvider(ModBlocks.BANYAN_LOG).logWithHorizontal(ModBlocks.BANYAN_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.BEECH_LOG).logWithHorizontal(ModBlocks.BEECH_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.BOTTLETREE_LOG).logWithHorizontal(ModBlocks.BOTTLETREE_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.BURNT_LOG).logWithHorizontal(ModBlocks.BURNT_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.CAMPHOR_LOG).logWithHorizontal(ModBlocks.CAMPHOR_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.CEDAR_LOG).logWithHorizontal(ModBlocks.CEDAR_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.CRYSTALWOOD_LOG).logWithHorizontal(ModBlocks.CRYSTALWOOD_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.DRY_LOG).logWithHorizontal(ModBlocks.DRY_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.BLUE_FIG_LOG).logWithHorizontal(ModBlocks.BLUE_FIG_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.FIRE_LOG).logWithHorizontal(ModBlocks.FIRE_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.GUMBOAB_LOG).logWithHorizontal(ModBlocks.GUMBOAB_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.ICE_LOG).logWithHorizontal(ModBlocks.ICE_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.MAPLE_LOG).logWithHorizontal(ModBlocks.MAPLE_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.PALM_TREE_LOG).logWithHorizontal(ModBlocks.PALM_TREE_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.PALO_LOG).logWithHorizontal(ModBlocks.PALO_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.PETRIFIED_LOG).logWithHorizontal(ModBlocks.PETRIFIED_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.POISONED_LOG).logWithHorizontal(ModBlocks.POISONED_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.REDWOOD_LOG).logWithHorizontal(ModBlocks.REDWOOD_LOG);
blockStateModelGenerator.woodProvider(ModBlocks.SALLOW_LOG).logWithHorizontal(ModBlocks.SALLOW_LOG);
Expand Down
37 changes: 0 additions & 37 deletions src/main/java/com/tcm/MineTale/item/ModCreativeTab.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,43 +15,6 @@ public class ModCreativeTab {
public static final CreativeModeTab MINETALE_CREATIVE_TAB = FabricItemGroup.builder()
.icon(() -> new ItemStack(ModBlocks.FURNACE_WORKBENCH_BLOCK_T1))
.title(Component.translatable("minetale.creative_tab.title"))
.displayItems((params, output) -> {
output.accept(ModBlocks.FURNACE_WORKBENCH_BLOCK_T1);
output.accept(ModBlocks.FURNACE_WORKBENCH_BLOCK_T2);
output.accept(ModBlocks.CAMPFIRE_WORKBENCH_BLOCK);
output.accept(ModBlocks.WORKBENCH_WORKBENCH_BLOCK);
output.accept(ModBlocks.ARMORERS_WORKBENCH_BLOCK);
output.accept(ModBlocks.AMBER_LOG);
output.accept(ModBlocks.ASH_LOG);
output.accept(ModBlocks.ASPEN_LOG);
output.accept(ModBlocks.AZURE_LOG);
output.accept(ModBlocks.BAMBOO_LOG);
output.accept(ModBlocks.BAMBOO_LOG_DECO);
output.accept(ModBlocks.BANYAN_LOG);
output.accept(ModBlocks.BEECH_LOG);
output.accept(ModBlocks.BOTTLETREE_LOG);
output.accept(ModBlocks.BURNT_LOG);
output.accept(ModBlocks.CAMPHOR_LOG);
output.accept(ModBlocks.CEDAR_LOG);
output.accept(ModBlocks.CRYSTALWOOD_LOG);
output.accept(ModBlocks.DRY_LOG);
output.accept(ModBlocks.BLUE_FIG_LOG);
output.accept(ModBlocks.FIRE_LOG);
output.accept(ModBlocks.GUMBOAB_LOG);
output.accept(ModBlocks.ICE_LOG);
output.accept(ModBlocks.MAPLE_LOG);
output.accept(ModBlocks.PALM_TREE_LOG);
output.accept(ModBlocks.PALO_LOG);
output.accept(ModBlocks.PETRIFIED_LOG);
output.accept(ModBlocks.POISONED_LOG);
output.accept(ModBlocks.REDWOOD_LOG);
output.accept(ModBlocks.SALLOW_LOG);
output.accept(ModBlocks.SPIRAL_LOG);
output.accept(ModBlocks.STORMBARK_LOG);
output.accept(ModBlocks.STRIPPED_LOG);
output.accept(ModBlocks.WINDWILLOW_LOG);
output.accept(ModBlocks.WILD_WISTERIA_LOG);
})
.build();
}

Loading