From 7f923d7f25b22fcfe7724333ca71d1b17271b229 Mon Sep 17 00:00:00 2001 From: shartte Date: Sun, 14 Aug 2016 13:28:03 +0200 Subject: [PATCH] Added a powered state for the crystal growth accelerator and added corresponding models. (#39) --- .../misc/BlockQuartzGrowthAccelerator.java | 23 ++++++++++++++++++ .../tile.BlockQuartzGrowthAccelerator.json | 6 +++++ ...tile.BlockQuartzGrowthAccelerator.off.json | 8 ++++++ .../tile.BlockQuartzGrowthAccelerator.on.json | 8 ++++++ .../tile.BlockQuartzGrowthAccelerator.json | 3 +++ .../blocks/BlockQuartzGrowthAccelerator.png | Bin 0 -> 646 bytes .../blocks/BlockQuartzGrowthAcceleratorOn.png | Bin 0 -> 1573 bytes .../BlockQuartzGrowthAcceleratorOn.png.mcmeta | 11 +++++++++ .../BlockQuartzGrowthAcceleratorSide.png | Bin 0 -> 655 bytes .../BlockQuartzGrowthAcceleratorSideOn.png | Bin 0 -> 1409 bytes ...ckQuartzGrowthAcceleratorSideOn.png.mcmeta | 11 +++++++++ 11 files changed, 70 insertions(+) create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockQuartzGrowthAccelerator.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.off.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.on.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockQuartzGrowthAccelerator.json create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAccelerator.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png.mcmeta create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSide.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png.mcmeta diff --git a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java index 64f5bac97..3f1dbd7f3 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java +++ b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java @@ -24,10 +24,13 @@ import java.util.Random; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; @@ -41,12 +44,32 @@ import appeng.util.Platform; public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock { + + private static final PropertyBool POWERED = PropertyBool.create( "powered" ); + public BlockQuartzGrowthAccelerator() { super( Material.ROCK ); this.setSoundType( SoundType.METAL ); this.setTileEntity( TileQuartzGrowthAccelerator.class ); this.setFeature( EnumSet.of( AEFeature.Core ) ); + this.setDefaultState( getDefaultState().withProperty( POWERED, false ) ); + } + + @Override + public IBlockState getActualState( IBlockState state, IBlockAccess world, BlockPos pos ) + { + TileQuartzGrowthAccelerator te = getTileEntity( world, pos ); + boolean powered = te != null && te.isPowered(); + + return super.getActualState( state, world, pos ) + .withProperty( POWERED, powered ); + } + + @Override + protected IProperty[] getAEStates() + { + return new IProperty[] { AE_BLOCK_FORWARD, AE_BLOCK_UP, POWERED }; } @Override diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockQuartzGrowthAccelerator.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockQuartzGrowthAccelerator.json new file mode 100644 index 000000000..921614b15 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockQuartzGrowthAccelerator.json @@ -0,0 +1,6 @@ +{ + "variants": { + "powered=false": { "model": "appliedenergistics2:tile.BlockQuartzGrowthAccelerator.off" }, + "powered=true": { "model": "appliedenergistics2:tile.BlockQuartzGrowthAccelerator.on" } + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.off.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.off.json new file mode 100644 index 000000000..de3d38e07 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.off.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "appliedenergistics2:blocks/BlockQuartzGrowthAcceleratorSide", + "bottom": "appliedenergistics2:blocks/BlockQuartzGrowthAccelerator", + "top": "appliedenergistics2:blocks/BlockQuartzGrowthAccelerator" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.on.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.on.json new file mode 100644 index 000000000..87fabfcd5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockQuartzGrowthAccelerator.on.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "appliedenergistics2:blocks/BlockQuartzGrowthAcceleratorSideOn", + "bottom": "appliedenergistics2:blocks/BlockQuartzGrowthAcceleratorOn", + "top": "appliedenergistics2:blocks/BlockQuartzGrowthAcceleratorOn" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockQuartzGrowthAccelerator.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockQuartzGrowthAccelerator.json new file mode 100644 index 000000000..bb40520b8 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockQuartzGrowthAccelerator.json @@ -0,0 +1,3 @@ +{ + "parent": "appliedenergistics2:block/tile.BlockQuartzGrowthAccelerator.off" +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAccelerator.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAccelerator.png new file mode 100644 index 0000000000000000000000000000000000000000..01f89df107af8350c1f9dc83870702bac3c9c937 GIT binary patch literal 646 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{Qf<_BTMNk5sFGB7YmmAFQf1m~xflqVLYG6W=M=9TFAxrQi|8S9zq85+8O zb~0yRU}ExgaSXBW&ka5~?UsSSmZ!WY8w|VIH{VJyo;kDUzDoVk(~1v0icTozpPTdZ zmRI>}$vIC07EHTy_3GM5mrZ!}rgNvg0~dlkdwKm7a0J@uE) z1DSKB6@`1_QXl{Bpa1E8Z29*Y3tV?UF9=n8aEd2w?xb0TI}XoT<@Z-sEzYre>72QK z>Wu2^udY^ou)y2k8~2ibY>@>AR5T1je%iCdm;{^7dHhj>rRGMG%E|s2Y^J}`8W*~= zoD$k%G5`FfuEU2P+iicSEq0JwZI|03ZZGWr6>jvHJa=^Juur_}kbm0j{;j%d!5 zy{&hu4=vg5zN%c}CDX3y&e`0TXJ7s&mYkKoVEUCLP1n|hmGg2Q$QgY8cBy{;x{EI? z7Zs!lrWjn5F`W3d+C?DeJ(p4F%>!#Q16q07Qp-49SSKEvV)Nmo^uJf@9{3e(I2q?# z*%TLJ&$E1*q4Jg4iXL}GW&S->2=Bji$Yg~9$M!`IlXG%CiXtv36#Mw7 z7ALeCnM*yZUtf4k<)4#)E5CuFs{3#IeGeDCkzO7$KhH5+#Y`~%_J!z4DYLrE514FW ziB(^B#dyxC&HRhKKP>nrv9shm%Qi#hPA<#r{gZc2y!zB|YeM?QS!VCn{qMVZs^@lb znkvt{lU;ibo}a!^Z6=SI%zV*%vqPRG`CfitUifpZO-FI?Vg?2V22WQ%mvv4FO#p@C B7>xh` literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png new file mode 100644 index 0000000000000000000000000000000000000000..b2e260be8fbd506dea23c5db09dc85794478c16e GIT binary patch literal 1573 zcmeAS@N?(olHy`uVBq!ia0y~yU=UznU~u4IV_;wquKhlZfq{V~-O<;Pfnj4m_n$;o z1_lPs0*}aI1_o|k5N3SKen5wTfkCRoHKHUqKdq!Zu_%=xATcwqM9Rp) zNr!q>_f};T`&7SJc*^qmpRMuf&oUDy@7OL=`=g;U|M~3vXJ@6ux)*WGx2tvXegEjh z561d`AFVgV2{+!0csSG0{jkKt$H(h0nonc;mKfh#U-R!zq}ab-zvX}W{qtLA=-5-? z`*?-Vfr*l5qEt;&w|CoiMQz=EV_U^q(BE=mw=T*#4B^W%eK(8V1UbJAa&yWr!y z@$Fp24^|wT1Z(zl&gTqj=Xm3M<&NE}Z<0&RCM>94^I&G7qT6AqWb4b$Ctojm;rhXd zw_=`?*=G0Gil?Ud-LqaIVl5QH!PmRd=nG?3nE$7Gr{goee%tWynn+M-iutz(!Z#=L z2rfCawQ1MI@U}X))~+Q6I>w#~S{+x^pYQSAn<&3lbPXrlshd{HJ7v8b1yfGkJU>bJ z>XIpM7r9*Q4vXgS`Xy-cFJW;ak7{eys{TFFT}=Hc)sd6lxP_cx+qSuOCA0RFU4e%3 zHpiqU-|#(n?3msrJ|3hmHYwryi-jvL-xS`_D|xW3OU7QkbaB}9(<05*-B*v4efoagY`al%>D)-p=IkPu zy$7#Pzo<5oC(q(u_nMt9&l2A3R?2uKJZF}oW)%@Yvy{^H_9v< zW&YK9)D`t|CLPI^a{pT;Co^Hz-7hT1MZO-GnQ&k3;;o2pla^mFkJkc4;qG%B*5``1 z-0^<1JK4tca6X4c#%Y`S9TQhQvN_&Z-KS9BwA@T^Mwh~|EV+V@7UvUxsruc?e)IeJ ziXX`#pOi(o)HMtkd$)I8b~UzjK5e=Dik|8VL+y&Zd!2%}^f%0(opgNuf>-?yo;yit zaQ(bvxR!sT_e+t#dP`ThH3*cP6+d-B|KgVAljIqO8%aOzFnTiH?z?#G+3Kl+=0fIz^0$M3h2JV%srOBl?^2h-&Ccb|M7PXbtLHXp zL9XA^_iLRVn5Bi7xo;8&N8kUt&ka)zcBn1CB3)A}Sv%?EgSN+eC)Vmuw3PV0j>GDg z=(20)mDY<~aJbm69TSmnxFxRha_`sK4Ye%_(+=O~Kj{z4c=6|(JFaZmtIea4^(0QQ zL~P5pDSMx2o>^nw)zGWrcsuq&={^Vj;&y}0OE%j5X=`Zyw&wQ#Y?ZQo?o)QUE;Vtx ztH>m^<79f+=Z5a%mFM=FOQhF1N!(c^sB=+6H$bmHFsv3=b|u5}l9#5lIKaWJ)By4G;*c}B3+)`nwyc28O0WUw(#+j+n9@txED zXqWUXO=yt$>&^Y+sIs}k%oAGCE)!<17yY7R8p8fdS2RnpHF2gVQ=sFL)S`74OY?SI z-r8h(aBfjqp69zsK>;k$Ph#{Y3SV6ky3471k@?)20$aXl@{0UQNY1$H%@z2J%`{(+ zi)oVV6pu~Y7dY_=PRm=uwZ(D@Q$qzO2puxj9#0N3UeB%vR&KN6&lSU2%2)eVYVT zo^>auR5h>HPj)ksyi>4ed%-=g6ux8o`ros|k&I54(jWE%RWip9A3QaSfq{X+)78&q Iol`;+07>uGOaK4? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png.mcmeta new file mode 100644 index 000000000..935410988 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorOn.png.mcmeta @@ -0,0 +1,11 @@ +{ + "animation": { + "frametime": 4, + "frames": [ + 0, + 1, + 2, + 3 + ] + } +} diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSide.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSide.png new file mode 100644 index 0000000000000000000000000000000000000000..d98c1c4ac5f4eddc308c54ad17f956d7f5543efb GIT binary patch literal 655 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{Qf<^y3yhkXwn85kI(N?apKg7ec#$`gxH83GbB^GfvmTtgJfjP*?Q3=Q2s zJDD>uFmZdjIEGmG=LY-c-*ON*o2TXFq;0_Rd85cRwwUQ6D}F6pvHYK$3+J-~jLr@# zTC~&a-kv@aFh{{+&9&Dvzn9&ceRH(|&&C+Nz;MN!Z*q$-axDDZFzqvQZq&TXjb~dq z=FIPS9Fdg!e0qY!Y=Md{q0WSj5fA)+YTSva@i3ndtoo!>xNp-8AGH;)1opk#Clryr z@ot`={ywYidBe>jXBOvu4_5&S>;f%T8l0Uq08j%;mKe_+fO&GPK=$*UW~K zye|=hEam=zN(CNV5IeyEHQr{d*Fqkm+{Oq%C z*Op2oPqMu6w(LVt?aD_M??q?TI-mA6&A94+ugP;Oi*TD_9K(UOqmA8i&MXWJ3=E#G KelF{r5}E+8vLT`X literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png new file mode 100644 index 0000000000000000000000000000000000000000..3b90a175c53ed444a2ab20fe8373e110bd7d14ee GIT binary patch literal 1409 zcmeAS@N?(olHy`uVBq!ia0y~yU=UznU~u4IV_;wquKhlZfq{V~-O<;Pfnj4m_n$;o z1_lPs0*}aI1_o|k5N3SKen5wTfkCRoHKHUqKdq!Zu_%=xATcwqM9*d$zh7v2^>C>m1*jO$-_-`G9%$xtd*RNkU+E?>) zdfV~zANdZuckkZx?9C7PkBRryr+T@Ht!v+=u`HbBz^uZPJX=+ijAK-lGlKJ$shrC> z-D>sd@V;QF9>z_(96#oVow#8Cz<%kmpg-I*Tz<4>i-adqd1=O3?=Tf}+I&t!*p5pKw{3VcCKE5eJq%D9_|t zE#q1uC)Ja)EN<>K1-bsyKaH&PB|bm-`Sa(`C+79Xqdv^3y-_aIxOUbi#v=tRd0&YLn&Tj`Jd|o3a+3i$BS?_6B=Yckbl&z~0gmz1vm@ zR_p(5$cqhKyHQj5t_F(gu=H8wB z7WY>%Oi8!ZI`>s&Q4)*o!=>Kea(w69Ogq0j zmF~u;7k>q1on7x3n9ITN+2p~D%8LtjE@;&`lMuIf#lEWx>h`n6-{hacq14R_mtmV6qXFwbwPw9{t$Rd- z!!y4e3%g?Pm;E8(?}5oJ7Oq)t%TIQpQ5|5c~Lva|R3U#)V#cPaYj!t|O&+dgWS8b}=ztL&63 z?Y+N5e#6@2Kku$DSO^Z=PQJNwKW8Xz@!||U;(B;dRS?%LPH^s@-Z5vXp6GMiB4*#hwAs@CDod7>|7OfKVAFWLeaoLMjazDa|I5U@U+wXA z-VLve+S5DSYo#o*q8Vl^=XB3r=lw81Qhar5_v_dcHvVh;Hedb9(&nwc(7d@&GIjO=?NZORi&|zs%4y!;dcCK=>H8Z0 zzhB~;&NcNh%$jtF^9vLA9?6D-vL^EK4A!|z|4*6q+$l@ke$w8aqn&!Dz57H&Z&&c< zn=n4uTr;8W0>>9n;+;O>H(#4*#L*T0SDS=0?Dz4@-DmHA-+cW0!TmdKI;Vst02}3k!2kdN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png.mcmeta new file mode 100644 index 000000000..935410988 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockQuartzGrowthAcceleratorSideOn.png.mcmeta @@ -0,0 +1,11 @@ +{ + "animation": { + "frametime": 4, + "frames": [ + 0, + 1, + 2, + 3 + ] + } +}