From 31ec45a92d787a72001f01dded7a914e8f558ccc Mon Sep 17 00:00:00 2001 From: 0rc1nus Date: Sun, 24 Jul 2022 10:47:10 +0800 Subject: [PATCH] minor changes to shriekers --- .../entity/SculkShriekerBlockEntity.java | 3 +- .../blockstates/sculk_shrieker.json | 6 +- .../block/sculk_shrieker_can_summon.json | 10 +++ .../models/block/template_sculk_shrieker.json | 77 ++++++++++++++++++ .../sculk_shrieker_can_summon_inner_top.png | Bin 0 -> 724 bytes ...k_shrieker_can_summon_inner_top.png.mcmeta | 6 ++ .../block/sculk_shrieker_inner_top.png | Bin 1233 -> 729 bytes .../block/sculk_shrieker_inner_top.png.mcmeta | 4 +- 8 files changed, 100 insertions(+), 6 deletions(-) create mode 100644 common/src/main/resources/assets/wildbackport/models/block/sculk_shrieker_can_summon.json create mode 100644 common/src/main/resources/assets/wildbackport/models/block/template_sculk_shrieker.json create mode 100644 common/src/main/resources/assets/wildbackport/textures/block/sculk_shrieker_can_summon_inner_top.png create mode 100644 common/src/main/resources/assets/wildbackport/textures/block/sculk_shrieker_can_summon_inner_top.png.mcmeta diff --git a/common/src/main/java/com/cursedcauldron/wildbackport/common/blocks/entity/SculkShriekerBlockEntity.java b/common/src/main/java/com/cursedcauldron/wildbackport/common/blocks/entity/SculkShriekerBlockEntity.java index f80996e..5d72bae 100644 --- a/common/src/main/java/com/cursedcauldron/wildbackport/common/blocks/entity/SculkShriekerBlockEntity.java +++ b/common/src/main/java/com/cursedcauldron/wildbackport/common/blocks/entity/SculkShriekerBlockEntity.java @@ -10,6 +10,7 @@ import com.cursedcauldron.wildbackport.common.entities.warden.WardenSpawnHelper; import com.cursedcauldron.wildbackport.common.entities.warden.WardenSpawnTracker; import com.cursedcauldron.wildbackport.common.registry.WBBlockEntities; import com.cursedcauldron.wildbackport.common.registry.WBGameEvents; +import com.cursedcauldron.wildbackport.common.registry.entity.WBEntities; import com.cursedcauldron.wildbackport.common.tag.WBGameEventTags; import com.mojang.serialization.Dynamic; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; @@ -176,7 +177,7 @@ public class SculkShriekerBlockEntity extends BlockEntity implements VibrationHa } private boolean trySummonWarden(ServerLevel level) { - return this.warningLevel >= 4 && WardenSpawnHelper.trySpawnMob(EntityType.IRON_GOLEM, MobSpawnType.TRIGGERED, level, this.getBlockPos(), 20, 5, 6).isPresent(); + return this.warningLevel >= 4 && WardenSpawnHelper.trySpawnMob(WBEntities.WARDEN.get(), MobSpawnType.TRIGGERED, level, this.getBlockPos(), 20, 5, 6).isPresent(); } @Override diff --git a/common/src/main/resources/assets/wildbackport/blockstates/sculk_shrieker.json b/common/src/main/resources/assets/wildbackport/blockstates/sculk_shrieker.json index f2c437d..97d4bc1 100644 --- a/common/src/main/resources/assets/wildbackport/blockstates/sculk_shrieker.json +++ b/common/src/main/resources/assets/wildbackport/blockstates/sculk_shrieker.json @@ -1,10 +1,10 @@ { "variants": { - "shrieking=false": { + "can_summon=false": { "model": "wildbackport:block/sculk_shrieker" }, - "shrieking=true": { - "model": "wildbackport:block/sculk_shrieker" + "can_summon=true": { + "model": "wildbackport:block/sculk_shrieker_can_summon" } } } \ No newline at end of file diff --git a/common/src/main/resources/assets/wildbackport/models/block/sculk_shrieker_can_summon.json b/common/src/main/resources/assets/wildbackport/models/block/sculk_shrieker_can_summon.json new file mode 100644 index 0000000..4b90b91 --- /dev/null +++ b/common/src/main/resources/assets/wildbackport/models/block/sculk_shrieker_can_summon.json @@ -0,0 +1,10 @@ +{ + "parent": "wildbackport:block/template_sculk_shrieker", + "textures": { + "bottom": "wildbackport:block/sculk_shrieker_bottom", + "inner_top": "wildbackport:block/sculk_shrieker_can_summon_inner_top", + "particle": "wildbackport:block/sculk_shrieker_bottom", + "side": "wildbackport:block/sculk_shrieker_side", + "top": "wildbackport:block/sculk_shrieker_top" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/wildbackport/models/block/template_sculk_shrieker.json b/common/src/main/resources/assets/wildbackport/models/block/template_sculk_shrieker.json new file mode 100644 index 0000000..ded23e4 --- /dev/null +++ b/common/src/main/resources/assets/wildbackport/models/block/template_sculk_shrieker.json @@ -0,0 +1,77 @@ +{ + "parent": "block/block", + "textures": { + "bottom": "wildbackport:block/sculk_shrieker_bottom", + "side": "wildbackport:block/sculk_shrieker_side", + "top": "wildbackport:block/sculk_shrieker_top", + "inner_top": "wildbackport:block/sculk_shrieker_inner_top", + "particle": "wildbackport:block/sculk_shrieker_bottom" + }, + "elements": [ + { + "name": "bottom_slab", + "from": [0, 0, 0], + "to": [16, 8, 16], + "faces": { + "north": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "north"}, + "east": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "east"}, + "south": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "south"}, + "west": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "west"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#inner_top"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} + } + }, + { + "name": "top_slab", + "from": [1, 8, 1], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [1, 1, 15, 8], "texture": "#side"}, + "east": {"uv": [1, 1, 15, 8], "texture": "#side"}, + "south": {"uv": [1, 1, 15, 8], "texture": "#side"}, + "west": {"uv": [1, 1, 15, 8], "texture": "#side"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#top"} + } + }, + { + "name": "up", + "from": [1, 14.98, 1], + "to": [15, 14.98, 15], + "faces": { + "down": {"uv": [1, 1, 15, 15], "texture": "#top"} + } + }, + { + "name": "south", + "from": [1, 8, 14.98], + "to": [15, 15, 14.98], + "faces": { + "north": {"uv": [1, 1, 15, 8], "texture": "#side"} + } + }, + { + "name": "north", + "from": [1, 8, 1.02], + "to": [15, 15, 1.02], + "faces": { + "south": {"uv": [1, 1, 15, 8], "texture": "#side"} + } + }, + { + "name": "east", + "from": [14.98, 8, 1], + "to": [14.98, 15, 15], + "faces": { + "west": {"uv": [1, 1, 15, 8], "texture": "#side"} + } + }, + { + "name": "west", + "from": [1.02, 8, 1], + "to": [1.02, 15, 15], + "faces": { + "east": {"uv": [1, 1, 15, 8], "texture": "#side"} + } + } + ] +} diff --git a/common/src/main/resources/assets/wildbackport/textures/block/sculk_shrieker_can_summon_inner_top.png b/common/src/main/resources/assets/wildbackport/textures/block/sculk_shrieker_can_summon_inner_top.png new file mode 100644 index 0000000000000000000000000000000000000000..7109feb5c33baf255045f7be181c078f4ec99235 GIT binary patch literal 724 zcmV;_0xSKAP)Q3*gxf&m56MUB^lwJppLF!H*lWFHdzV_%g|NnvnbMMoh!1F z0ue%CHAPn<&-ytOptmDO>RVA*qtmu}9{n->9yxEbVl)Al$#3$^>?WWS(NTT55PQ$T zCJN{*jJpc+s=5MBBupAkCN`%hl9$SBX*{L!w>Q&|Z0Fy}gAqP)=-1#mDGxaI6Bi&N zE)O_eF{GRiQzmB1RV8EWRx$A)%Q`iOH=5x=v=c=^M5Pw(L}NxkrC|c^L{9;lX?PGh zD$5C%2T{zuWHUVQV(yu<%7ZK?iU%8bppIKp=<-10p3yk14>$*KC7!}56E%sVT{%)6 zluSIp{T`jroS733yyY{MyhFFGO<*E1v4#oJ3Ct#;0#hG&j`AEkLDiIb5Dg7uiuLGV z@fd;0mh!+$TV=$5;z7p5RUYuZh?KZI;Bq(PLdpZoK3xH?#P9&mzU-*?d4R=ba-g6& z6A#92OgPBdXzvTjn{kymXSy#$Z`U_7tql*>iV7x{%L5LXxrA)x0b@QaG$S5pWfq-O zn|OeQ#(%pnV9n^!IK3}06SA9Z*gs(5=q_z5Rbm2`y=uZX9wgh^T)wl*b#_V_9&D}5 zQXXU&^UMo*piXmd@myqi*FKK}9-%`XFbAT@r2PZ#WQ3_)_l4>wRzI=&iN%BJCsseP z`iaGZ>L*q|vHFSCPpp1o^%JX~SpCH6CsseP`iXz0pZEzs3q_$}AgXi#0000xWb8cHUhVV&dogipW!*v=s+K)49ULF`;?=Zo$3^7=H%xPN?@Zf@_U&Bf(B-rk?5 zz5T;^$nW}hnIm&muE`Ji$L`7LA}|^2Y89PGzzxS zA|84t(p$hFjj7~ax~San0Ily{<(`2%FF4yUc>>v{JW%)Pvnv5I9*nMZK1^M`5JjFElef{=3rSLicELHVy9<-}XEIwJ zU~Zgz34bc+c;Fh$Nj6sT0A0wgO?kjdGP{I4U_N^G81f*?mH$J2(9t<7x}vhr%U)TD z%Y!KS_M$T6fx6J`WboCts`w6yP{V^Yw~<$zx9p!;#+LISIY3L*q|vHFSCPpp1o^%JX~ oSpCH6CsseP`ia#~{CoYx59Kdx{zQc%F#rGn07*qoM6N<$f=0_>ng9R* delta 1214 zcmV;v1VQ`R1*nnK?2sr@>*J;*Pm$zKcelybRZ~||C#;)g2xpsFhzyJK)&A$Bjx_|uid4Klyo!j4k zzxEd|U%A;m-kXp4BJN^8?1Sg8w+Ogq=4&wyU}#nF!}ex>_7j^E8 z`;p%B12<0rI!h(^i=tU5=8DOadZ6X?X4KSLhV}G=3#e>QQJx~sCCKX^}B1nV` z5ES5`I)OL8IfB=`R(|;t8N}Fmr0l0Rey#;KUz>6P3gO!`}y0 zqpHT@^E3qov3rcMOWy&yUn~k38Blhu9;iho6dY7uUZzvlc^RN8!JD_$nwUz^CTiF1 z+JTgMz<)FMcS0<-sUF~ToW@sJVj?dSo9+gKI6&wDrQbCVez;G1;7ps;8$R-R{(oU| zGCsFM*eCtJpy)81jGn-6&;vc4r;-|b0Hi4>2(CO*or(i=dVqR0n9H2%fxY9?H8`l; zEfbtP6KSr!k7YV#otFW+5;{vIR87PLIyDB!pnnG(%*65cvXy3o9>7t9aa9|b2)-xc z9P>vBT&@F@dN5gQ1}ODF8>(iXvrhuJC0Gx+?JJO`yjBm;H0DAymU=TxfsIGVQ(+$m zP$GE-hoc7TWLiCdqjG_Lg38Owbjms}11yzLHPNgi4}+9?;K52BOhS0j>Va9XlGuo6 z_UyqK+{I%Q$r+r5+#{_dHVNLt^4AU4VogSvUZ?J!2ip(M22dKphwW;Oyu38Vtvw zj02Q|{TU^&gWXpET&BHCdeAirRy8?IL4QwC5X~q6m`K&kt8!qi9#rY71(lbV>6CR| z23RUVn~26;1B@o>80}i|pt3;^lmnbe1(=u!5+MTw1vscqAP&IGq#MbnMHa-&qz6^{ zDR`^DF1&xASp0pU2EfRGvTOA~Ei$3tpz`uEowCl$096Uzysg&6RDw29yKdJGq<_={ zp1HphVzEv20H@P`O(sIC&=0TzenObjms}19T;HmP)9ahzWFR43I$&IGBm!?`12^20ehI z2IHzWFcExD#5v}V61ZFkDD_~n);A1L>VY;?%|2(J`}c{B9>7t9buz6Uz)`utK0)Q> cWm;Y5|33>wp|930LI3~&07*qoM6N<$f@x1GDgXcg diff --git a/common/src/main/resources/assets/wildbackport/textures/block/sculk_shrieker_inner_top.png.mcmeta b/common/src/main/resources/assets/wildbackport/textures/block/sculk_shrieker_inner_top.png.mcmeta index e9b1851..304ede5 100644 --- a/common/src/main/resources/assets/wildbackport/textures/block/sculk_shrieker_inner_top.png.mcmeta +++ b/common/src/main/resources/assets/wildbackport/textures/block/sculk_shrieker_inner_top.png.mcmeta @@ -1,6 +1,6 @@ { "animation": { - "frametime": 3, + "frametime": 6, "interpolate": true } -} \ No newline at end of file +}