From 2ca8ef60aff2dbcc7f167af01366a821ab962ece Mon Sep 17 00:00:00 2001 From: Waterpicker Date: Thu, 10 Jun 2021 04:32:51 -0500 Subject: [PATCH] Mask Shards and updated limbo textures. --- .../org/dimdev/dimdoors/item/ModItems.java | 3 ++ .../resources/assets/dimdoors/lang/en_us.json | 1 + .../dimdoors/models/block/unfolded_block.json | 11 ++++- .../dimdoors/models/item/mask_shard.json | 6 +++ .../dimdoors/textures/block/decayed_block.png | Bin 528 -> 410 bytes .../textures/block/unfolded_block_down.png | Bin 0 -> 464 bytes .../textures/block/unfolded_block_east.png | Bin 0 -> 474 bytes .../textures/block/unfolded_block_north.png | Bin 0 -> 489 bytes .../textures/block/unfolded_block_south.png | Bin 0 -> 485 bytes .../textures/block/unfolded_block_up.png | Bin 0 -> 469 bytes .../textures/block/unfolded_block_west.png | Bin 0 -> 472 bytes .../textures/block/unravelled_block.png | Bin 417 -> 443 bytes .../textures/block/unravelled_fabric.png | Bin 370 -> 391 bytes .../textures/block/unwarped_block.png | Bin 439 -> 405 bytes .../dimdoors/textures/item/mask_shard.png | Bin 0 -> 447 bytes .../textures/item/rift_configuration_tool.png | Bin 360 -> 2278 bytes .../dimdoors/loot_tables/entities/mask.json | 39 ++++++++++++++++++ 17 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/dimdoors/models/item/mask_shard.json create mode 100644 src/main/resources/assets/dimdoors/textures/block/unfolded_block_down.png create mode 100644 src/main/resources/assets/dimdoors/textures/block/unfolded_block_east.png create mode 100644 src/main/resources/assets/dimdoors/textures/block/unfolded_block_north.png create mode 100644 src/main/resources/assets/dimdoors/textures/block/unfolded_block_south.png create mode 100644 src/main/resources/assets/dimdoors/textures/block/unfolded_block_up.png create mode 100644 src/main/resources/assets/dimdoors/textures/block/unfolded_block_west.png create mode 100644 src/main/resources/assets/dimdoors/textures/item/mask_shard.png create mode 100644 src/main/resources/data/dimdoors/loot_tables/entities/mask.json diff --git a/src/main/java/org/dimdev/dimdoors/item/ModItems.java b/src/main/java/org/dimdev/dimdoors/item/ModItems.java index 68ef1cec..6c6087bb 100644 --- a/src/main/java/org/dimdev/dimdoors/item/ModItems.java +++ b/src/main/java/org/dimdev/dimdoors/item/ModItems.java @@ -241,6 +241,9 @@ public final class ModItems { @RegistryEntry("solid_static") public static final Item SOLID_STATIC = create(ModBlocks.SOLID_STATIC); + @RegistryEntry("mask_shard") + public static final Item MASK_SHARD = create(new Item(new Item.Settings().group(DIMENSIONAL_DOORS))); + private static Item create(Block block) { return create(new BlockItem(block, (new Item.Settings()).group(DIMENSIONAL_DOORS))); } diff --git a/src/main/resources/assets/dimdoors/lang/en_us.json b/src/main/resources/assets/dimdoors/lang/en_us.json index 08dbdb04..0720d2b3 100644 --- a/src/main/resources/assets/dimdoors/lang/en_us.json +++ b/src/main/resources/assets/dimdoors/lang/en_us.json @@ -108,6 +108,7 @@ "item.dimdoors.dimensional_eraser.desc": "Erases entities", "item.dimdoors.monolith_spawner": "Monolith Spawner", "item.dimdoors.mask_wand": "Mask Wand", + "item.dimdoors.mask_shard": "Mask Shard", "dimdoors.virtualTarget.dimdoors.available_link": "Random", diff --git a/src/main/resources/assets/dimdoors/models/block/unfolded_block.json b/src/main/resources/assets/dimdoors/models/block/unfolded_block.json index c07b0b47..4d232723 100644 --- a/src/main/resources/assets/dimdoors/models/block/unfolded_block.json +++ b/src/main/resources/assets/dimdoors/models/block/unfolded_block.json @@ -1,4 +1,11 @@ { - "parent": "block/cube_all", - "textures": { "all": "dimdoors:block/unfolded_block" } + "parent": "block/cube", + "textures": { + "down": "dimdoors:block/unfolded_block_down", + "up": "dimdoors:block/unfolded_block_up", + "north": "dimdoors:block/unfolded_block_north", + "south": "dimdoors:block/unfolded_block_south", + "west": "dimdoors:block/unfolded_block_west", + "east": "dimdoors:block/unfolded_block_east" + } } diff --git a/src/main/resources/assets/dimdoors/models/item/mask_shard.json b/src/main/resources/assets/dimdoors/models/item/mask_shard.json new file mode 100644 index 00000000..b1d719fd --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/item/mask_shard.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "dimdoors:item/mask_shard" + } +} diff --git a/src/main/resources/assets/dimdoors/textures/block/decayed_block.png b/src/main/resources/assets/dimdoors/textures/block/decayed_block.png index 77c415bf10d0b67bfc299ea18e6f86056a2460b1..8d19e44c009670bb4ba35a17823a35d5af07e780 100644 GIT binary patch delta 384 zcmV-`0e}9G1eyboBYyw^b5ch_0Itp)=>Px$R7pfZR5*=glgp0fAPhuLVUzCJ-v9s4 zmIi}+K_Fzt5>i6qq8>({&nE$@M9bu?-aDCzyQ3kpBoTomBxj7k*N>R-E^+xcJsS}* zcgFmZnLq%EFU0dS0GAOt8`s`q`qSEe_gX4#w42rh0*H*=xPKVjXt?{9QX)H2;op)( zMC@j}>fT$d%#31Yl;ULOYt>R8IqqoW3wTwLK({;BZKNdHXpfu-K&+4!NVQ7Q-Q@1{ zL&9QW_ji-?UB3>HLhC^p2OUY6*=)QjFe5fIdIphw%5fue5YZ^TcZ%u@1jJ~uleszV zRr2;lqGTq2+j-B+m_PLka%S#kNO~E3%KSe+pk?50+pJ~g!|-`7i>BE{@15Q|5kUfd zMs#~Ic5{^wJadqljL|l&Gix(LWg52zYhAi3$3d@IKk2S2nhnQ5lR(Q(QGMS+Ged{| ev(`aNCM3Ujf$Us`oylGR0000(W$KH zcs!5}@9xCeGl9#eFznO0D4K7lxI*&X@d&vJ9k>9TwNj*NYk#Vh*LI11IGw2AZqX$! z)fwMZ6eUr`i^b=bAzi=AyDgMoE@HzLhCSYRv1I2n>FIbZA8w1|jh)BQS~TDEdp>t= zIp5NR28N69(s-+{HEp*$zFo`k5ao4rla%F|=-b^JWtr7e+LJMc)Z))$jcH&IT7B+7Ef$M^FkXvEMr&KgG0o<`S{9;ozn5ox;Xym@CNaaFK|47asU3#oF71yw?92U3uL!^ zsLI0fKq9a22ZXrs`0*jou9kLS10J&DgT!Aq^>9C|Z{dRvg>L^w$+;P{XBdiy;k`iE tCew1YBEt*?R1Rvuho1@D!TGXY(0WbcEP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00B5jL_t(I%WacMa>XDFL|+T| zKkHN__djPqQWiECJJE*H)EZjo^ZP5aJMIHXlv3EmN@4UtL?DTe`l9E!{MiQ)jwH{PW?z;?95DVpi1;<4Cq ze8r3$*a>)J;czDXw9Vu>o}_aO$FmgLJ>qGheaoXlyY+&w)MppL0%-kq#t&7Ldfd6l8WEVV>sBidwlPuSWLI zw(~#E#Vk`Fw}U$VM6OO+{g?ovsuG)XmsVb6=ATQ9?EC@+?cGK)!d1xt0000$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/dimdoors/textures/block/unfolded_block_east.png b/src/main/resources/assets/dimdoors/textures/block/unfolded_block_east.png new file mode 100644 index 0000000000000000000000000000000000000000..2d1e248de2e0204972ec218aeaa1e0a4cfdd2502 GIT binary patch literal 474 zcmV<00VV#4P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00BZtL_t(I%WadvcI+SwL$3^( z>H01D|KC}_dW!@?ruBvc#@>GNV{GRDB}fL9)%zzHzBn*Kn~Ol)&RJoYmN zP;EaBKZ`Sy#@``{;ClN`?N9~oeP;dwULs~|5Am@184WO$So#!hcdCxnAS7Ym;#7$v z&NIeoT|_V#3!u9b7hshH8~uLKTyKn6v}d!-0pXj$dGVOapompGZJzsOb0(R2+9(Mt zpMw+uh#D`Xpp=4+x(17<;B!$pTu@~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/dimdoors/textures/block/unfolded_block_north.png b/src/main/resources/assets/dimdoors/textures/block/unfolded_block_north.png new file mode 100644 index 0000000000000000000000000000000000000000..ff3bba7b8a5d2cd57d359078459843408c341ffd GIT binary patch literal 489 zcmVe zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00B`+L_t(I%WacUkHa7ggFh#* z-Shtc54{aY?tzw;>5x#R6r0#Fdc9tmnK&>2N!(Xv5)nN8LCa1=08q;hk&VIu3Sfr{ z!x=OH-s6J+GXo%U){TGG?8q6n8vzoi(&{oZDOH6}G$fIklRbhD?{!Ghy19QzE5H4N znXSV4a|t=Xss;L3^@x}qWG0y+b8JAz8H`2j2Y8IJ$u%=Wnr!tnD1sJk>tI?e+7M4CRncyn00000NkvXXu0mjfVP3_& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/dimdoors/textures/block/unfolded_block_south.png b/src/main/resources/assets/dimdoors/textures/block/unfolded_block_south.png new file mode 100644 index 0000000000000000000000000000000000000000..2967d55d96eda69d4d257ec5e917831ce594ee00 GIT binary patch literal 485 zcmVe zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00B)&L_t(I%WacOmgFD|1Va*3 z@2Bs7&uIgxUKki$HLQ3>sZXSAf4;vHpqkM#$xPNUGt7+4q!3(c`z`#1vQe0#i{~+O zg2GTEGieCRM6*EGU)&u(E1s2$1ta^T6U_LE*l}YFil@_Opu69Ju)n=0?lTTR65ewF zw#9jHSoh4tYWZLj5tN9)2$c7%C$t|OWUjWw=P728*)cP!8J7gW&$u3rNIA#+m!w9; z?SRr|2k$&2;TD7i(i#ie=oIz;!=eP<`Ym>+^=l_40*1&;e2hV+GsZYmKpRMRkR%{+ zHy|04hopNCG&gJ|sTN40nz4{A>sE(%;beOg2a8J$_fPT3XLV4_?j3Ne+e&~T(I?dR zL@#%mbnn5Uy~LU}u8QuCMh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/dimdoors/textures/block/unfolded_block_up.png b/src/main/resources/assets/dimdoors/textures/block/unfolded_block_up.png new file mode 100644 index 0000000000000000000000000000000000000000..6569bf41e3963aa5a99abc0908576f4ef2249a88 GIT binary patch literal 469 zcmV;`0V@89P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00BKoL_t(I%WacOmK-q%1cO99 z-rK(aJ?)lAFZ8LZ_OO%0OM(Q&&tJbSiAM0Z2DSl+2qXbeRWy>$e9ufoqv%KyRYk{0 zA|jX(gr|UQ-tGjDnT#_@Wp_s8n|DD6cL2{ zplHkrjUcy(eTv*kb$4_pbgs5C^Fi_{qJ2=b2Zh(teA*fjd?|@dTUApv#;I_p0#LT; zKz~ET^=}+BDVIU3@(ppLd;QX~&*B>xt~J`*g3K{}|35yrRSNzAE9cNgR5y|800000 LNkvXXu0mjfn!CM} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/dimdoors/textures/block/unfolded_block_west.png b/src/main/resources/assets/dimdoors/textures/block/unfolded_block_west.png new file mode 100644 index 0000000000000000000000000000000000000000..3a36c223f1993d7b9db0f2f078ad238a031b2724 GIT binary patch literal 472 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=De8Ak0{?)V>TT$X?><>&pI=jZ=(MV9n`wAwVI?64!_l=ltB<)VvY~=c3falGGH1 z^30M91$R&1fbd2>aRvrP2TvEr5R22flO4;BDDXJ%=b2e%``td{cEcT3Ma9g$iVjQC zy`A2Fw`MdFzMZ1Ru>M!0p}{wXz2!!e&;N2ftk7|RtwBYJ$hZ2OhZR{6RYFa*3*yMZW;Wx*6 z8-+uK99uJP{Jr*RR`=TtJ9L|rc*T8|zxuQ=K(9dZz+KPNv!j%)gV#;_J$1)no!b|9 zJHl_~{bOEnO`APiC_Uqv!&@LXUG1jS#Qtq*x$QgrAEobEY?Iz)x%ofq>l16-*lsxja7fXE#3~&Zd LS3j3^P6Px$bxA})R5*=glfi=AFbG4Rz@EA7rT_n( z+r$QXaN^BuIVHvdAz}Ub`YLnh?ar(sGI28^lZ?RJ0qAO^a_3E*5eL?L$IX~k0P8yf z5WT(k*{DfgV1Nu9g;Si8G(A+xhG=-Ff}5R=FS)cbEm8AqLP@$xj`Qcq$LPIlQ4JOj8r0N zGXde|8@NX6*nBAaeV)|i#_#C&mt*GI@K)CEo7n0^S?>qsh|2+9Po% zXH6pi*CHP_FCCmcXqAB6EZmIa0m#VhkX11=$*MKN>bz{LT!P-qk`b6S)P5{H=34QW zb?n~4=Dsbwi`>FxPV}(1_f7$$0xM%b7)i*C_I?4M8yolg|92M<9smFU delta 392 zcmV;30eAkp1EB+uBYy#CNkl8>6o4zDbg}&*$T+s&d%A?=FPk)^&Axp4)mHN6V#YYX0$fxZ^mS2fS^Y z!{3YkgCPeDuq?}q!~@Q<>{1|-qA1)v&qfLuRe&L3jYmOvK7XGUpa`%$1?mVuCNLf) zUJ2OmU4wL69T5X& zj|Uf+G)Q=NW`6?D`6*B*z!2iOC%qQrfni|^hhboE7RRxHH5ZECNr*w{`S2ewjcwby z*Xw0UP^C@)rHZw{#5^BJ04k}`R!3?$8uBsKu?{*j8_vv=aWCHg4ynL;O6oB7U<0hW m98H`$@Jp+h7!8zD{09MuHy%iw*?a&1002ovPDHLkU;%TBYyw^b5ch_0Itp)=>Px$K}keGR5*=olficEFbG4hz@EPK{Qrl( z)&{yroJ^Xq^0BZG2Mwc928_W@S8)j2uAW?td4OQH7*4cUF*DHHB9>ST8|`|1NNV}uuWlL>VEXI2IOC_M6DxiJ=hpr~Pm@JV00000 LNkvXXu0mjf45G4h delta 344 zcmV-e0jK_l1M&ipBYy!oNkl3`JvAo}!y@|JzekR2)ubjyUf^X`9^K zeA;T7ru*~x#I|kGG)-LB72G*vtEwu`$8n_ZzV8^vG3I%Wwr!({KlFVcI1vEuoY!?t z5ky(Qy>KB5BtbCuuIr+%>-6j6PIf@01trLo1BPM9or(lPZ-2afS%HT0JRcrCo5^bQ zbEisH3Q*P?5Xp)#6`BCsvMf*k2o*8`)xU>_kJkVM0NSO0gp2AJ03^>0SM2+q0r(Um zdGP{~DikCuWOj#Wt8$1bI8g^UEZ0~0eqwkeGA4(J5rftEwAcZ{&d5OQ*d754d{KWG zL6Z5Qz-Q&me^G&x0uIeA5Pcnk4S*|;ii?vrGwLWa8;6Gt*y8Uk(*N%jaG);H-BwHn q&vu&kfGo|-`fP(hL}-T(2mc2W1mCJ(H+K*K00000fhdy1C;}iBYyw^b5ch_0Itp)=>Px$Pf0{UR5*=olR=ilAPhslY%<;V{ugZs z)+`ce+8I`PV9B2;11^`!prRSfr9L@W@;>V+>k2IDDLJ*SNsCyMG@^99JE1u6TF=THyOc z^V>Gs+6R#&GLx2>h@{-l!i%JlylQ{9-}?f8t}3vPOX;^0ud#nDg>dRMvO>{|Bu}MtHrgd||v$0v;5R#T%%0sQ|z%#Na2*$}#QiNZFJjzrp z0+z~INo4|7nk{eK>gGQ{yx;FJGa^5-8=s6Hd4LGv!NpPb!mO-WA^*Ct(soo(reWbCQkFRu{Mb1@81&toz>{0000007*qo IM6N<$f>H~~BLDyZ diff --git a/src/main/resources/assets/dimdoors/textures/item/mask_shard.png b/src/main/resources/assets/dimdoors/textures/item/mask_shard.png new file mode 100644 index 0000000000000000000000000000000000000000..4506fb456326dd189f459593105325090f9e9439 GIT binary patch literal 447 zcmV;w0YLtVP)TR&=4=lbwv8 z(-v%e7lccNk|iK6*6I~u=SoGpI=fAHE(V6kuMZ!FueBY7i2!IEje1SQ*+O3SuKOmi z2SEI5Ff{k81RWBc2(+qTG z8Xgf_9mTH@oE`%JQf2mZnW*Vnc^{-t^z=hQAnRj;~~@`!(txbrW4{|g;N@t-Y2xN86a002ovPDHLkV1gc6!yNzs literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/dimdoors/textures/item/rift_configuration_tool.png b/src/main/resources/assets/dimdoors/textures/item/rift_configuration_tool.png index 528ece01c25946e526ff6ef20d0d8e363e0a5e71..8f0d03adb68f1dedc9f6cf1ae1d3ebf4eca90cd4 100644 GIT binary patch literal 2278 zcmV zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1bvaxE(k{AU%t1cU^FeSFys<2U9cZ$}z>Ui}< zR+n65%fvEY8csQJ&z^M-D3-_bJIGnQpCxPFx3$@BP{vX*Zef$H}4qLB1S~; zo=&V_mva*bnqlPm8`A&?jf0zC0lx3^m^WY<2>KP~2nVw*dyC@fm0P?LfHBXb-T6h@ zCTebFiQsGxV~7EP4aA-TS#?f{gk1zc8J0U1SAYO{?;4DB!W@82L>}R6tWjEXop-w* zQ~^Go11qpeoB@`INB*cpXo)42T#-Iis;{AHjWyNWT;nFq zx6ri3mRj!AkxHgZ_dRs&v8SE~a&7RC;YS!c;z%Pus2x=Qc>e-5I;gpY)SRaeYUov+ z8?7y9>WrV50Wl{8#C0Nogmx1%8%e}X=eXhQSfdjNwx#E z>6*D6NL0Xr)fZ6eve{>(FQfS(SbyO3z_emxR&dJBB~(2aJImQzKe%d7pyD~B!rBBf)~$RF+sb}l5Q@R1BV41L3b=59dt564l<>B?nSP<9;BVUEpz9m_uw)G>cli` zXS#CpljCcvu5mPe5H@uKTUuhorqy#`;ND}Uw=qz9FB)V=1D5_UE;9oQ!)b$BAYZYS z{hjKNSkIx| zNJ%;EU~U~f2u5&!JYg#PFlbxqx@SzR09A()taJ=Q(rg5xj_BPR(d9=S0)3t!CbvQe_FHZ@xT&EOC3f4X z1lk;*W?r1)fW*?8PB1faXse}}a~?ei7m#H2L^9?hc0wK6edYXUg2W!3Y>QI-ltxDx zW^kN@8)is#2z#F;)lpAr!0jcZvZWSMIZJAwbfp%UGqU}}+tcv45|lUBsQEJ(FlcF` zhJR0P07_8Y&Sjg}BiFJmpQ-hpOmvb-E}PAwGq-rc?NNo5>(SN1`O)f=(J9p~?DEd1V+>04h{Aecc5xnuJI*Eqz=Z~VP*d}Y{=Fg`$fc(5vZ&X~A6#@`77}|= z#HSWy`#5Z1HE%xtDkD&tO7F7u@rWny`b!qfs}ziI z&}(ONR=ZI zj@~X8+wueH7gINxxl z+qq=`tTqTGF;UE&%7;reqF;k9Q7DDg+5+fy2kCjjgdukiKlN&ze#BdzAT4bDegjisKIot98$X+|Df{lmf6;YwM5FW~gSjkLYipvo=Rg8WU80-znT9-?>6AnTtwp^c9socxLv2l#_JkctZt(Y3+ z?Qsa+7!7Txr_*GD0AFQza#Eu{IZ3hJq?pV0HX>FXhmCX|z$>XsEZ^m7u=OHf~ zo^%}~!2RcI6q=_1?72xEj!yGMx;WJ;BH==_$$Hae&rQ;ISu A&;S4c literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFO>_%)r2R7=#&*=dVZs3c7o` zIEHXs_w8-uWKiT`e*c=uzG*&Z%e(!zr7tEa6qsakUpsxRIH5merq=7W4cuWXZ;SU# zt-Y{ER``VHr2Z!gPnC2z=dS<7xJ8Wl=IjqYgn>q?mbgZgq$HN4S|t~y0x1R~14DCN z14CUy%Mc?YD-#PVQ!{M?Ln{LVWqqrMC>nC}Q!>*kacc-FYKjGFVDNPHb6Mw<&;$U{ C|7tb> diff --git a/src/main/resources/data/dimdoors/loot_tables/entities/mask.json b/src/main/resources/data/dimdoors/loot_tables/entities/mask.json new file mode 100644 index 00000000..e0cc8c11 --- /dev/null +++ b/src/main/resources/data/dimdoors/loot_tables/entities/mask.json @@ -0,0 +1,39 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 0.0, + "max": 1.0 + }, + "add": false + }, + { + "function": "minecraft:looting_enchant", + "count": { + "type": "minecraft:uniform", + "min": 0.0, + "max": 1.0 + } + } + ], + "name": "dimdoors:mask_shard" + } + ], + "conditions": [ + { + "condition": "minecraft:killed_by_player" + } + ] + } + ] +} \ No newline at end of file