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 64f5bac9..3f1dbd7f 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 00000000..921614b1 --- /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 00000000..de3d38e0 --- /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 00000000..87fabfcd --- /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 00000000..bb40520b --- /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 zcmV;10(t$3P)N2bPDNB8 zb~7$DE-^7j^FlWO00II@L_t(IPi<4lmfA27wB-%SfH8{)v)W)YnVF2=B!9)rA>l}J z$RTgeocY>Hck3CPOBfh1`3> zq_;<^cNpmcx|c(13)7p^{uX0uXP}qVVkt$1V5y#L;2tpZ_R@c!uF>c@qHtyrWH8Yj zF_HCqL=bH63NlsMz^!Reg$#yeb_qlUk;arf@W~tg>aO5UaInc#?W!4mW+IX09; zGfB-3DODeNYavM86&(KIAXksl!ZfHb2)Cj@lWc8Ba#+wHb4*Mnb6|xsHyY-DuW`mC z{z4E%4=^DmNBcj%;iBvtr&OPAL2D#75ntQTTasj&i+8{@v;N2bPDNB8 zb~7$DE-^7j^FlWO00p5*L_t(oN9|V6ZyHw+-ruaj3mc3Uf&pV2V@$kjz&Id46x#@5 z%dur8Y8zEbdyRT%b4+{ap~^Yu{Iy?a=4oM*xVIdA_<(tD=bLZl%^OyWq6nWpeL_v| z;>h>`fBx}1vR)H`-dN$8F-OA~;p4}D(KnU?_F-R*e|-M@Sr-2K`ycsE{!XqjL5z4! z{3wY%81c&#IQ@87={uyfm(DFQZ<1Z6uy$$o}h>9>Hjtoutl*h(Ax6U*V>{DB$?Kx%Mes5Wc%DKwvq$S8 z%9KvtJERml5>yBdjj=NH0cuuH@_$0dnDzFs;noyVb!0d8;1k)C3=yQlwSv0QSB8E@ zg^HvwEHg_$|`2DY<(sRJvNx=}G7JjNQ6*iFI4#xAlhIdAm7 zc!q;=-)J3Uu`=RD;wIu_D_Dmlnd)KJyxrHzF_ZpP-_LD?B&v5t<8enwhT!>>~uR9R7YtesYZoV#I42NBw#p9FUsb^aRHg z^}v~6-yYH0SoV^q&^KQy0ydHayUqwZ&U3WfOYFO2JT=2_2smiVJb$>6s^UDyfqRZ1 ze}bnr5txb~#%dmL@i@<6`Xx@>YwY{ysQ6=4@*@-qCnzuhjkk)^MKe7^%Q>giE+yzO zD|l|+i4oc_u%DY^$Dg3;kKpG*8Yl|++%c^Wu}kR`{Vt`bMt~4>%@@khFVVE8l7B$Q znD>vdnQkh$E#xmo%{ql6uoNqg#72e(?+k<-XCz=Bt$vHxf4yAKO#b-q9^bB8dqq_IBy zhJb_itlR%l(|KvG)CPa0vfo1sB#YVho+v2)C}$3a-!$76`V62m*!D)_~UMXj3}1fX2ML zl%PT|v0f`fzeC5lmi#MpjHO_J9Q{iR_{AePK$*xYTSSnVuNCwxHB<-sEfs1Zg<+XV z0#QMvWpb|3b#A!RwSqOlopN?=N$!$TPy}1#TrQCl)udIrLW`m|otY4{^eGJ#`e0*d z-Af8l<_0xyE(!vY9h6A2x1d4}5teSG4y;h>M#X&a7&}ZtgM*RF_34d;oO48;c!q;= z-)Kwg*Od`B5;qYaTb=%uS{bT~bBD-N1j$aET0cU&an!{~67;QW`Lk^hxQ!W&9JMp; z#m`CIsMWvUJYXdZuE~^ogRd`RMlu=PaJ;v0-b!Q+#=ej52aoRukM9SM?*|+#iX!|6 Xzz>%8gxZibW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE-^7j^FlWO00Ik1L_t(IPi<38Z`wc*&2B16LMt!?^RX1x23(gEsQRI(r~V#9 z3Fg27LqMp6D`$S~%gj)mAULen>zVg<-kaI0FbuI=E>Tw@Z1x_b(FmdQfR^(EZCakw zfz5>ooS%r}SYmDGmtYv15O|6biD0o<;7<7{+*o`_H;_{${YMVlf-W30R`;|K|R%m z$@HWmlMPV1wWy_h0duUD`6d{~o_KI1sOozZuRWCXXZmN5)eV%XbdFV28%5PR_rR#G z5U|cW0=hQ=GU+NlDwobaa{ASS=4B67RN`2=@c0;EzKBIXueW}PCzP9b@Kypdv(BpS zz@;k6I-m|1>Oe AYGoWSmI|R9_^_W;0X>$OK0Z^8X1qb|7e;6V&v9fF# zuOO>xaP%kg;1DzV%c%#(80jywbHY(4pV#Yk^3D6v3qCW3u}KA1eU+P8XM_CUX)G#_ zZmv=l4V382;4N2bPDNB8 zb~7$DE-^7j^FlWO00jL>L_t(oN9|V6R~ktWPWNV`O9;{Bi6Aii7-V1sW?<0)SqKqh zvWCse{&+9Dx4rsYBOW}6u0G!yub%yDYriT4Wyf1QdgwPa)%A6KUsqN4lR}|Dr>Cc6 zsXE!=2JP+bQ9ZInPGo~zjFpH-_ClSiksb|)L$SG$P4Qvh3BZcNLI9kcoY0agQS7-* zF9QWyPzEjPGDVb42L}g~)paWA^;>{+I!%|Cmoz*%rNREL037W9P1o1gGQNEImxjk@ z_-{bFySuXH?D!w?Vc#c}N<|i~hqfrDR|LSCamfs|BqB3hB_n84Zl)y8Y|Di@;={gE z8jJz5x;sl;6IbXx-Wg#uZcS4qrEw4iS_ zDBrKa8A9BbQ~3OOK*uLT;m_l)9-;}>PBgenfsvVKR(q606e(TB379y6v``q?Ko2y0 z6soE%6poILC=Evj7;CV21HiTsK-mwF(<1<;z~5NFrr>vJ3acDNbRHUvY^GkF)*v2_ z%lR@oFBtRW`T6T@kvx;ed0F-AvD$eyJqGAL+;iXIVY)zcmX3xD5 zpQ(Pp8jJxf{fbggt4P~*{8vOOSCHy0vE|YFQfkewK~Zf80P{59n0e8lxuAtC%wS%l zsJ_*pe!m7^*${% z0Mz{ewjKd61^y<3F7AcA6cblz^u|`yKTd1#VEw>VUD=s=R-gxGV+v&()fS?tpoDAU zoCE)izULU-XPdMc|3lDO&=EjQQaFlUkO6N7VDO@9_yO3d6aPhOo(pNsd`Gzy7DpRY zi)~6#v5nX8MiT%&%LnNP)!9vnVw~@JZ(WH(p%Y~XMCcz z@hf#O8palRi5_*0-=rU~tz-P|*Px-W5C9yWi4L8e^JpQoN(oiOMZ=qo&@T z*5E<0zn6%dr7jicJ#qt0ab}wv{&{qycl!ZrFa{{=x3v7UfwX;% z{~TQJt4Q^p*h*-9%eY5<8aQfO0GOuUX z{q$dg&Vr5rnv%i^^a2aK8GykZG#?)TJ8h-^l$z&4Y8O9}y^O_)E;Wt56cyWe4R167 z;In*?e$WW?C5myrmyr7oh80-Fs87{`6KFra4<6qKkMD!W_rd?(2L<{Mx6M@!eWBY% P00000NkvXXu0mjf8|8w* 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 00000000..93541098 --- /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 + ] + } +}