From 70f5e3e02457cc0e5dafea8fede12d05c0f26064 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 5 Nov 2020 18:39:19 +0300 Subject: [PATCH] Fixes --- .../java/ru/betterend/blocks/EternalPedestal.java | 1 - .../java/ru/betterend/blocks/basis/BlockVine.java | 2 +- .../blocks/entities/EternalPedestalEntity.java | 1 - .../blocks/entities/PedestalBlockEntity.java | 1 - .../java/ru/betterend/rituals/EternalRitual.java | 1 - .../ru/betterend/world/biome/BiomeMegalake.java | 2 -- .../betterend/world/biome/BiomeMegalakeGrove.java | 2 -- .../betterend/world/biome/BiomeShadowForest.java | 4 +++- .../structures/piece/PaintedMountainPiece.java | 14 ++++++++------ 9 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/EternalPedestal.java b/src/main/java/ru/betterend/blocks/EternalPedestal.java index 76e93022..b03bdcae 100644 --- a/src/main/java/ru/betterend/blocks/EternalPedestal.java +++ b/src/main/java/ru/betterend/blocks/EternalPedestal.java @@ -23,7 +23,6 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.explosion.Explosion; - import ru.betterend.blocks.basis.BlockPedestal; import ru.betterend.blocks.entities.EternalPedestalEntity; import ru.betterend.registry.EndBlocks; diff --git a/src/main/java/ru/betterend/blocks/basis/BlockVine.java b/src/main/java/ru/betterend/blocks/basis/BlockVine.java index 5e0a0940..a9f48599 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockVine.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockVine.java @@ -85,7 +85,7 @@ public class BlockVine extends BlockBaseNotFull implements IRenderTypeable, Fert protected boolean isSupport(BlockState state, WorldView world, BlockPos pos) { BlockState up = world.getBlockState(pos.up()); - return up.isOf(this) || up.isIn(BlockTags.LEAVES) || sideCoversSmallSquare(world, pos.up(), Direction.UP); + return up.isOf(this) || up.isIn(BlockTags.LEAVES) || sideCoversSmallSquare(world, pos.up(), Direction.DOWN); } @Override diff --git a/src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java b/src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java index e77776ed..0d15041f 100644 --- a/src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java @@ -4,7 +4,6 @@ import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - import ru.betterend.rituals.EternalRitual; public class EternalPedestalEntity extends PedestalBlockEntity { diff --git a/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java b/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java index 143feaba..c21e3a42 100644 --- a/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java @@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.util.Tickable; - import ru.betterend.registry.EndBlockEntities; public class PedestalBlockEntity extends BlockEntity implements Inventory, Tickable { diff --git a/src/main/java/ru/betterend/rituals/EternalRitual.java b/src/main/java/ru/betterend/rituals/EternalRitual.java index 380e7015..9d9f3bff 100644 --- a/src/main/java/ru/betterend/rituals/EternalRitual.java +++ b/src/main/java/ru/betterend/rituals/EternalRitual.java @@ -27,7 +27,6 @@ import net.minecraft.world.Heightmap; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.gen.feature.ConfiguredFeatures; - import ru.betterend.blocks.BlockProperties; import ru.betterend.blocks.EndPortalBlock; import ru.betterend.blocks.RunedFlavolite; diff --git a/src/main/java/ru/betterend/world/biome/BiomeMegalake.java b/src/main/java/ru/betterend/world/biome/BiomeMegalake.java index 5c323c4d..9be7cd58 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeMegalake.java +++ b/src/main/java/ru/betterend/world/biome/BiomeMegalake.java @@ -1,7 +1,6 @@ package ru.betterend.world.biome; import net.minecraft.entity.EntityType; -import net.minecraft.world.gen.feature.ConfiguredStructureFeatures; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndEntities; import ru.betterend.registry.EndFeatures; @@ -20,7 +19,6 @@ public class BiomeMegalake extends EndBiome { .setLoop(EndSounds.AMBIENT_MEGALAKE) .setSurface(EndBlocks.END_MOSS, EndBlocks.ENDSTONE_DUST) .addStructureFeature(EndStructures.MEGALAKE) - .addStructureFeature(ConfiguredStructureFeatures.END_CITY) .addFeature(EndFeatures.END_LOTUS) .addFeature(EndFeatures.END_LOTUS_LEAF) .addFeature(EndFeatures.BUBBLE_CORAL_RARE) diff --git a/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java b/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java index 91b1c3fa..eb8173a4 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java +++ b/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java @@ -1,7 +1,6 @@ package ru.betterend.world.biome; import net.minecraft.entity.EntityType; -import net.minecraft.world.gen.feature.ConfiguredStructureFeatures; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndEntities; import ru.betterend.registry.EndFeatures; @@ -22,7 +21,6 @@ public class BiomeMegalakeGrove extends EndBiome { .setLoop(EndSounds.AMBIENT_MEGALAKE_GROVE) .setSurface(EndBlocks.END_MOSS) .addStructureFeature(EndStructures.MEGALAKE) - .addStructureFeature(ConfiguredStructureFeatures.END_CITY) .addFeature(EndFeatures.LACUGROVE) .addFeature(EndFeatures.END_LOTUS) .addFeature(EndFeatures.END_LOTUS_LEAF) diff --git a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java index 1215a8e9..1e7f5154 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java +++ b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java @@ -12,7 +12,9 @@ public class BiomeShadowForest extends EndBiome { super(new BiomeDefinition("shadow_forest") .setFogColor(0, 0, 0) .setFogDensity(2.5F) - .setPlantsColor(122, 45, 122) + .setPlantsColor(45, 45, 45) + .setWaterColor(42, 45, 80) + .setWaterFogColor(42, 45, 80) .setSurface(EndBlocks.SHADOW_GRASS) .setParticles(ParticleTypes.MYCELIUM, 0.01F) .setLoop(EndSounds.AMBIENT_CHORUS_FOREST) diff --git a/src/main/java/ru/betterend/world/structures/piece/PaintedMountainPiece.java b/src/main/java/ru/betterend/world/structures/piece/PaintedMountainPiece.java index 1e7a52c4..48f7b0b5 100644 --- a/src/main/java/ru/betterend/world/structures/piece/PaintedMountainPiece.java +++ b/src/main/java/ru/betterend/world/structures/piece/PaintedMountainPiece.java @@ -101,7 +101,8 @@ public class PaintedMountainPiece extends BasePiece { int sz = chunkPos.getStartZ(); Mutable pos = new Mutable(); Chunk chunk = world.getChunk(chunkPos.x, chunkPos.z); - Heightmap map = chunk.getHeightmap(Type.WORLD_SURFACE_WG); + Heightmap map = chunk.getHeightmap(Type.WORLD_SURFACE); + Heightmap map2 = chunk.getHeightmap(Type.WORLD_SURFACE_WG); for (int x = 0; x < 16; x++) { int px = x + sx; int px2 = px - center.getX(); @@ -116,12 +117,13 @@ public class PaintedMountainPiece extends BasePiece { pos.setZ(z); dist = 1 - dist / r2; int minY = map.get(x, z); + pos.setY(minY - 1); + while (chunk.getBlockState(pos).isAir() && pos.getY() > 50) { + pos.setY(minY --); + } + minY = pos.getY(); + minY = Math.max(minY, map2.get(x, z)); if (minY > 56) { - pos.setY(minY - 1); - while (chunk.getBlockState(pos).isAir() && pos.getY() > 50) { - pos.setY(minY --); - } - float maxY = dist * height * getHeightClamp(world, 8, px, pz); if (maxY > 0) { maxY *= (float) noise1.eval(px * 0.05, pz * 0.05) * 0.3F + 0.7F;