From 6c01e8bcac8938b25483dd061e4483ce86123728 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 17 Dec 2020 14:39:29 +0300 Subject: [PATCH] Bulb vine fix --- .../ru/betterend/blocks/BlockBulbVine.java | 7 +++++++ .../materialmaps/block/bulb_vine_seed.json | 3 +++ .../materialmaps/block/tenanea_flowers.json | 12 ++++++++++-- .../materialmaps/item/bulb_vine_seed.json | 1 + .../models/block/silk_moth_nest_bottom.json | 10 +++++----- .../betterend/textures/block/bushy_grass_1.png | Bin 473 -> 1860 bytes .../betterend/textures/block/bushy_grass_2.png | Bin 494 -> 1893 bytes .../textures/block/silk_moth_nest_connect.png | Bin 1879 -> 362 bytes .../textures/block/silk_moth_nest_side.png | Bin 276 -> 1506 bytes 9 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_vine_seed.json create mode 100644 src/main/resources/assets/betterend/materialmaps/item/bulb_vine_seed.json 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 510f868698dc8c36b3fcfd5d4deacbb46f97dd59..1cc502900dcb49c127035d4fada7fbefa3702786 100644 GIT binary patch literal 1860 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 hm;i$0!P1Hl-2mS( literal 1879 zcmbVNeP|nH9KKo%S!ie3lr|gK<63aiUhXSNbH~y)Cao=)Si019D6Vhr-Xymscjw); zN$W;uOE>3VWgr9R7z{yWVy*b`hl7^2LsVQ5DXjRhRZwL9QP?OV+Q#?tWh>n*1}^vB z-Sa-r^ZU5po$ZM{UF|sFz%Z=3yDQX-&NbFyx1s;~dpUqkd$g{j28Qijw2q3`oAw^W zu!p~qqXXtZ_!&V|(=H&XG3d&sHH5~n!);j&h(plCV=y5req!yjIRcj@Khf_A(_t+L zlXBOX4v&mQqT<+)$V)_9D}FdDAc8bB0iI2#6hp}Ri9D}>*4Ax`!1EAu$WH_;L3|+G zg9lX|;vScm6d5;*x9~2;OY^L|8E0vxg`!(1h9hZ4puGae^oBZ%TIkA8 zBu!HjC@Pc5xH6ne)e{uM^E^ef6w8tbK^miq39_VOG?W-Z&=7T5Gi6o5Ek+PihfP0$ zoEAbzYh_x+D5eP|jLHIyVqCNpQXVLYWt=vwr}E;GNWm0LL&Y=@mMLSkq-v^0QoRp# z`SCUZl-h8(tg)k)bh<2Im>nZ1jABA|L>tjj4N|?(P=|F9c8nmK4OTRo5Y!EsOS3e|uq4wGWf;ND3LMi!a{^5lpkY;# za*Yk#57 zB~?Tm|EMx7?`3(GC!sGUk}=L5BV%#Y&Mb@A-J&q7YYL^I{#~{Fvn_L}1V_WpT9&6Qx+u?Ss32+`O<}^( z_ZEg#G&X*K^Pf}pPnu>93-(8TgL-g7Yb4!?Gv47?m*I4`MIR$IR>-|^H?7JIsV%0q#G_Kg@AKLe5 zrR2mMU7e?MKF|K2ryi;QQEYtta`nxt$!obQ{nX_CnxnQ;FJO-L53AbsR$oov_$wgr zW(EHC~X+G~1WAg_7KcMWG;S-!XULEgvKVDv{T{+|5SYG<|+NB38SNY8+ zzSZZ)Ui0g3qKWxLlD0n*W8Jkw+xJP*#ur|7j?G!ekxhdPc4&=cT0zt$8$HsBu)RPS zsFAuCn)2H3f5^adOnEkEK`SbehBwiP$xLUmYIhdwq9Y$U3`Sds69j}|&E|MK8jAN?TDz;B%zD3O~#kF znnS{x2$f=j8I7xy`h!4C4O9lDk_b!z9GLY&hc=UgZ@nR9%!n!LP=|`9D_Xv)X(+2B zLpuZw1Yr+qQO9%JA3_b3Dnc5LL*IKbRyFTi!8MqynBsV7m1`ZVT( zg?3#nEDKe_gyGO8m9i;wvooIOpjtlXWF4oV=-ACGHpxPzh+$TNSq);t)m<%L7`!i2 zdr<^;@ZR~t_a|bH7Z>)wnn#qJ$O<&!B|Kj3eo@Sj)BTn2fo>uoY>NapWm`m+ICB5k z`)UvLXqyefNk0+p9xS0QYvP!U)w#F+Pe!R+e^pdt&lL52E4z1ZRqg=J+ksf7eTZ+; zPDVoBzGB{|{(jTA&%4}wr94*My=T*3=hyuSq*ZY1&DrPZrz&>Wrng>vaDC6dA2j3U zy|MLoDuwx1CvVqQ+rQ`|56=bmw-<+>J++qC?sU-H%Fqep$#CdDc2`!n{`RtM++KdU YVZSt*+x5?m??fxDj8B&D9zAv8UyuRQ(*OVf delta 193 zcmV;y06zcX3zPzo7$yV*0002(-QrRJ0004VQb$4nuFf3k00004XF*Lt006O%3;baP zks(Ka!vFvd!vV){sAK>D0BuP`K~xyi9ga~EgE0t$QwOCt0Y5MW1qFjTDE_UC?FBCR zE(Cz|)Qt`Ex*4{io+gYRF(DA4#aPnb?Dekm0k2MlC!Xb*Tdk39ArjE+Rh(ON%J60c*xp)6T%bY72WcG