diff --git a/src/main/java/ru/betterend/blocks/basis/BlockVine.java b/src/main/java/ru/betterend/blocks/basis/BlockVine.java index 1fb0b7fd..bb253297 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockVine.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockVine.java @@ -92,10 +92,10 @@ public class BlockVine extends BlockBaseNotFull implements IRenderTypeable, Fert return Blocks.AIR.getDefaultState(); } else { - if (world.getBlockState(pos.up()).getBlock() != this) - return state.with(SHAPE, TripleShape.TOP); - else if (world.getBlockState(pos.down()).getBlock() != this) + if (world.getBlockState(pos.down()).getBlock() != this) return state.with(SHAPE, TripleShape.BOTTOM); + else if (world.getBlockState(pos.up()).getBlock() != this) + return state.with(SHAPE, TripleShape.TOP); return state.with(SHAPE, TripleShape.MIDDLE); } } diff --git a/src/main/java/ru/betterend/registry/EndSounds.java b/src/main/java/ru/betterend/registry/EndSounds.java index d218b919..0686f6c2 100644 --- a/src/main/java/ru/betterend/registry/EndSounds.java +++ b/src/main/java/ru/betterend/registry/EndSounds.java @@ -17,6 +17,7 @@ public class EndSounds { public static final SoundEvent AMBIENT_CHORUS_FOREST = register("ambient", "chorus_forest"); public static final SoundEvent AMBIENT_MEGALAKE = register("ambient", "megalake"); public static final SoundEvent AMBIENT_DUST_WASTELANDS = register("ambient", "dust_wastelands"); + public static final SoundEvent AMBIENT_MEGALAKE_GROVE = register("ambient", "megalake_grove"); // Entity public static final SoundEvent ENTITY_DRAGONFLY = register("entity", "dragonfly"); diff --git a/src/main/java/ru/betterend/world/biome/BiomeMegalake.java b/src/main/java/ru/betterend/world/biome/BiomeMegalake.java index eabdc0f7..5c323c4d 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeMegalake.java +++ b/src/main/java/ru/betterend/world/biome/BiomeMegalake.java @@ -5,7 +5,6 @@ import net.minecraft.world.gen.feature.ConfiguredStructureFeatures; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndEntities; import ru.betterend.registry.EndFeatures; -import ru.betterend.registry.EndParticles; import ru.betterend.registry.EndSounds; import ru.betterend.registry.EndStructures; @@ -17,7 +16,6 @@ public class BiomeMegalake extends EndBiome { .setWaterColor(96, 163, 255) .setWaterFogColor(96, 163, 255) .setFogDensity(1.75F) - .setParticles(EndParticles.GLOWING_SPHERE, 0.0003F) .setMusic(EndSounds.MUSIC_MEGALAKE) .setLoop(EndSounds.AMBIENT_MEGALAKE) .setSurface(EndBlocks.END_MOSS, EndBlocks.ENDSTONE_DUST) diff --git a/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java b/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java index a170c441..d9edbdd0 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java +++ b/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java @@ -17,9 +17,9 @@ public class BiomeMegalakeGrove extends EndBiome { .setWaterColor(96, 163, 255) .setWaterFogColor(96, 163, 255) .setFogDensity(1.75F) - .setParticles(EndParticles.GLOWING_SPHERE, 0.0003F) + .setParticles(EndParticles.GLOWING_SPHERE, 0.001F) .setMusic(EndSounds.MUSIC_MEGALAKE) - .setLoop(EndSounds.AMBIENT_MEGALAKE) + .setLoop(EndSounds.AMBIENT_MEGALAKE_GROVE) .setSurface(EndBlocks.END_MOSS) .addStructureFeature(EndStructures.MEGALAKE) .addStructureFeature(ConfiguredStructureFeatures.END_CITY) diff --git a/src/main/java/ru/betterend/world/features/LacugroveFeature.java b/src/main/java/ru/betterend/world/features/LacugroveFeature.java index 4dc46d5a..b4bdf0e9 100644 --- a/src/main/java/ru/betterend/world/features/LacugroveFeature.java +++ b/src/main/java/ru/betterend/world/features/LacugroveFeature.java @@ -10,9 +10,7 @@ import net.minecraft.block.Material; import net.minecraft.client.util.math.Vector3f; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos.Mutable; -import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.MathHelper; import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; diff --git a/src/main/resources/assets/betterend/sounds.json b/src/main/resources/assets/betterend/sounds.json index a4934426..cff22d24 100644 --- a/src/main/resources/assets/betterend/sounds.json +++ b/src/main/resources/assets/betterend/sounds.json @@ -111,6 +111,15 @@ } ] }, + "betterend.ambient.megalake_grove": { + "category": "ambient", + "sounds": [ + { + "name": "betterend:ambient/megalake_grove", + "stream": false + } + ] + }, "betterend.entity.dragonfly": { "category": "entity", diff --git a/src/main/resources/assets/betterend/sounds/ambient/megalake_grove.ogg b/src/main/resources/assets/betterend/sounds/ambient/megalake_grove.ogg new file mode 100644 index 00000000..f788f804 Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/ambient/megalake_grove.ogg differ