From 31dddf73a366e077447319585d4f91019ce82453 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 21 Feb 2019 12:36:07 +0200 Subject: [PATCH] Added some more structures --- .../unicopia/structure/CloudDungeon.java | 15 ++++++++------- .../unicopia/structure/GroundDungeon.java | 16 +++++++++------- .../unicopia/structures/cloud/island_tiny.nbt | Bin 0 -> 847 bytes .../structures/ground/temple_with_book.nbt | Bin 1213 -> 1218 bytes .../structures/ground/temple_without_book.nbt | Bin 0 -> 647 bytes .../structures/ground/wizard_tower_red.nbt | Bin 0 -> 12809 bytes 6 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 src/main/resources/assets/unicopia/structures/cloud/island_tiny.nbt create mode 100644 src/main/resources/assets/unicopia/structures/ground/temple_without_book.nbt create mode 100644 src/main/resources/assets/unicopia/structures/ground/wizard_tower_red.nbt diff --git a/src/main/java/com/minelittlepony/unicopia/structure/CloudDungeon.java b/src/main/java/com/minelittlepony/unicopia/structure/CloudDungeon.java index 055ee101..ca9c7b45 100644 --- a/src/main/java/com/minelittlepony/unicopia/structure/CloudDungeon.java +++ b/src/main/java/com/minelittlepony/unicopia/structure/CloudDungeon.java @@ -13,8 +13,11 @@ import net.minecraft.world.gen.structure.template.TemplateManager; public class CloudDungeon extends TemplateBasedFeature { - private static final ResourceLocation TEMPLE = new ResourceLocation(Unicopia.MODID, "cloud/temple_small"); - private static final ResourceLocation HOUSE = new ResourceLocation(Unicopia.MODID, "cloud/house_small"); + private static final ResourceLocation[] VARIANTS = new ResourceLocation[] { + new ResourceLocation(Unicopia.MODID, "cloud/temple_small"), + new ResourceLocation(Unicopia.MODID, "cloud/house_small"), + new ResourceLocation(Unicopia.MODID, "cloud/island_small") + }; public CloudDungeon() { } @@ -26,11 +29,9 @@ public class CloudDungeon extends TemplateBasedFeature { @Override public boolean addComponentParts(World world, BlockPos startPos, TemplateManager templates, PlacementSettings placement) { - if (world.rand.nextBoolean()) { - applyTemplate(world, startPos, templates, placement, TEMPLE); - } else { - applyTemplate(world, startPos, templates, placement, HOUSE); - } + int index = world.rand.nextInt(VARIANTS.length); + + applyTemplate(world, startPos, templates, placement, VARIANTS[index]); return true; } diff --git a/src/main/java/com/minelittlepony/unicopia/structure/GroundDungeon.java b/src/main/java/com/minelittlepony/unicopia/structure/GroundDungeon.java index e056bde4..868fc8b0 100644 --- a/src/main/java/com/minelittlepony/unicopia/structure/GroundDungeon.java +++ b/src/main/java/com/minelittlepony/unicopia/structure/GroundDungeon.java @@ -12,8 +12,12 @@ import net.minecraft.world.gen.structure.template.TemplateManager; public class GroundDungeon extends TemplateBasedFeature { - private static final ResourceLocation TOWER = new ResourceLocation(Unicopia.MODID, "ground/tower"); - private static final ResourceLocation TEMPLE_1 = new ResourceLocation(Unicopia.MODID, "ground/temple_with_book"); + private static final ResourceLocation[] VARIANTS = new ResourceLocation[] { + new ResourceLocation(Unicopia.MODID, "ground/tower"), + new ResourceLocation(Unicopia.MODID, "ground/temple_with_book"), + new ResourceLocation(Unicopia.MODID, "ground/temple_without_book"), + new ResourceLocation(Unicopia.MODID, "ground/wizard_tower_red") + }; public GroundDungeon() { } @@ -25,11 +29,9 @@ public class GroundDungeon extends TemplateBasedFeature { @Override public boolean addComponentParts(World world, BlockPos startPos, TemplateManager templates, PlacementSettings placement) { - if (world.rand.nextBoolean()) { - applyTemplate(world, startPos, templates, placement, TOWER); - } else { - applyTemplate(world, startPos, templates, placement, TEMPLE_1); - } + int index = world.rand.nextInt(VARIANTS.length); + + applyTemplate(world, startPos, templates, placement, VARIANTS[index]); return true; } diff --git a/src/main/resources/assets/unicopia/structures/cloud/island_tiny.nbt b/src/main/resources/assets/unicopia/structures/cloud/island_tiny.nbt new file mode 100644 index 0000000000000000000000000000000000000000..3633eb315177185c9e22b3a19971f2bacbb5dd19 GIT binary patch literal 847 zcmb2|=3sz;-dhLrE<1>{KAb(%+SpT|iPfJe=`yc$OG`^Yc+SMxyVhP+>5~!XoHxz= zpys@w){XD&gG9Fe%sFrC>$h}Q_Qa_#HvSB)7PPdTcG$VyJ?iA9d*6NUUvalwJN3xw z+}%6v*R|`{tv~vH{jaGl=WF-==AQOwR(9pq>~CL}t)L&fxH2Qd`gZV!kDk zfZMU3Yk?}b(pJ?!gPLzJ{mD&-{}Djbm=_;tX`1;;UVDCV@xAs*#teUxpC(Jf-SMet z0ZmVNoT$%jF$=`YZy`|Z=#ZDjz8A{+Kz z{`{c?Uz;em<-aEPffDnHJ-_WQUIBv?V-7x~gZ zwVxg4P$dJ-8GD#sOv4^l(TK2ud5$~nRsQKPyJ_GEiWe^Fp4y*kV-RJqv}Vm`u=iXc z-a~lgb2KEvKtT`mFVo}$^HS%WJ$2k@U4qx&97$F+2H{4}1ih2bnURBi$)ZTFHFCdp zZ<~De>9${y<@xvbM|)a@+}`#6_2t;w*weo@W%HMo?|NZm-)f?YAI) zb?o2!y8o7o$Nj5bm}O;Y9sMh?)OYK9Rk>AXYis|O+?d^7yE&8Jw{+vpZT#2o%l|){ z@asjQ@$Rf_xxc@HZ{NKpzk1)Vu=3-}?(*+9od3-{& F0RTw#ma_l= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/unicopia/structures/ground/temple_with_book.nbt b/src/main/resources/assets/unicopia/structures/ground/temple_with_book.nbt index 5efbe6c843dd712f8bd9a6ce5554ef406a748c22..cb7710303dd31bd829b8d20d846f33289e2a3d12 100644 GIT binary patch literal 1218 zcmb2|=3sz;r89iMiD@)dTX_rpVxmo1&%Bpj6 zkJZL>Tff^=xP^q&Rrq8qntm{FD89?FEO2a+mSlcr(Q27c((z3-?*R%-wWF(ZXce&ujALHCqW>yv7n%?(UV}Cx6s=UZ$DP z*%_UI`B`fpee>{t;l=tw?R3TC+!N8FFPP1q6l^}v8eaJPtD^Por#cszXG~%UKUv*p zBetpdPTJhZ%=3<>xn6vjckbByz4spPv@B1*_>@y#>Z|;cIpx#W7Tmq)!@D%fZEsC$ zm5Te{#s`tlJ{*${|9G44{YjOH%h`RtSh5u4`p@YRGCp*xvv%G44JtQ1k8ON0d)566 z&!v%@R8ucaU4H0Tcf#76=azVt>bMqbxI6jp+n1J}x7%rkm{aa-W7`eVN##kU(>vd7 zoAmP90j0>4ndSR;f8O|(@lIZ0>gy9{Z!p#yb&0-b3*~sMcSovohw|kaYtuFTCvBT@ z+;qjA>0wT(S^azdetEq1#dCeTs;jo_8#bMfG&9(`EWq04&h2gezb^OQ|M%CizEsLF zb<_2;`8v_}pWEiTO4+bn>IwZ2#c=ie(dtu6Zt`|`o_L~UwE4}En5)byXNFFEzG-XS z_wOfHUFW~7ce%#ckk9a7R>0=O?A#30KHo9DIl2>Q> z@A<*!rV6?pNX+MK0(!#$LkZ9AdjQLmWIeHkE1#+$S9e#tA17NumA}N`$%ym%RT;j?D{CM{$&jj2)BF;Z+& zhgXf-6ePM5lvp0uytw=Z zF5OgU_XS0DvGb1!3N;bOS~y_p_q;lN`Zx}*O7iVL?+>36k`HR(KMnLU(D*-(FGJkl z^O;T8^1UPD<}=cEXYJaQzPPj&t_nz0ww=J0wYH^qXVvGq+p{)I+SHPL_O0j%FWFbR zs=@2t+)Wh?^PAB%^Fo2LwAV^@_q!3RZnPAam#sb=@u4rtcJI7QO$#0F4U;4ctgUwM zk=ZlnXUdT&cJ`<8lWG``{Wm|b)BM1jNuP`69L+M+lijd{ed@L=QGCy*t@KGcyXa2j ziVK0$Hhkkg_{G9>>t!9!zF%FbH=izj@wCL+N^;HNTYVw5`_7vDzHraeEAgM@d5_Ki YrPF@L&yqg3{}=z)sgIX$5@TQh0N_zdE&u=k literal 1213 zcmYjMeK->c9QHi9jN|cnXFk`)X;(bA+tB1=YMZai@RUfz7>UHN)>%Z`gi)53!X-M< z$6+^4*_ksFZZpYk#SEjFe1v!`i4Oha_t*RTc;Daqf*1geuT?V?kZgf9(O7I*?q>TB z)BZ|PWFt==1q8D^S$^}jI@*2=ZN2aVH8GU)4S%|FT{rF=ay(XD@EzF>7`0!&gOn8?AzR#FpxerP;Q2AhBneLL@_h2^d?(kf@=y%Kd(~8{J zkN^@7*Ouw;E*V_H^j0tay{sT*$(EToqm2)tb!-~ISzof|$R=Y@#4*`A#CNrX5n41~ zKQ{MnB##g>OQ?%HV0xqTVoT(-8-jgOej#k%7K)1*uA-ia#h?N!`cPvBiyP@`}l-n!{EFOpOasz?I$ zGKs!nxa^CQZW*YnQ>vN4k=rhXbq+n!Y8~!*NqApO5=~hBG*&&z33wcwTtPtN-{PWO z1$z^Z2na9h|G-!$p?j?@1FN>$=-_|_>EP&}U z^+l;+js$E)an7mHDkOMP>l7@#&-!LrD}WzJ!ygo-dSnG+#3oF{A48ymyv~z%l$U$# zYg>_7FieDQP{?mpfUOznY=>e0K5sWFDHo!98ZULHS}y5I&F(0z3XI{)?5H=az`(Vt)@{mm%L_s8 zR&EAoupk-D;;oQ?PQw>!JXBQ-25jqXKiJ{z)5QXFVV37cqVhZlc^W z;CLYg1Cp9ug_+=y{EwU3N@MsA8Xb4)r!?`O&TiZ8G+0|?5zAg097hbeG-c#JD_-*k zjU{(@*%_THv>%&qsgesxc4=yvr?ImbYyEBPcpNh!$*#6DRK?a)jpZlTuy0bs3q@3Z z{15nu>>>ewVnrems-N8b=^^A$X|1wc9GK1cVlfT}Ms3>gC7FgQA#n&}YZJfH{PW?6 z(1$@?W!}#@P3T%Imx6kpX~5tJI2t)sO(@TQv6ENSjgR2_r1D=Sx9{PB^HVwPa*VfAs+w~s#d=^_vFF{ZXh z*XM0iw&Xt>ac)-P0geg%tdEY|^GJIX@P>au{j(lM9%eU&WJYI0^#%M}cbOb+5IhiZ z;7HunSC^ntj>UGy3&MFXtS$z6qhVu1XYGooYa~I|FdSo2`?fG_dK$~jf)oEUU!pkOcPDr-fI2p)#K;>lDd5BJ}Cb9CVC>tb@lC4Ha}L?x^7x> zG(P-kp8N~nz1pWY#Qr~ZS}XsMu4mnjxy!fju6h4nt6YBHm4$bzXK`)NkcwD8f7ev` zb=v=Jc4^JI_T1bss^Rf}Hj9;vkN&)Vz324m#F(4A9?iStE9tcJ_1{@vEW^Z~{!M7V zR{GFPzp3@{!kfDvbS3=_*tzT7wEesF^3&(5hnIZbyGHJhx%eIb_^XvW^ZymUODX;r XKl^e0)!BCcU&t3^naz|GW?%pSvneuC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/unicopia/structures/ground/wizard_tower_red.nbt b/src/main/resources/assets/unicopia/structures/ground/wizard_tower_red.nbt new file mode 100644 index 0000000000000000000000000000000000000000..9084894014c0524be82aac7c240de3ad1aee3dcb GIT binary patch literal 12809 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