diff --git a/src/main/java/ru/betterend/blocks/basis/EndDoorBlock.java b/src/main/java/ru/betterend/blocks/basis/EndDoorBlock.java index c8dbe648..797eb73d 100644 --- a/src/main/java/ru/betterend/blocks/basis/EndDoorBlock.java +++ b/src/main/java/ru/betterend/blocks/basis/EndDoorBlock.java @@ -19,8 +19,8 @@ import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; public class EndDoorBlock extends DoorBlock implements IRenderTypeable, BlockPatterned { - public EndDoorBlock(Block block) { - super(FabricBlockSettings.copy(block).nonOpaque()); + public EndDoorBlock(Block source) { + super(FabricBlockSettings.copyOf(source).strength(3F, 3F).nonOpaque()); } @Override diff --git a/src/main/java/ru/betterend/blocks/basis/EndLeavesBlock.java b/src/main/java/ru/betterend/blocks/basis/EndLeavesBlock.java index 483b877c..37bee30f 100644 --- a/src/main/java/ru/betterend/blocks/basis/EndLeavesBlock.java +++ b/src/main/java/ru/betterend/blocks/basis/EndLeavesBlock.java @@ -35,6 +35,7 @@ public class EndLeavesBlock extends LeavesBlock implements BlockPatterned, IRend .suffocates((state, world, pos) -> { return false; }) .blockVision((state, world, pos) -> { return false; }) .materialColor(color) + .breakByTool(FabricToolTags.HOES) .breakByTool(FabricToolTags.SHEARS)); this.sapling = sapling; } @@ -46,6 +47,7 @@ public class EndLeavesBlock extends LeavesBlock implements BlockPatterned, IRend .blockVision((state, world, pos) -> { return false; }) .materialColor(color) .luminance(light) + .breakByTool(FabricToolTags.HOES) .breakByTool(FabricToolTags.SHEARS)); this.sapling = sapling; } diff --git a/src/main/java/ru/betterend/blocks/basis/EndSignBlock.java b/src/main/java/ru/betterend/blocks/basis/EndSignBlock.java index f0f9b0f2..1b54a3c3 100644 --- a/src/main/java/ru/betterend/blocks/basis/EndSignBlock.java +++ b/src/main/java/ru/betterend/blocks/basis/EndSignBlock.java @@ -1,6 +1,8 @@ package ru.betterend.blocks.basis; import java.io.Reader; +import java.util.Collections; +import java.util.List; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.AbstractSignBlock; @@ -15,6 +17,7 @@ import net.minecraft.fluid.Fluids; import net.minecraft.item.DyeItem; import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; import net.minecraft.network.packet.s2c.play.SignEditorOpenS2CPacket; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.state.StateManager; @@ -53,7 +56,7 @@ public class EndSignBlock extends AbstractSignBlock implements BlockPatterned { private final Block parent; public EndSignBlock(Block source) { - super(FabricBlockSettings.copyOf(source).noCollision().nonOpaque(), SignType.OAK); + super(FabricBlockSettings.copyOf(source).strength(1.0F, 1.0F).noCollision().nonOpaque(), SignType.OAK); this.setDefaultState(this.stateManager.getDefaultState().with(ROTATION, 0).with(FLOOR, true).with(WATERLOGGED, false)); this.parent = source; } @@ -181,4 +184,9 @@ public class EndSignBlock extends AbstractSignBlock implements BlockPatterned { public BlockState mirror(BlockState state, BlockMirror mirror) { return (BlockState) state.with(ROTATION, mirror.mirror((Integer) state.get(ROTATION), 16)); } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + return Collections.singletonList(new ItemStack(this)); + } } \ No newline at end of file diff --git a/src/main/java/ru/betterend/blocks/basis/EndTrapdoorBlock.java b/src/main/java/ru/betterend/blocks/basis/EndTrapdoorBlock.java index 0351e4de..c8dbf0ed 100644 --- a/src/main/java/ru/betterend/blocks/basis/EndTrapdoorBlock.java +++ b/src/main/java/ru/betterend/blocks/basis/EndTrapdoorBlock.java @@ -20,7 +20,7 @@ import ru.betterend.patterns.Patterns; public class EndTrapdoorBlock extends TrapdoorBlock implements IRenderTypeable, BlockPatterned { public EndTrapdoorBlock(Block source) { - super(FabricBlockSettings.copyOf(source).nonOpaque()); + super(FabricBlockSettings.copyOf(source).strength(3.0F, 3.0F).nonOpaque()); } @Override diff --git a/src/main/java/ru/betterend/blocks/basis/EndWoodenButtonBlock.java b/src/main/java/ru/betterend/blocks/basis/EndWoodenButtonBlock.java index 97369b6c..d81f8dbc 100644 --- a/src/main/java/ru/betterend/blocks/basis/EndWoodenButtonBlock.java +++ b/src/main/java/ru/betterend/blocks/basis/EndWoodenButtonBlock.java @@ -16,11 +16,10 @@ import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.Patterns; public class EndWoodenButtonBlock extends WoodenButtonBlock implements BlockPatterned { - private final Block parent; public EndWoodenButtonBlock(Block source) { - super(FabricBlockSettings.copyOf(source).nonOpaque()); + super(FabricBlockSettings.copyOf(source).strength(0.5F, 0.5F).nonOpaque()); this.parent = source; } diff --git a/src/main/java/ru/betterend/world/generator/TerrainGenerator.java b/src/main/java/ru/betterend/world/generator/TerrainGenerator.java index 741f990c..14e116eb 100644 --- a/src/main/java/ru/betterend/world/generator/TerrainGenerator.java +++ b/src/main/java/ru/betterend/world/generator/TerrainGenerator.java @@ -106,9 +106,9 @@ public class TerrainGenerator { dist = dist > 1 ? dist : MHelper.max(dist, mediumIslands.getDensity(px, py, pz)); dist = dist > 1 ? dist : MHelper.max(dist, smallIslands.getDensity(px, py, pz)); if (dist > -0.5F) { - dist += noise1.eval(px * 0.01, py * 0.01, pz * 0.01) * 0.04; - dist += noise2.eval(px * 0.05, py * 0.05, pz * 0.05) * 0.02; - dist += noise1.eval(px * 0.1, py * 0.1, pz * 0.1) * 0.01; + dist += noise1.eval(px * 0.01, py * 0.01, pz * 0.01) * 0.02 + 0.02; + dist += noise2.eval(px * 0.05, py * 0.05, pz * 0.05) * 0.01 + 0.01; + dist += noise1.eval(px * 0.1, py * 0.1, pz * 0.1) * 0.005 + 0.005; } if (dist > 0) { LOCKER.unlock(); @@ -148,9 +148,9 @@ public class TerrainGenerator { dist = dist > 1 ? dist : MHelper.max(dist, mediumIslands.getDensity(px, py, pz)); dist = dist > 1 ? dist : MHelper.max(dist, smallIslands.getDensity(px, py, pz)); if (dist > -0.5F) { - dist += noise1.eval(px * 0.01, py * 0.01, pz * 0.01) * 0.04; - dist += noise2.eval(px * 0.05, py * 0.05, pz * 0.05) * 0.02; - dist += noise1.eval(px * 0.1, py * 0.1, pz * 0.1) * 0.01; + dist += noise1.eval(px * 0.01, py * 0.01, pz * 0.01) * 0.02 + 0.02; + dist += noise2.eval(px * 0.05, py * 0.05, pz * 0.05) * 0.01 + 0.01; + dist += noise1.eval(px * 0.1, py * 0.1, pz * 0.1) * 0.005 + 0.005; } if (dist > 0) { LOCKER.unlock();