From 734e75f8c878495141c38cc2706dc3029032f883 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 2 Apr 2024 16:25:28 +0100 Subject: [PATCH] Add proper item models and textures for the slime pustule and mysterious egg --- .../providers/UBlockStateModelGenerator.java | 4 ++-- .../unicopia/models/item/mysterious_egg.json | 16 ---------------- .../unicopia/textures/item/mysterious_egg.png | Bin 0 -> 6922 bytes .../unicopia/textures/item/slime_pustule.png | Bin 0 -> 6682 bytes 4 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 src/main/resources/assets/unicopia/models/item/mysterious_egg.json create mode 100644 src/main/resources/assets/unicopia/textures/item/mysterious_egg.png create mode 100644 src/main/resources/assets/unicopia/textures/item/slime_pustule.png diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java index d016daae..40fe766c 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java @@ -113,7 +113,7 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { registerHiveBlock(UBlocks.HIVE); registerRotated(UBlocks.CHITIN_SPIKES, BlockModels.SPIKES); registerHull(UBlocks.CHISELLED_CHITIN_HULL, UBlocks.CHITIN, UBlocks.CHISELLED_CHITIN); - registerParentedItemModel(UBlocks.SLIME_PUSTULE, ModelIds.getBlockSubModelId(UBlocks.SLIME_PUSTULE, "_pod")); + registerItemModel(UBlocks.SLIME_PUSTULE.asItem()); blockStateCollector.accept(VariantsBlockStateSupplier.create(UBlocks.SLIME_PUSTULE) .coordinate(BlockStateVariantMap.create(SlimePustuleBlock.SHAPE) .register(state -> BlockStateVariant.create().put(MODEL, ModelIds.getBlockSubModelId(UBlocks.SLIME_PUSTULE, "_" + state.asString()))))); @@ -176,7 +176,7 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { registerWithStages(UBlocks.FROSTED_OBSIDIAN, Properties.AGE_3, BlockModels.CUBE_ALL, 0, 1, 2, 3); registerWithStagesBuiltinModels(UBlocks.ROCKS, Properties.AGE_7, 0, 1, 2, 3, 4, 5, 6, 7); registerWithStagesBuiltinModels(UBlocks.MYSTERIOUS_EGG, PileBlock.COUNT, 1, 2, 3); - excludeFromSimpleItemModelGeneration(UBlocks.MYSTERIOUS_EGG); + registerItemModel(UBlocks.MYSTERIOUS_EGG.asItem()); FireModels.registerSoulFire(this, UBlocks.SPECTRAL_FIRE, Blocks.SOUL_FIRE); blockStateCollector.accept(createSingletonBlockState(UBlocks.JAR, BlockModels.TEMPLATE_JAR)); diff --git a/src/main/resources/assets/unicopia/models/item/mysterious_egg.json b/src/main/resources/assets/unicopia/models/item/mysterious_egg.json deleted file mode 100644 index 7c9548c9..00000000 --- a/src/main/resources/assets/unicopia/models/item/mysterious_egg.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "parent": "unicopia:block/mysterious_egg_stage1", - "gui_light": "side", - "display": { - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - } - } -} diff --git a/src/main/resources/assets/unicopia/textures/item/mysterious_egg.png b/src/main/resources/assets/unicopia/textures/item/mysterious_egg.png new file mode 100644 index 0000000000000000000000000000000000000000..bc1d9a42e705931098bcdc4d2c6f427fe60a6d93 GIT binary patch literal 6922 zcmeHMdt4J&7M@802?$jrR8)`<6oWPIfjk7uYm}&=1fznYWs*!F3Ivnztag1=)M!V(ag>>+beHL(a^dd(Zvu z_nmWQk{cFhq>m2tAK;H+SfC~?H51N#ka2wB7;&qU!Z6NOI!j~LXog`N=mSrjh2b7Q zyhodXGchLgSAq3~Hu6C>0QYg9mqL4>r(FYWfyW2Uk>U(25YFqsWYFfqc`KM@Vb@v* zpnV#Q;IJX)j8;K@W%iAWv?^CdDuErGX;Cyi4}6>6Cr*2gzIWCTE%ANBz2 z!bTjunh;U1Ce-$7N`^Mm!xu%yw?{jqhYp<4g_(xtdfEmyTENS_^IT^O)@RHp%_vw1 z1qcqEUt%d3$Jdwb>%(EQ*?xW;{{U`aK(Af_{rd*@=7tZ57!*DrEQ~i;G?d359u*cQ zP{a(ENC|?77^+H8%Hl^KUIC$jfuXXJU{djJ)G4XtsL^SfG2`_U zCQi!Ao@_MH=Dd8%bi1RZw5+_Ma{em|sunI<>|D93=C##pUawv2di$MCo43@xyLH#@ zhCP3IfA0q${`GL@%MA*FMQj2>GGAf_N(7r`^S&BZvXW2FL!>u zi*zBK-dC5h-{=YgT?`hB$zmg2IHL>+4`TU5N`3n#>DbiFV7_cFhnrlzapxhwD0$`& zAqLwS|7Qmi-wyc)lIB+Sp9!1yUn%Pr_E6UaEP#na@|Z!`^VqKsoPrIEKfrpMT+ZiC z#{YE_SEtX?kz5Q6zuc@N%hu2FT%xYW8GfTiM^+qtovR};WH~P9u(AFE*Bq~@CJS8e z6Y*_MLH*%B-<~dT?L8?!neTGm81Y*r9u^f>UCsfZ&;QY4GGE{0Rx=l5Q{3?Z5>(U@Zstb2iZyPBc>@2@=syr?p!4N3jq48@iZd# zBV?lPtJO|HolNy1*Klox^`w4vZ_KrUf^sq1CFfP3wnDt*wawl*rjsSE4(8Ve@ zadjEFC~ce{odVbVWEe?XwGQglX#af~_0EQYIk!&0ni~SI30&2+ry+Wcd5~**Pzq$W zs(k~ree))PivG2?VS(ZX2uc-r;gIQxO-I+k__*IeC{H`YIz_R3hUE+;S46JGob zELU9(Fm*v+K;LIga5#=iG8b0D@^oYfLjW%Hx+_o_Zy-vKDI?_S!L8AeQdE#8^GM*5 zc30q9vCy*?N@tV3K}SxXUaHrT_H{>-K(RS*wOjFTXmSD4YY!>o;auG~g9i_XVoe+U zE>LWmIcN&1?F(qe@9W1~M^AdjJI_z&&25B_p!t@RlnhNu3a{8^HCqa33@cwZyE-B5 zaAMez7tc;7hlStZwXWExK2MTiGeVphk=k#{z3I8Fu_WctD>LG2to-^DDiR3JD z^$V)aZrVPWZW(c)BdF#2)OmTozID$YP)9Do@oMFPD7qAiOqZQVTnz=~h8uIxLKz3ubt zd+YBnsCFIL*I2SPD$R&5S;0$A3ZKxN86o85W+kI?T3EZ0%el$eQFUon#EA6kEY3*gq{^cQ&#=rRHC9K%ouEEn z`-A+H6s46&K&wVGRX3WR;`p+JZhwk&aJ8A#L3-^?>Fy4E&j4BiV`H}wd98|fm$R33tx-e2{ zyU}JTc37-MJcLOZtR;>FJ|D(;UVeqeT5UIck=+voh=;hGDi%vc5^-UnxaSPJgDeFQ z5244-ulfPx0cw9G+9a)Iih+(n2g=?i%V<;ZaF5Sm@c3T!PO3{N*`GgeU zfkKdHDJ*u+f?z-5>9Cj|2I~=SXv8h2ClQ$5jr)kVSG(I8ytG<%s?}J6=xI_D_-K8# z$!fHi)b6HCNy()Ki9|@p$`nGvAf<&W31tvUOmZcmiZjL<i89FKQiV$HhB6t|qpY?<3essQr1EHSaZ#Ro00mr~l%YxB z%S4igJsAa*!weG=_~R@^CFKtX^p-+;yn{l~lq#e$i9#wNf3E8JaOchq=#X4h5MWr4+gEAe>ln?g+) zyCm4DQrhI^30Pf2#(b(MkA|m*r(C`LmdBKWOd(e(jM6xvLS={(5>lx_NSWmdp@N3` zh@)h2v69$F(d|~Vql~iANqG=Qh!vEld+W&)xDyrgsCQXDjj{j%6H4GMLjjY>)v;1f zz{G#NM5&TcN@)r-#VKS$LP8Nj1FbL!4N8@qAQVcojOwbK?g0Mp65X5bMFR^$Gd%9a-OqbZ%z*D7`SO(8AGrjN_jHjbitp2KJq_0rMc|2? zpH|n?a6M53p2+!Wb^YJM<^OQUNEg8uy)xJjP6S|db)nG7c4)LD`znjkJE-5Tuzelyd%<;0YLZ_0>84fM8RL_HOTYV`%X zF__)^VubF!*whauyQa-pdaLa=y`v#rT)uSFygQizFP$8G_2V_kpFHFnm;A>UuY^8RZ)U!**

RHGv5syn>$b9llh<{bGpWUbA%#dTE7K`^>2PZ z_1d1M8>jU3tBE-ShTVSa-Ttc&HJvTlxqJVo70ei=U=vfUZ3KD7h={GcJzQ|ps+ G=lu)2_dk{Z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/unicopia/textures/item/slime_pustule.png b/src/main/resources/assets/unicopia/textures/item/slime_pustule.png new file mode 100644 index 0000000000000000000000000000000000000000..e3111b434f00de6bf4716182c864187e29c52490 GIT binary patch literal 6682 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