diff --git a/src/generated/resources/data/growthcraft_apples/worldgen/placed_feature/apple_tree_placed.json b/src/generated/resources/data/growthcraft_apples/worldgen/placed_feature/apple_tree_placed.json index 5ef75870..9a8410ff 100644 --- a/src/generated/resources/data/growthcraft_apples/worldgen/placed_feature/apple_tree_placed.json +++ b/src/generated/resources/data/growthcraft_apples/worldgen/placed_feature/apple_tree_placed.json @@ -8,7 +8,7 @@ "distribution": [ { "data": 0, - "weight": 19 + "weight": 49 }, { "data": 1, diff --git a/src/generated/resources/data/growthcraft_cellar/worldgen/placed_feature/cork_tree_placed.json b/src/generated/resources/data/growthcraft_cellar/worldgen/placed_feature/cork_tree_placed.json index 4958234e..4c98ea37 100644 --- a/src/generated/resources/data/growthcraft_cellar/worldgen/placed_feature/cork_tree_placed.json +++ b/src/generated/resources/data/growthcraft_cellar/worldgen/placed_feature/cork_tree_placed.json @@ -8,7 +8,7 @@ "distribution": [ { "data": 0, - "weight": 19 + "weight": 49 }, { "data": 1, diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index 879ec692..7ef60e3e 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -30,8 +30,8 @@ "growthcraft_bamboo:bamboo_post_vertical", "growthcraft_bamboo:bamboo_post_horizontal", "growthcraft_milk:churn", - "growthcraft_milk:hanging_sign_1_oak", "growthcraft_milk:hanging_sign_2_spruce", + "growthcraft_milk:hanging_sign_1_oak", "growthcraft_milk:hanging_sign_2_oak", "growthcraft_milk:hanging_sign_1_spruce" ] diff --git a/src/main/java/growthcraft/apples/world/GrowthcraftApplesPlacedFeatures.java b/src/main/java/growthcraft/apples/world/GrowthcraftApplesPlacedFeatures.java index 05718010..1091a22b 100644 --- a/src/main/java/growthcraft/apples/world/GrowthcraftApplesPlacedFeatures.java +++ b/src/main/java/growthcraft/apples/world/GrowthcraftApplesPlacedFeatures.java @@ -28,7 +28,7 @@ public static void bootstrap(BootstapContext context) { HolderGetter> configuredFeatures = context.lookup(Registries.CONFIGURED_FEATURE); register(context, APPLE_TREE_PLACED_KEY, configuredFeatures.getOrThrow(GrowthcraftApplesConfiguredFeatures.APPLE_TREE_KEY), - VegetationPlacements.treePlacement(PlacementUtils.countExtra(0, 0.05F, 1), GrowthcraftApplesBlocks.APPLE_TREE_SAPLING.get())); + VegetationPlacements.treePlacement(PlacementUtils.countExtra(0, 0.02F, 1), GrowthcraftApplesBlocks.APPLE_TREE_SAPLING.get())); } private static ResourceKey createKey(String name) { diff --git a/src/main/java/growthcraft/cellar/world/GrowthcraftCellarPlacedFeatures.java b/src/main/java/growthcraft/cellar/world/GrowthcraftCellarPlacedFeatures.java index 1da5899b..d699c0b0 100644 --- a/src/main/java/growthcraft/cellar/world/GrowthcraftCellarPlacedFeatures.java +++ b/src/main/java/growthcraft/cellar/world/GrowthcraftCellarPlacedFeatures.java @@ -28,7 +28,7 @@ public static void bootstrap(BootstapContext context) { HolderGetter> configuredFeatures = context.lookup(Registries.CONFIGURED_FEATURE); register(context, CORK_TREE_PLACED_KEY, configuredFeatures.getOrThrow(GrowthcraftCellarConfiguredFeatures.CORK_TREE_KEY), - VegetationPlacements.treePlacement(PlacementUtils.countExtra(0, 0.05F, 1), GrowthcraftCellarBlocks.CORK_TREE_SAPLING.get())); + VegetationPlacements.treePlacement(PlacementUtils.countExtra(0, 0.02F, 1), GrowthcraftCellarBlocks.CORK_TREE_SAPLING.get())); } private static ResourceKey createKey(String name) { diff --git a/src/main/java/growthcraft/lib/block/GrowthcraftLogBlock.java b/src/main/java/growthcraft/lib/block/GrowthcraftLogBlock.java index 2c7975e0..209ceb86 100644 --- a/src/main/java/growthcraft/lib/block/GrowthcraftLogBlock.java +++ b/src/main/java/growthcraft/lib/block/GrowthcraftLogBlock.java @@ -15,6 +15,7 @@ import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.ToolAction; +import net.minecraftforge.common.ToolActions; public class GrowthcraftLogBlock extends RotatedPillarBlock { public GrowthcraftLogBlock() { @@ -51,7 +52,7 @@ public int getFireSpreadSpeed(BlockState state, BlockGetter level, BlockPos pos, //we could also do sub classes or our own map to match logs&stripped logs, but for 4 blocks, this should be enough @Override public @Nullable BlockState getToolModifiedState(BlockState state, UseOnContext context, ToolAction toolAction, boolean simulate) { - if (context.getItemInHand().getItem() instanceof AxeItem) { + if (context.getItemInHand().canPerformAction(ToolActions.AXE_STRIP)) { if(state.is(GrowthcraftApplesBlocks.APPLE_WOOD_LOG.get())) { return GrowthcraftApplesBlocks.APPLE_WOOD_LOG_STRIPPED.get().defaultBlockState().setValue(AXIS, state.getValue(AXIS)); } diff --git a/src/main/resources/assets/growthcraft_cellar/textures/block/cork/cork_leaves_opaque.png b/src/main/resources/assets/growthcraft_cellar/textures/block/cork/cork_leaves_opaque.png deleted file mode 100644 index 868c3fa2..00000000 Binary files a/src/main/resources/assets/growthcraft_cellar/textures/block/cork/cork_leaves_opaque.png and /dev/null differ diff --git a/src/main/resources/assets/growthcraft_cellar/textures/block/cork/cork_tree_leaves.png b/src/main/resources/assets/growthcraft_cellar/textures/block/cork/cork_tree_leaves.png index 4aaaf886..c7a8f32e 100644 Binary files a/src/main/resources/assets/growthcraft_cellar/textures/block/cork/cork_tree_leaves.png and b/src/main/resources/assets/growthcraft_cellar/textures/block/cork/cork_tree_leaves.png differ