diff --git a/src/main/java/ru/betterend/world/structures/piece/LakePiece.java b/src/main/java/ru/betterend/world/structures/piece/LakePiece.java index e895d9d3..10807b82 100644 --- a/src/main/java/ru/betterend/world/structures/piece/LakePiece.java +++ b/src/main/java/ru/betterend/world/structures/piece/LakePiece.java @@ -110,39 +110,50 @@ public class LakePiece extends BasePiece { pos.setY(maxY ++); } for (int y = maxY; y >= minY; y--) { - pos.setY(y - 1); + pos.setY(y); BlockState state = chunk.getBlockState(pos); if (state.getMaterial().isReplaceable() || state.isIn(EndTags.GEN_TERRAIN)) { - pos.setY(y); chunk.setBlockState(pos, y > 56 ? AIR : WATER, false); } else { - pos.setY(y); break; } } - pos.setY(MHelper.floor(minY - 1)); - if (pos.getY() == 57 && chunk.getBlockState(pos).isIn(EndTags.GEN_TERRAIN)) { - BlockState state = world.getBiome(pos.add(sx, 0, sz)).getGenerationSettings().getSurfaceConfig().getTopMaterial(); - chunk.setBlockState(pos, state, false); - } - if (pos.getY() < 57) { + maxY = MHelper.randRange(2, 3, random); + for (int i = 0; i < maxY; i++) { + pos.setY(pos.getY() - 1); BlockState state = chunk.getBlockState(pos); if (state.getMaterial().isReplaceable() || state.isIn(EndTags.GEN_TERRAIN)) { - state = EndBlocks.ENDSTONE_DUST.getDefaultState(); - if (pos.getY() == 56 && random.nextBoolean()) { - state = world.getBiome(pos.add(sx, 0, sz)).getGenerationSettings().getSurfaceConfig().getTopMaterial(); - } - chunk.setBlockState(pos, state, false); - pos.setY(pos.getY() - 1); - state = chunk.getBlockState(pos); - if (state.getMaterial().isReplaceable() || state.isIn(EndTags.GEN_TERRAIN)) { - chunk.setBlockState(pos, EndBlocks.ENDSTONE_DUST.getDefaultState(), false); + if (pos.getY() > 56) { + pos.setY(pos.getY() + 1); + state = chunk.getBlockState(pos); pos.setY(pos.getY() - 1); + if (state.getMaterial().isReplaceable()) { + state = world.getBiome(pos.add(sx, 0, sz)).getGenerationSettings().getSurfaceConfig().getTopMaterial(); + } + else { + state = EndBlocks.ENDSTONE_DUST.getDefaultState(); + } + chunk.setBlockState(pos, state, false); } - if (!chunk.getBlockState(pos).isIn(EndTags.GEN_TERRAIN)) { + else if (pos.getY() == 56) { + if (random.nextBoolean()) { + state = EndBlocks.ENDSTONE_DUST.getDefaultState(); + } + else { + state = world.getBiome(pos.add(sx, 0, sz)).getGenerationSettings().getSurfaceConfig().getTopMaterial(); + } + chunk.setBlockState(pos, state, false); + } + else { + chunk.setBlockState(pos, EndBlocks.ENDSTONE_DUST.getDefaultState(), false); + } + } + else { + if (state.getMaterial().isReplaceable()) { chunk.setBlockState(pos, Blocks.END_STONE.getDefaultState(), false); } + break; } } } diff --git a/src/main/resources/assets/betterend/textures/block/dragon_tree_sapling.png b/src/main/resources/assets/betterend/textures/block/dragon_tree_sapling.png new file mode 100644 index 00000000..cb108f2c Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/dragon_tree_sapling.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lacugrove_barrel_bottom.png b/src/main/resources/assets/betterend/textures/block/lacugrove_barrel_bottom.png new file mode 100644 index 00000000..57f24cab Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lacugrove_barrel_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lacugrove_barrel_side.png b/src/main/resources/assets/betterend/textures/block/lacugrove_barrel_side.png new file mode 100644 index 00000000..d77dab40 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lacugrove_barrel_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lacugrove_barrel_top.png b/src/main/resources/assets/betterend/textures/block/lacugrove_barrel_top.png new file mode 100644 index 00000000..0529d628 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lacugrove_barrel_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lacugrove_barrel_top_open.png b/src/main/resources/assets/betterend/textures/block/lacugrove_barrel_top_open.png new file mode 100644 index 00000000..ca4e88ad Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lacugrove_barrel_top_open.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lacugrove_crafting_table_bottom.png b/src/main/resources/assets/betterend/textures/block/lacugrove_crafting_table_bottom.png new file mode 100644 index 00000000..01872169 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lacugrove_crafting_table_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lacugrove_crafting_table_front.png b/src/main/resources/assets/betterend/textures/block/lacugrove_crafting_table_front.png new file mode 100644 index 00000000..f625d525 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lacugrove_crafting_table_front.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lacugrove_crafting_table_side.png b/src/main/resources/assets/betterend/textures/block/lacugrove_crafting_table_side.png new file mode 100644 index 00000000..12bbcf03 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lacugrove_crafting_table_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lacugrove_crafting_table_top.png b/src/main/resources/assets/betterend/textures/block/lacugrove_crafting_table_top.png new file mode 100644 index 00000000..204422e9 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lacugrove_crafting_table_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lacugrove_ladder.png b/src/main/resources/assets/betterend/textures/block/lacugrove_ladder.png new file mode 100644 index 00000000..86f9c8b2 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lacugrove_ladder.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lacugrove_sapling.png b/src/main/resources/assets/betterend/textures/block/lacugrove_sapling.png new file mode 100644 index 00000000..f5afde5f Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lacugrove_sapling.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/chest/lacugrove_chest.png b/src/main/resources/assets/betterend/textures/entity/chest/lacugrove_chest.png new file mode 100644 index 00000000..7496e98c Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/chest/lacugrove_chest.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/chest/lacugrove_chest_left.png b/src/main/resources/assets/betterend/textures/entity/chest/lacugrove_chest_left.png new file mode 100644 index 00000000..8ca31fec Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/chest/lacugrove_chest_left.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/chest/lacugrove_chest_right.png b/src/main/resources/assets/betterend/textures/entity/chest/lacugrove_chest_right.png new file mode 100644 index 00000000..cbe29ef2 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/chest/lacugrove_chest_right.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/sign/lacugrove_sign.png b/src/main/resources/assets/betterend/textures/entity/sign/lacugrove_sign.png new file mode 100644 index 00000000..3b1a7577 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/sign/lacugrove_sign.png differ diff --git a/src/main/resources/assets/betterend/textures/item/lacugrove_sign.png b/src/main/resources/assets/betterend/textures/item/lacugrove_sign.png new file mode 100644 index 00000000..e030f04b Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/lacugrove_sign.png differ