From ef70376ed43fcd15ac0271d2650c3266b80b0c54 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 8 Nov 2020 02:03:23 +0300 Subject: [PATCH] Pillar model fix --- src/main/java/ru/betterend/blocks/basis/BlockPedestal.java | 2 +- src/main/java/ru/betterend/world/biome/BiomeShadowForest.java | 4 +++- .../assets/betterend/models/block/pedestal_column.json | 1 + .../assets/betterend/models/block/pedestal_column_top.json | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/basis/BlockPedestal.java b/src/main/java/ru/betterend/blocks/basis/BlockPedestal.java index 0144f293..fd14aa3b 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockPedestal.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockPedestal.java @@ -165,7 +165,7 @@ public class BlockPedestal extends BlockBaseNotFull implements BlockEntityProvid boolean hasPedestalOver = upState.getBlock() instanceof BlockPedestal; boolean hasPedestalUnder = downState.getBlock() instanceof BlockPedestal; if (direction == Direction.UP) { - upSideSolid = newState.isSideSolidFullSquare(world, posFrom, Direction.DOWN); + upSideSolid = newState.isSideSolidFullSquare(world, posFrom, Direction.DOWN) || newState.isIn(BlockTags.WALLS); hasPedestalOver = newState.getBlock() instanceof BlockPedestal; } else if (direction == Direction.DOWN) { hasPedestalUnder = newState.getBlock() instanceof BlockPedestal; diff --git a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java index 1e7f5154..51c2fce8 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java +++ b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java @@ -4,6 +4,7 @@ import net.minecraft.entity.EntityType; import net.minecraft.particle.ParticleTypes; 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.EndSounds; @@ -31,7 +32,8 @@ public class BiomeShadowForest extends EndBiome { .addFeature(EndFeatures.TAIL_MOSS) .addFeature(EndFeatures.TAIL_MOSS_WOOD) .addStructureFeature(ConfiguredStructureFeatures.END_CITY) - .addMobSpawn(EntityType.ENDERMAN, 80, 1, 4) + .addMobSpawn(EntityType.ENDERMAN, 40, 1, 4) + .addMobSpawn(EndEntities.SHADOW_WALKER, 80, 2, 4) .addMobSpawn(EntityType.PHANTOM, 1, 1, 2)); } } diff --git a/src/main/resources/assets/betterend/models/block/pedestal_column.json b/src/main/resources/assets/betterend/models/block/pedestal_column.json index c0a32d81..08a6dc5c 100644 --- a/src/main/resources/assets/betterend/models/block/pedestal_column.json +++ b/src/main/resources/assets/betterend/models/block/pedestal_column.json @@ -58,6 +58,7 @@ "to": [ 15, 16, 15 ], "faces": { "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, + "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#base", "cullface": "up" }, "north": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, "south": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, "west": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, diff --git a/src/main/resources/assets/betterend/models/block/pedestal_column_top.json b/src/main/resources/assets/betterend/models/block/pedestal_column_top.json index a733a08a..16722d25 100644 --- a/src/main/resources/assets/betterend/models/block/pedestal_column_top.json +++ b/src/main/resources/assets/betterend/models/block/pedestal_column_top.json @@ -33,6 +33,7 @@ "to": [ 15, 16, 15 ], "faces": { "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, + "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#base", "cullface": "up" }, "north": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, "south": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" }, "west": { "uv": [ 1, 14, 15, 16 ], "texture": "#base" },