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 3ccfdf24..ec716062 100644 --- a/src/main/java/ru/betterend/world/structures/piece/LakePiece.java +++ b/src/main/java/ru/betterend/world/structures/piece/LakePiece.java @@ -7,6 +7,7 @@ import com.google.common.collect.Maps; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; +import net.minecraft.block.Material; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtHelper; import net.minecraft.structure.StructureManager; @@ -135,6 +136,7 @@ public class LakePiece extends BasePiece { for (int i = 0; i < maxY; i++) { pos.setY(pos.getY() - 1); BlockState state = chunk.getBlockState(pos); + //boolean isReplaceable = state.getMaterial().isReplaceable(); if (state.getMaterial().isReplaceable() || state.isIn(EndTags.GEN_TERRAIN)) { if (pos.getY() > 56) { chunk.setBlockState(pos, AIR, false); @@ -151,17 +153,36 @@ public class LakePiece extends BasePiece { state = world.getBiome(pos.add(sx, 0, sz)).getGenerationSettings().getSurfaceConfig().getTopMaterial(); } chunk.setBlockState(pos, state, false); + + state = world.getBiome(pos.add(sx, 0, sz)).getGenerationSettings().getSurfaceConfig().getUnderMaterial(); + int count = (int) (noise1.eval((pos.getX() + sx) * 0.1, (pos.getZ() + sz) * 0.1) + 2);//MHelper.randRange(1, 2, random); + for (int n = 0; n < count; n++) { + pos.setY(pos.getY() - 1); + chunk.setBlockState(pos, state, false); + } + break; } else { chunk.setBlockState(pos, EndBlocks.ENDSTONE_DUST.getDefaultState(), false); + + state = world.getBiome(pos.add(sx, 0, sz)).getGenerationSettings().getSurfaceConfig().getUnderMaterial(); + int count = (int) (noise1.eval((pos.getX() + sx) * 0.1, (pos.getZ() + sz) * 0.1) + 2);//int count = MHelper.randRange(1, 2, random); + for (int n = 0; n < count; n++) { + pos.setY(pos.getY() - 1); + chunk.setBlockState(pos, state, false); + } + break; } } - else { - if (state.getMaterial().isReplaceable()) { - chunk.setBlockState(pos, Blocks.END_STONE.getDefaultState(), false); + /*if (pos.getY() < 57 && !state.isIn(EndTags.GEN_TERRAIN)) { + state = world.getBiome(pos.add(sx, 0, sz)).getGenerationSettings().getSurfaceConfig().getUnderMaterial(); + int count = MHelper.randRange(2, 4, random); + for (int n = 0; n < count; n++) { + chunk.setBlockState(pos, state, false); + pos.setY(pos.getY() - 1); } break; - } + }*/ } } } diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_center.png b/src/main/resources/assets/betterend/textures/block/end_lotus_center.png index 8320a3b4..65f6fe98 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lotus_center.png and b/src/main/resources/assets/betterend/textures/block/end_lotus_center.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_center_2.png b/src/main/resources/assets/betterend/textures/block/end_lotus_center_2.png index c3322b9f..7b23cfba 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lotus_center_2.png and b/src/main/resources/assets/betterend/textures/block/end_lotus_center_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_center.png b/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_center.png index 202b1f56..ae465be9 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_center.png and b/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_center.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_corner.png b/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_corner.png index 5c0cb5da..e68f7ae9 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_corner.png and b/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_corner.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_cutout.png b/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_cutout.png index 55321b7d..3b53a2e9 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_cutout.png and b/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_cutout.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_side.png b/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_side.png index a585c176..27bdf56d 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_side.png and b/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_log_side.png b/src/main/resources/assets/betterend/textures/block/end_lotus_log_side.png index fb25861f..7bbf518c 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lotus_log_side.png and b/src/main/resources/assets/betterend/textures/block/end_lotus_log_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_log_top.png b/src/main/resources/assets/betterend/textures/block/end_lotus_log_top.png index 6fbd547a..267e273e 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lotus_log_top.png and b/src/main/resources/assets/betterend/textures/block/end_lotus_log_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_petal.png b/src/main/resources/assets/betterend/textures/block/end_lotus_petal.png index 823fe097..518f6cf4 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lotus_petal.png and b/src/main/resources/assets/betterend/textures/block/end_lotus_petal.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_petal_2.png b/src/main/resources/assets/betterend/textures/block/end_lotus_petal_2.png index 7bf0a60f..0f4df274 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lotus_petal_2.png and b/src/main/resources/assets/betterend/textures/block/end_lotus_petal_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_stem.png b/src/main/resources/assets/betterend/textures/block/end_lotus_stem.png index 9c2ca68c..eef33e17 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lotus_stem.png and b/src/main/resources/assets/betterend/textures/block/end_lotus_stem.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_stripped_log_top.png b/src/main/resources/assets/betterend/textures/block/end_lotus_stripped_log_top.png index af0391b7..8b6a668d 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lotus_stripped_log_top.png and b/src/main/resources/assets/betterend/textures/block/end_lotus_stripped_log_top.png differ