diff --git a/src/main/java/ru/betterend/blocks/BlockBulbVine.java b/src/main/java/ru/betterend/blocks/BlockBulbVine.java index 28961ca1..60373ba3 100644 --- a/src/main/java/ru/betterend/blocks/BlockBulbVine.java +++ b/src/main/java/ru/betterend/blocks/BlockBulbVine.java @@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; +import net.minecraft.world.WorldView; import ru.betterend.blocks.BlockProperties.TripleShape; import ru.betterend.blocks.basis.BlockVine; import ru.betterend.registry.EndBlocks; @@ -37,4 +38,10 @@ public class BlockBulbVine extends BlockVine { public boolean isFertilizable(BlockView world, BlockPos pos, BlockState state, boolean isClient) { return false; } + + @Override + public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { + boolean canPlace = super.canPlaceAt(state, world, pos); + return state.get(SHAPE) == TripleShape.BOTTOM ? canPlace : canPlace && world.getBlockState(pos.down()).isOf(this); + } } diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_vine_seed.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_vine_seed.json new file mode 100644 index 00000000..1cc4c628 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_vine_seed.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_wall_glow_inc" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/tenanea_flowers.json b/src/main/resources/assets/betterend/materialmaps/block/tenanea_flowers.json index 85e2efd1..ecb236ea 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/tenanea_flowers.json +++ b/src/main/resources/assets/betterend/materialmaps/block/tenanea_flowers.json @@ -3,11 +3,19 @@ "spriteMap": [ { "sprite": "betterend:block/tenanea_flowers", - "material": "betterend:glow_all" + "material": "betterend:wave_glow_all" }, { "sprite": "betterend:block/tenanea_flowers_bottom", - "material": "betterend:glow_all" + "material": "betterend:wave_glow_all" + }, + { + "sprite": "betterend:block/tenanea_flowers_stem", + "material": "betterend:waving" + }, + { + "sprite": "betterend:block/tenanea_flowers_stem_bottom", + "material": "betterend:waving" } ] } diff --git a/src/main/resources/assets/betterend/materialmaps/item/bulb_vine_seed.json b/src/main/resources/assets/betterend/materialmaps/item/bulb_vine_seed.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/item/bulb_vine_seed.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/silk_moth_nest_bottom.json b/src/main/resources/assets/betterend/models/block/silk_moth_nest_bottom.json index 538ec3e3..2c4d1990 100644 --- a/src/main/resources/assets/betterend/models/block/silk_moth_nest_bottom.json +++ b/src/main/resources/assets/betterend/models/block/silk_moth_nest_bottom.json @@ -11,14 +11,14 @@ { "__comment": "Box1", "from": [ 0, 0, 0 ], - "to": [ 16, 12, 16 ], + "to": [ 16, 13, 16 ], "faces": { "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "down" }, "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, - "north": { "uv": [ 0, 4, 16, 16 ], "texture": "#front", "cullface": "north" }, - "south": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#texture", "cullface": "east" } + "north": { "uv": [ 0, 3, 16, 16 ], "texture": "#front", "cullface": "north" }, + "south": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#texture", "cullface": "east" } } }, { diff --git a/src/main/resources/assets/betterend/textures/block/bushy_grass_1.png b/src/main/resources/assets/betterend/textures/block/bushy_grass_1.png index 510f8686..1cc50290 100644 Binary files a/src/main/resources/assets/betterend/textures/block/bushy_grass_1.png and b/src/main/resources/assets/betterend/textures/block/bushy_grass_1.png differ diff --git a/src/main/resources/assets/betterend/textures/block/bushy_grass_2.png b/src/main/resources/assets/betterend/textures/block/bushy_grass_2.png index 6eda0dff..16eea7cf 100644 Binary files a/src/main/resources/assets/betterend/textures/block/bushy_grass_2.png and b/src/main/resources/assets/betterend/textures/block/bushy_grass_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/silk_moth_nest_connect.png b/src/main/resources/assets/betterend/textures/block/silk_moth_nest_connect.png index 87943fac..4bedb5f4 100644 Binary files a/src/main/resources/assets/betterend/textures/block/silk_moth_nest_connect.png and b/src/main/resources/assets/betterend/textures/block/silk_moth_nest_connect.png differ diff --git a/src/main/resources/assets/betterend/textures/block/silk_moth_nest_side.png b/src/main/resources/assets/betterend/textures/block/silk_moth_nest_side.png index 9c2ac351..8d102301 100644 Binary files a/src/main/resources/assets/betterend/textures/block/silk_moth_nest_side.png and b/src/main/resources/assets/betterend/textures/block/silk_moth_nest_side.png differ