Skip to content

Commit 6246557

Browse files
fix: remove logs that are already a version in the game
1 parent 90f08e6 commit 6246557

4 files changed

Lines changed: 0 additions & 28 deletions

File tree

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: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,27 +41,20 @@ public class ModModelProvider extends FabricModelProvider {
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 & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,20 @@ public class ModCreativeTab {
2222
output.accept(ModBlocks.WORKBENCH_WORKBENCH_BLOCK);
2323
output.accept(ModBlocks.ARMORERS_WORKBENCH_BLOCK);
2424
output.accept(ModBlocks.AMBER_LOG);
25-
output.accept(ModBlocks.ASH_LOG);
26-
output.accept(ModBlocks.ASPEN_LOG);
27-
output.accept(ModBlocks.AZURE_LOG);
2825
output.accept(ModBlocks.BAMBOO_LOG);
2926
output.accept(ModBlocks.BAMBOO_LOG_DECO);
3027
output.accept(ModBlocks.BANYAN_LOG);
3128
output.accept(ModBlocks.BEECH_LOG);
3229
output.accept(ModBlocks.BOTTLETREE_LOG);
3330
output.accept(ModBlocks.BURNT_LOG);
3431
output.accept(ModBlocks.CAMPHOR_LOG);
35-
output.accept(ModBlocks.CEDAR_LOG);
3632
output.accept(ModBlocks.CRYSTALWOOD_LOG);
37-
output.accept(ModBlocks.DRY_LOG);
38-
output.accept(ModBlocks.BLUE_FIG_LOG);
3933
output.accept(ModBlocks.FIRE_LOG);
4034
output.accept(ModBlocks.GUMBOAB_LOG);
4135
output.accept(ModBlocks.ICE_LOG);
4236
output.accept(ModBlocks.MAPLE_LOG);
4337
output.accept(ModBlocks.PALM_TREE_LOG);
4438
output.accept(ModBlocks.PALO_LOG);
45-
output.accept(ModBlocks.PETRIFIED_LOG);
4639
output.accept(ModBlocks.POISONED_LOG);
4740
output.accept(ModBlocks.REDWOOD_LOG);
4841
output.accept(ModBlocks.SALLOW_LOG);

src/main/java/com/tcm/MineTale/registry/ModBlocks.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,27 +66,20 @@ public class ModBlocks {
6666

6767
//Logs
6868
public static final Block AMBER_LOG = register("amber_log", RotatedPillarBlock::new, logProperties(MapColor.COLOR_ORANGE, MapColor.PODZOL, SoundType.WOOD), true);
69-
public static final Block ASH_LOG = register("ash_log", RotatedPillarBlock::new, logProperties(MapColor.WOOD, MapColor.COLOR_BROWN, SoundType.WOOD), true);
70-
public static final Block ASPEN_LOG = register("aspen_log", RotatedPillarBlock::new, logProperties(MapColor.SAND, MapColor.SAND, SoundType.WOOD), true);
71-
public static final Block AZURE_LOG = register("azure_log", RotatedPillarBlock::new, logProperties(MapColor.COLOR_BLUE, MapColor.COLOR_BROWN, SoundType.WOOD), true);
7269
public static final Block BAMBOO_LOG = register("bamboo_log", RotatedPillarBlock::new, logProperties(MapColor.COLOR_GREEN, MapColor.GRASS, SoundType.WOOD), true);
7370
public static final Block BAMBOO_LOG_DECO = register("bamboo_log_deco", RotatedPillarBlock::new, logProperties(MapColor.COLOR_BROWN, MapColor.DIRT, SoundType.WOOD), true);
7471
public static final Block BANYAN_LOG = register("banyan_log", RotatedPillarBlock::new, logProperties(MapColor.DIRT, MapColor.DIRT, SoundType.WOOD), true);
7572
public static final Block BEECH_LOG = register("beech_log", RotatedPillarBlock::new, logProperties(MapColor.DIRT, MapColor.COLOR_BROWN, SoundType.WOOD), true);
7673
public static final Block BOTTLETREE_LOG = register("bottletree_log", RotatedPillarBlock::new, logProperties(MapColor.QUARTZ, MapColor.QUARTZ, SoundType.WOOD), true);
7774
public static final Block BURNT_LOG = register("burnt_log", RotatedPillarBlock::new, logProperties(MapColor.COLOR_BLACK, MapColor.COLOR_BLACK, SoundType.WOOD), true);
7875
public static final Block CAMPHOR_LOG = register("camphor_log", RotatedPillarBlock::new, logProperties(MapColor.QUARTZ, MapColor.STONE, SoundType.WOOD), true);
79-
public static final Block CEDAR_LOG = register("cedar_log", RotatedPillarBlock::new, logProperties(MapColor.COLOR_BROWN, MapColor.COLOR_BROWN, SoundType.WOOD), true);
8076
public static final Block CRYSTALWOOD_LOG = register("crystalwood_log", RotatedPillarBlock::new, logProperties(MapColor.COLOR_PINK, MapColor.COLOR_BLACK, SoundType.WOOD), true);
81-
public static final Block DRY_LOG = register("dry_log", RotatedPillarBlock::new, logProperties(MapColor.SAND, MapColor.SAND, SoundType.WOOD), true);
82-
public static final Block BLUE_FIG_LOG = register("blue_fig_log", RotatedPillarBlock::new, logProperties(MapColor.COLOR_RED, MapColor.COLOR_RED, SoundType.WOOD), true);
8377
public static final Block FIRE_LOG = register("fire_log", RotatedPillarBlock::new, logProperties(MapColor.COLOR_RED, MapColor.COLOR_RED, SoundType.WOOD), true);
8478
public static final Block GUMBOAB_LOG = register("gumboab_log", RotatedPillarBlock::new, logProperties(MapColor.SAND, MapColor.STONE, SoundType.WOOD), true);
8579
public static final Block ICE_LOG = register("ice_log", RotatedPillarBlock::new, logProperties(MapColor.ICE, MapColor.ICE, SoundType.WOOD), true);
8680
public static final Block MAPLE_LOG = register("maple_log", RotatedPillarBlock::new, logProperties(MapColor.TERRACOTTA_PINK, MapColor.TERRACOTTA_PINK, SoundType.WOOD), true);
8781
public static final Block PALM_TREE_LOG = register("palm_tree_log", RotatedPillarBlock::new, logProperties(MapColor.COLOR_ORANGE, MapColor.COLOR_BROWN, SoundType.WOOD), true);
8882
public static final Block PALO_LOG = register("palo_log", RotatedPillarBlock::new, logProperties(MapColor.SAND, MapColor.SAND, SoundType.WOOD), true);
89-
public static final Block PETRIFIED_LOG = register("petrified_log", RotatedPillarBlock::new, logProperties(MapColor.STONE, MapColor.STONE, SoundType.WOOD), true);
9083
public static final Block POISONED_LOG = register("poisoned_log", RotatedPillarBlock::new, logProperties(MapColor.COLOR_GREEN, MapColor.COLOR_BLACK, SoundType.WOOD), true);
9184
public static final Block REDWOOD_LOG = register("redwood_log", RotatedPillarBlock::new, logProperties(MapColor.COLOR_BROWN, MapColor.COLOR_BROWN, SoundType.WOOD), true);
9285
public static final Block SALLOW_LOG = register("sallow_log", RotatedPillarBlock::new, logProperties(MapColor.DIRT, MapColor.DIRT, SoundType.WOOD), true);

0 commit comments

Comments
 (0)