From 85de5de38f80f95395273ef13d2e76183b00d213 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 3 Aug 2016 13:36:42 +0200 Subject: [PATCH] Empowering tweaks, empowered crystal textures --- .../mod/blocks/BlockCrystal.java | 10 +++++++++- .../mod/blocks/InitBlocks.java | 4 ++-- .../actuallyadditions/mod/items/InitItems.java | 4 ++-- .../mod/items/ItemCrystal.java | 9 ++++++++- .../mod/tile/TileEntityEmpowerer.java | 6 +++--- .../assets/actuallyadditions/lang/en_US.lang | 14 ++++++++++++++ .../blocks/blockCrystalEmpoweredBlack.png | Bin 257 -> 268 bytes .../blockCrystalEmpoweredBlack.png.mcmeta | 7 +++++++ .../blocks/blockCrystalEmpoweredBlue.png | Bin 820 -> 1102 bytes .../blockCrystalEmpoweredBlue.png.mcmeta | 7 +++++++ .../blocks/blockCrystalEmpoweredGreen.png | Bin 870 -> 1218 bytes .../blockCrystalEmpoweredGreen.png.mcmeta | 7 +++++++ .../blocks/blockCrystalEmpoweredLightBlue.png | Bin 834 -> 1108 bytes .../blockCrystalEmpoweredLightBlue.png.mcmeta | 7 +++++++ .../blocks/blockCrystalEmpoweredRed.png | Bin 789 -> 1119 bytes .../blocks/blockCrystalEmpoweredRed.png.mcmeta | 7 +++++++ .../blocks/blockCrystalEmpoweredWhite.png | Bin 375 -> 470 bytes .../blockCrystalEmpoweredWhite.png.mcmeta | 7 +++++++ .../items/itemCrystalEmpoweredBlack.png | Bin 303 -> 372 bytes .../items/itemCrystalEmpoweredBlack.png.mcmeta | 7 +++++++ .../items/itemCrystalEmpoweredBlue.png | Bin 443 -> 570 bytes .../items/itemCrystalEmpoweredBlue.png.mcmeta | 7 +++++++ .../items/itemCrystalEmpoweredGreen.png | Bin 574 -> 767 bytes .../items/itemCrystalEmpoweredGreen.png.mcmeta | 7 +++++++ .../items/itemCrystalEmpoweredLightBlue.png | Bin 323 -> 389 bytes .../itemCrystalEmpoweredLightBlue.png.mcmeta | 7 +++++++ .../textures/items/itemCrystalEmpoweredRed.png | Bin 414 -> 509 bytes .../items/itemCrystalEmpoweredRed.png.mcmeta | 7 +++++++ .../items/itemCrystalEmpoweredWhite.png | Bin 372 -> 451 bytes .../items/itemCrystalEmpoweredWhite.png.mcmeta | 7 +++++++ 30 files changed, 122 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlack.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlue.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredGreen.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredLightBlue.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredRed.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredWhite.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlack.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlue.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredGreen.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredLightBlue.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredRed.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredWhite.png.mcmeta diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java index 03f0e4da8..e6f62a4eb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java @@ -33,8 +33,11 @@ public class BlockCrystal extends BlockBase{ public static final TheCrystals[] ALL_CRYSTALS = TheCrystals.values(); private static final PropertyInteger META = PropertyInteger.create("meta", 0, ALL_CRYSTALS.length-1); - public BlockCrystal(String name){ + private boolean isEmpowered; + + public BlockCrystal(String name, boolean isEmpowered){ super(Material.ROCK, name); + this.isEmpowered = isEmpowered; this.setHardness(1.5F); this.setResistance(10.0F); this.setHarvestLevel("pickaxe", 1); @@ -87,5 +90,10 @@ public class BlockCrystal extends BlockBase{ public String getUnlocalizedName(ItemStack stack){ return stack.getItemDamage() >= ALL_CRYSTALS.length ? StringUtil.BUGGED_ITEM_NAME : this.getUnlocalizedName()+ALL_CRYSTALS[stack.getItemDamage()].name; } + + @Override + public boolean hasEffect(ItemStack stack){ + return this.block instanceof BlockCrystal && ((BlockCrystal)this.block).isEmpowered; + } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java index af0840d30..875eca8ac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java @@ -141,8 +141,8 @@ public final class InitBlocks{ blockFireworkBox = new BlockFireworkBox("blockFireworkBox"); blockMiner = new BlockMiner("blockMiner"); blockAtomicReconstructor = new BlockAtomicReconstructor("blockAtomicReconstructor"); - blockCrystal = new BlockCrystal("blockCrystal"); - blockCrystalEmpowered = new BlockCrystal("blockCrystalEmpowered"); + blockCrystal = new BlockCrystal("blockCrystal", false); + blockCrystalEmpowered = new BlockCrystal("blockCrystalEmpowered", true); blockBlackLotus = new BlockBlackLotus("blockBlackLotus"); blockLaserRelay = new BlockLaserRelay("blockLaserRelay", Type.ENERGY_BASIC); blockLaserRelayAdvanced = new BlockLaserRelay("blockLaserRelayAdvanced", Type.ENERGY_ADVANCED); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java index 304eeb677..b67f1d497 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java @@ -231,8 +231,8 @@ public final class InitItems{ itemExplosionLens = new ItemLens("itemExplosionLens", ActuallyAdditionsAPI.lensDetonation); itemDamageLens = new ItemLens("itemDamageLens", ActuallyAdditionsAPI.lensDeath); itemDisenchantingLens = new ItemLens("itemDisenchantingLens", ActuallyAdditionsAPI.lensDisenchanting); - itemCrystal = new ItemCrystal("itemCrystal"); - itemCrystalEmpowered = new ItemCrystal("itemCrystalEmpowered"); + itemCrystal = new ItemCrystal("itemCrystal", false); + itemCrystalEmpowered = new ItemCrystal("itemCrystalEmpowered", true); itemLaserWrench = new ItemLaserWrench("itemLaserWrench"); itemChestToCrateUpgrade = new ItemChestToCrateUpgrade("itemChestToCrateUpgrade"); itemBooklet = new ItemBooklet("itemBooklet"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java index d14a9e45c..6b7739136 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java @@ -26,8 +26,11 @@ import java.util.List; public class ItemCrystal extends ItemBase{ - public ItemCrystal(String name){ + private boolean isEmpowered; + + public ItemCrystal(String name, boolean isEmpowered){ super(name); + this.isEmpowered = isEmpowered; this.setHasSubtypes(true); this.setMaxDamage(0); } @@ -37,6 +40,10 @@ public class ItemCrystal extends ItemBase{ return damage; } + @Override + public boolean hasEffect(ItemStack stack){ + return this.isEmpowered; + } @Override public String getUnlocalizedName(ItemStack stack){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java index fa55859e6..8876c44fc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java @@ -40,7 +40,7 @@ public class TileEntityEmpowerer extends TileEntityInventoryBase{ if(!this.worldObj.isRemote){ EmpowererRecipe recipe = getRecipeForInput(this.slots[0]); if(recipe != null){ - int processTimeGoal = 150; + int processTimeGoal = 200; TileEntityDisplayStand[] modifierStands = this.getFittingModifiers(recipe, processTimeGoal); if(modifierStands != null){ //Meaning the display stands around match all the criteria @@ -62,7 +62,7 @@ public class TileEntityEmpowerer extends TileEntityInventoryBase{ } if(done){ - ((WorldServer)this.worldObj).spawnParticle(EnumParticleTypes.END_ROD, false, this.pos.getX()+0.5, this.pos.getY()+1.1, this.pos.getZ()+0.5, 80, 0, 0, 0, 0.25D); + ((WorldServer)this.worldObj).spawnParticle(EnumParticleTypes.END_ROD, false, this.pos.getX()+0.5, this.pos.getY()+1.1, this.pos.getZ()+0.5, 300, 0, 0, 0, 0.25D); this.slots[0] = recipe.output.copy(); this.markDirty(); @@ -83,7 +83,7 @@ public class TileEntityEmpowerer extends TileEntityInventoryBase{ for(int i = 0; i < EnumFacing.HORIZONTALS.length; i++){ EnumFacing facing = EnumFacing.HORIZONTALS[i]; - BlockPos offset = this.pos.offset(facing, 2); + BlockPos offset = this.pos.offset(facing, 3); TileEntity tile = this.worldObj.getTileEntity(offset); if(tile != null && tile instanceof TileEntityDisplayStand){ diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index b6b9a48ea..fd28b7070 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -89,6 +89,7 @@ container.nei.actuallyadditions.coffee.special=Special Feature container.nei.actuallyadditions.coffee.maxAmount=Max Amount container.nei.actuallyadditions.coffee.extra.milk=+01:00, -1 Level container.nei.actuallyadditions.reconstructor.name=Atomic Reconstructor +container.nei.actuallyadditions.empowerer.name=Empowerer container.nei.actuallyadditions.booklet.name=ActAdd Manual container.nei.actuallyadditions.booklet.header=The Actually Additions Manual reads: @@ -197,6 +198,12 @@ tile.actuallyadditions.blockCrystalLightBlue.name=Diamatine Crystal Block tile.actuallyadditions.blockCrystalGreen.name=Emeradic Crystal Block tile.actuallyadditions.blockCrystalBlack.name=Void Crystal Block tile.actuallyadditions.blockCrystalWhite.name=Enori Crystal Block +tile.actuallyadditions.blockCrystalEmpoweredRed.name=Empowered Restonia Crystal Block +tile.actuallyadditions.blockCrystalEmpoweredBlue.name=Empowered Palis Crystal Block +tile.actuallyadditions.blockCrystalEmpoweredLightBlue.name=Empowered Diamatine Crystal Block +tile.actuallyadditions.blockCrystalEmpoweredGreen.name=Empowered Emeradic Crystal Block +tile.actuallyadditions.blockCrystalEmpoweredBlack.name=Empowered Void Crystal Block +tile.actuallyadditions.blockCrystalEmpoweredWhite.name=Empowered Enori Crystal Block tile.actuallyadditions.blockMiner.name=Vertical Digger tile.actuallyadditions.blockFireworkBox.name=Firework Box tile.actuallyadditions.blockQuartzWall.name=Black Quartz Wall @@ -216,6 +223,7 @@ tile.actuallyadditions.blockBookletStand.name=Wall-Mount Manual tile.actuallyadditions.blockDisplayStand.name=Display Stand tile.actuallyadditions.blockShockSuppressor.name=Shock Absorber tile.actuallyadditions.blockTinyTorch.name=Tiny Torch +tile.actuallyadditions.blockEmpowerer.name=Empowerer #ESD tile.actuallyadditions.blockInputter.name=ESD @@ -425,6 +433,12 @@ item.actuallyadditions.itemCrystalLightBlue.name=Diamatine Crystal item.actuallyadditions.itemCrystalGreen.name=Emeradic Crystal item.actuallyadditions.itemCrystalBlack.name=Void Crystal item.actuallyadditions.itemCrystalWhite.name=Enori Crystal +item.actuallyadditions.itemCrystalEmpoweredRed.name=Empowered Restonia Crystal +item.actuallyadditions.itemCrystalEmpoweredBlue.name=Empowered Palis Crystal +item.actuallyadditions.itemCrystalEmpoweredLightBlue.name=Empowered Diamatine Crystal +item.actuallyadditions.itemCrystalEmpoweredGreen.name=Empowered Emeradic Crystal +item.actuallyadditions.itemCrystalEmpoweredBlack.name=Empowered Void Crystal +item.actuallyadditions.itemCrystalEmpoweredWhite.name=Empowered Enori Crystal item.actuallyadditions.itemMiscLens.name=Lens item.actuallyadditions.itemColorLens.name=Lens of Color item.actuallyadditions.itemExplosionLens.name=Lens of Detonation diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlack.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredBlack.png index 5510647473d64a8bf1c4ceace8837ee6d50f9b46..b75db1634281659365e38a6a08143a27089fbd4f 100644 GIT binary patch delta 176 zcmV;h08jsc0*nHX7YZN<1^@s68;SVLks%uj4*&oQ4*`<-1ErBhI)8UbL_t(YOYPA? z3cw%?1VCS+QUCv^{3K-qmLNH(_0Sd%V++D2+lG{q#26LcX9XgXQpyqyz~NnvxC3&| zOHf+_YOR`RpO&3!y|BV8-C)aa^wt}p6|h17)f;cB^??fDO>Xv8n1Qvez|8W*2{-|8 e0)7y{ased~0k{gF!wpLS0000*dBI)7|QL_t(IPh+sR zll*UQD*?eEHi?+Q!A|PGlY}mEp$@~?Y(>UHzzZOZ&1M*;o)<{MpllDv68`~4#hSdG TOYcqq0000r+rdiV zGcsE}WOu$IwtkM#Vt@62>^}pl2f)@2uvuhVARFwH0x4|*WsaBfz(y9xWPnr>#voDb z;4KY;l-Gd@CswipRB2Wrn;grgfRzL=dk44~1+LBe2Hi^rMXpeCjL|k%tuTel6;~I4 z<#{p(BxZr@@vbqba*~7+tuF()RfBJ$B>XP}i5KqzaT6*{86-P6VD+mdBd{rgEKo2%Gr-bq7Lj|Op8=vQ;^Yzy?z&wZ?g5YQ8H1xo<4uB0 zQG7kx$Ha06p?{UF4xaN496dG$GI~%2?w5gGrV=|mMiqKHXO6eXdbzC0^csuk?sf6u z2>9zY@ZlBk=BY{X;vw+t0r2ELaJUQXSB$CJ0!>y~+{rArklXLz-}mtO=N<6(8{khG zzJFKS~z}#kmg^ zro@3ff8@x9`mT96Sw?mEeTPJNp{}I|xSHwLDk?}+e4PKqraA&VJivM`Gqsje zB~}*dBIe!A5NklrZG*;(X!04v5gknX`^U``bWYb2$DWjI7RB9joY*s6yc}LGHv!5 z*C6^5M9sJr6f>vaowvxS4~P4{_r2#l=Q+=PZO!)gx(u%5eNc=2qgo3;sl%C6XUVL* z&RN}c%*o?ikgsA+et%a|k80=jq<%q9-CxzlcUybS7Y!ehUN%XucS^zSQfQkL-pUHz zg0UUEoBb_Pz%9M02kT`C_^OkdKBd19-wZeycV`qsECQnJh3XKimR_x*phIfUMWDMn z^^ZV|3bBp9gs2+DMUaYtDjcn5tw5+;^5&;3fdq%LL`adf5P#NLFz+#(#Q1Im40)^) z`v@4^H!XBmAwYleP0}!%1|e*QY9JvN-T-hE#l8^@u@_o{3(j;oanM`-S>p&q8`4>l z!Kkt6`XdsddeoIsoE9P=fD4mDM-c-36id(Z)AHmcW$UTM!BJ`Ige72v65NTzE^@(D7L3sZ zooM8lP^07(AQLZ_&E{`ljOV18^WZEFPFgOejv#gz9F!*ZLEdeNnl*^XFoE7OE%+Og zdUr`#%v@x>z-k1~Sfiah1`snjg>f>(RGu+`$7IoBr+Hz8cS4cgC z*i|T9T|OsUpDUFOCPpwJZe9?Cc@8!Z6#HXb=MnY>n7a?sz1)mE%hI}?lTmYy$)Ide zeJdB#3p#pA_-#R#b6#G@H?fH5QX>WpEy zB$0OK`1A}5A|^$BjCN=HO!w&?EBfnQ#7XqGyJ-Hs0g+M@qOJ|wYeUqFA$Ht?j+0h& z9`~Zx8$kMW7=!2I$bWpyaz6?y?If@etYAhhVhTA-sx@TQQ#|52p;^Hs^2lNhkFbI< zEMWvsFo;B49tFJgX96R^ zGd#pPg9?}kC_;fjl|zcBCh-^vOrwYS-aBd$ffQ3)*MXVfIe!L%Wu~`ER*+%Z3snOf^RfYuLD+(mt@^9@Q}g1tWZc}4*jfi01FtFnpGY{^yvY`2ZAN^`#Gfj zc^cggtJ6tg(%-^pwV;E9zF?XnvsWU66iL_eNKqu^FLHkt-D(`oUMsA2w+~N(mzZR& z5)fulPeNtURezmES8WzO4DJjj5%Y)fwRq6Q66UeP2JUKsRlL4cq#nCAh{)ebG`bC( z1MdO5yi2>@Xn_TMk6E>iY5FpyHZc`!aW1xK^7Sv8ZSn#?Q}7)d zD`Ic4s`e?i$J}-}jT|O_8p(f$(fLmTu?kBV@y2vOLH&qAaKJ2nBJbJx1D3^1f<5Gd z9j3pCew9JnMK_{<+K67XAntw%>%KR_YW6Vazrcx&y1%yU&^m9Hgfl;bmmhGEK^36wCB`iEEC7G>1;V2e#jg$VDR} zfAQvC+<{&B0#@5u0`apR(v8?z2kg@}5=Zo7D_YJXu+MqYA2vs~8GVTGE|8#!8GVIx zwGmdST11)1TB=>*mq=Mt=5NCx4*d!$zJp5Oz<&u`{hd|e#t}S?%m1!kkKyR`Ci2d3 zgbL9DhZH!**$o^mK-4i@;qtk{UPgv1;kw~z*@r%c@zFNFi3fPA0pp4#zYY~!YM<- zG=EJNHxbhWQ$|^y`MyrzM2m=kM=x#{xu&ElHhDln-VEI$L zt(p(?fCA-!wOnDYutw6nq)a6Inj$kQa=4241m0M5FlN^ytpET307*qoM6N<$f`OI| A?EnA( delta 783 zcmV+q1MvL93FZcn7YYyv1^@s6AM^iVks%uj5C8xR5CN?ty>*dBIe!AtNkluMOW?|22x0@$ zmg#hrXw`ORj%UV@VD#dd^*iT1-}}x8wcB@5yL|_>JNIDNdyM*n=P-${VU`wQk``dh z&Y&sx5|-==I;C~k^M7yQC~m-A+T{B=2-d?{gq0l(s-Mu0&j_hW1l2V9NI)lv5WXM? zK0^vVB;n${gZwcNmobjwUwGv#d~y!{Y8HX2grF?Kr)J>9A?!44ukNF{l7K-skYfKB zxRe|`Jp0rf0t!uN;9#0=rm!)Em2{A^nFY;Yh0$`l&`n{lB7ZSnp5)+07Jf(wAfp@D z)D*guB&^DTj)_{KgNKlshlk=$By{Yo)Wf*F#bwgZDfBCOeiubH@++HNgrCnm+>(=9G;3RMN~@S+^&2#pB;&l+QbZ}b z%KHe8Frt<)pcXK|cLSV|pH1#n6Q~!TL2xs{Z7$Tf#eXU{d7dKId996hloN`w>M)Z9 znb0Zk!uIO}EI&73NI!z$lGb#=1S?FinUfSvQhbe!v0{|tjj(Zj*hi205iRBSFnx=| zSYE+t@gal@{6WH8JR}z|#8HJAJwlT((W(wo9F&u=RkzS8Z^B%8ho;IZjB*S$nFkO$ znZVD59&C=$#reAV#d#Rj%O+_*j+Z};i!--S+$hIUSDr`h_gU1Gr*SHMA3{sv4bB(V z$r_pqF_`nqWC=~BMKl!VU@XqTe6)l{4Frs<; zerI>NL?_c99@xuypYxsXoQ>RD{1x}2zu6lKz^rzF zN9#?*lE;YaC(yE|NPiaIVvg@3(T%@Q+3Ub;bWq%}VQx9ZMX^jOMDA-Y%&Nz04|zV% znhr8W#}_Q84)N?+e}Y1Rfg-~kWOA@sc2F#NFbWv&Q|Oa z4`zw7l7npCW!PsU<07fMm{|z~rAluY%y58VbYbMW$WvmL1%FQoHZl%UX?w`R+K~vF zs8qTv+rxUsR_KO@G|5mXW#_mgBgeHHE+=r1COXGSqa)F^160_UeBM?eLF_sQ4<#h6 z+sLwPU3ajNW*>Mz`}mLoT57c}N|Z<-tYVxb(UKODNtV9pLQC0*uUnW|We=9PzqQ>S zcI!PQc)HiWQ-3nfD#J@_XZSAmCn77GO*Hm;Dky>-imI$=YrBg|l~g>G*~oH9=y6A+ zxoj%?GN0fQ){J93f8HZ~#om5j$r_Cwo;3QX@Ak2?(?zvP@wQKa%iS#4n11{RA_=33 zpMLHKT;jzGUnI!ZK6%4u7AE3fmFc3`#cN#-5`94eN{;h z^@fL9-9w@3@cdg?-gt+_)Eg`$-{8UO?})_H$JnKPd)rmW^=`edkXg6*9TY3vg2&F_k_+ zN%N`R5!zDN}hyzq<@-m!}e60#! zz#k`A<1l!KWIQOyL}P+cnPC;TVAF&!JZho{g64@p{%?i9pv`dGx>jdqVi!apGO1_; zpUFQPDulZuW7QHY`wE`-d59|n!jMVfXt@^_EBI0{&V+;v`($6E-MQw`9}}pV$HF6l zEL@8_!LY@!1Y7(TTGk*C1U>NA>NjzGR<*?{?9Up~k_u!A>Ldn@nIH&;Wrv{)&Kx3N tFSl{PE%A}A-ieeP2wJS*dBIe!AJNklRA~uQSu!OxA zGWN$+q}^qtJypc}M1MHq&KxpJw>S#j;y9=w7pg-D=@5fD1R@)(NuUPw*m;5Qk$m9E|+L#?veusZk0&z>D#^|LeE+Pcm6nULTUfOrx;D5{L6~a$W;P^BlxBeVu8_`Ca ze22=W<-~;Y#(=b9;B3B*AD$ZaT^HCHs$hGd!reKggK-%p2B^H&ZCLNBWt*`6nh#t1 zpy9jw7t*6Q_&jorl=BL^LswXQM1d4HtQCxooS#F&p%JW*Slf%k`oyOpJ$6IVHOIG% zShtF3mq?0WXNC@jRqQ&8Hj+aMJ`TzpQ5o<16~ucbB%ZS#RFUYv;F@1@11}Nnsbc+E d8LM3?egk78PGm%Y`O5$R002ovPDHLkV1hs{UW5Pu diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredLightBlue.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredLightBlue.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredLightBlue.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredRed.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredRed.png index 715785c878a74347b3ad513676f2842e89606574..a1a2d2f235b1f9e9559fe25b40f6490812ccb6a0 100644 GIT binary patch delta 1034 zcmV+l1oius2Hyyf7YZN<1^@s68;SVLks%uj4*&oQ4*`<-1ErBhIe!DnNklr+!#6vgjHhVlx~JRm@m5($Ee3L;ey5eSO0zDBEd+G?xgV><00Y@R%Ar_)YJXws6q zy4F28w@0cUesj-juf5JbJMngVGT80OV!wMFzjcq|_s9?qVk4->hER_V`zNE$Lr)Z5E;!2A5{G5!lE_Aa##qXpMzRET2Ev8V5#^C*tqUvoGhypNHA9#J&yoSWS%>m!A!M?s`u6X|oBdYHPUuIzf^+=iy&d&osKQ{dI2>9`V z5qx#Wh&{Uje79jl)KCj_oMkhO45P;OrvP6-0WWVGm7%~io8{3m@Nkh?__BFl#S^I|qRdK4S+RbWos~96}=zM>C#4lRx1`Y#5Db z5=Voh_Z23>1)z(~)ink0s8GgHp+fX6qg5=SRVu+39Q(yG zslYFDkN6dit5x`0gnM4AQU!K*fSql!#j!=}WJh0TP4n$afDtHj@^1HiY;cGTR$v*Z zmVinTexdLY0UZ>shz;Hn6dHD*Vib`R z24|u|r_A1B>l*>rLC7&D%33vnVD*I`2&e{uMHSN0&S=+_xt$fPyv65_(7b|E7=y+R z+eE>vdca$biT{=Y!O!+Mfkpj{HD&?}Er(xbN1=j$0YMWdZrM88kpKVy07*qoM6N<$ Ef&k9p{{R30 delta 702 zcmV;v0zv)X2$cqq7YYyv1^@s6AM^iVks%uj5C8xR5CN?ty>*dBIe!9xNklR|1;3R;7AQWCTR*y z+S(Q=!P@i&>D^k?UIs*0N;9YCE4@z2tY_roGyn&n&7C%YEz(4T^tML%zDoIWu@(OU zoYhi_T?~|B*A$RME4w!VSjxDVd4qBT0R!M5z0oVQB8R!dv40#2TnH`}sA&R918|Gbd)D~i z55#rD+~EjGG>r>#$oJL|Vw@c_djVL|6#RDawmWI>zkIxVk68;usm!4N6W zp63=WFrM>n!(iDXhz83ZEFWcmSM+%9Q7d9 zP_MX=XWZQ5Map$m0T?!bIXL6VT)0k7Q+(1ZP9Ngl>3@Zn^vGzv^r%*f236?t8-QlX z>_fZxnE$~I)NC`lyYBSlN~qMjBNds#htFVqq1dXdt8?{dM}*6V&&fTK#0M`_)ne kK!ov5KpVQ{m%9A=1(00&4u=tUp8x;=07*qoM6N<$f?NVf;Q#;t diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredRed.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredRed.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredRed.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredWhite.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystalEmpoweredWhite.png index f4b020a06abfa216a0c25afb87e4a050e5b9923f..656c5d99459f2295c3935933e568de71070b7150 100644 GIT binary patch delta 380 zcmV-?0fYYc0@eeN7YZN<1^@s68;SVLks%uj5C8xR5CN?ty>*dBIe!5`Nkl z-Hw7l4260B2PA+Qt>Er3t`K+W`x1xkSS z<<^wI8h}rf3nM`5Gx!B~(=<8FJkKUptcQjB{l4&cJXXjxjaixCH&6mx@Nm1`UeGV- zbsRiWpk-@xB4$4eS{l&7R*Y#uzxav$EZ~7<$pAUW_ma(3U}SQzp9M>v4z^Uy+eUIe!4+NklO#We0GdD_{at z7#ayaOS+0_5WW*6{z3&_02NeJ3RTe*lm=Th1@+TV1-?Hs4}6%GDX;=KzG^fns3ykO i;qAf|!O>U5o(&(15I}!5_-9rC0000Uy+ehI)C3uL_t(YOSO|R z4udcd1XI#cQu6;d83aEeOu``>FFud@8H8Qw?k_^RwCqousEb>UUA@W$Z zQJ-PBvJH!h<8eA6gms^gmo3Q4bzL`w+RZLlT$V+mBFVwzd7eN23x?l@irmVv2-7s3 za83fTtcc}nBnfzLhJC+2pyXnpMy?8!WGDta8L|Laq(z1^07P13NCKcf!??5(BD3K9SS3lag+-G2O$ zMmm3uNkl) zr9k+cW;<#la?Tk7BeXDbN~!YI)(njN$y#j07=^Z%$S5PUJVkWCdvfD_=luYZmw_F5 zE3lH?fG5L%jvUDpFp(o!{fQDmpTSJ>5HKSV1fSDv$80)!5TR!8@Bn&tNnxw=ur~kz N002ovPDHLkV1fx(R}}yN diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlack.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlack.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlack.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlue.png b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredBlue.png index 198850fac8d97e00fc155235e3a3813aa7812392..5905ec754226f9dde0967c9050818af7880430ff 100644 GIT binary patch delta 480 zcmV<60U!Rm1G)r|7YZN<1^@s68;SVLkuDnw5dZ)S5dnW>Uy+ehI)9}}L_t(YOTCld zN&-O?hgYF4B^TRp7ZrSzAgYUq=oKO;`a^|vA$ie;2pb8#-mbgeRFv-88=QV;RMd7P zk3j<;xC6iMoH;WZ|FrIC^kbP-Cv)Qwg56~#b+YXym5Lt17hp>&sZl=Ppi1?LR#*5K zB0-a!ibr<2tptX#BY&;#5-+RRM(`AfX5dm`-BW^W<{ZH@AZq_!g>yNcehq9&!o04g z1lQnDBB;}v*`l)3LWo;G0{ap{gDlIXqRo>(278jQOExN3tIr5=bry)Ge@i8&O$E!N zY!-qHU*Ex^f=e><4|sXaQRNdLJiFt(P|oCc&x5-G+rJBZ-+%uT+RZe5((f-Mh$)N` z2;Q`k)W$3^MF>aH0O1~ZO-W`x()1||W9oJX6a;(>kpPtuWLTgJGpUUUiTXo@s{KzO znn8lr2TBmAv$H_dL9D`^4o_cy_A%N`p7=z-9lT2fxc4xjuDW|}{R8OF&uBJ>g5llI zAKsWB8yrM+bv5(BD3K9SS3lag+-G2O$ zMmm2PNklSv3JPdR8JQy(a yg)~%e^VD#Ea(UJn=@e!?zlbx0000*dOIe!9bNklhta8y9tQ4Z|2WSF`<*H!h z%j9)tw+k#TwHxo8AW-Z?u!2?ytWJXkppj0!C!Wv9x6229#p%A=28Q7I=lBA zG?qLx7Cns0(ok&$uYY4gc6B(P4d@>Q1W|vZ!(TJuu2*671@x$jN@T+73fOn7OOfe? zI^2#0>yv=7C*VX>*t6lkkeGhu!R%`Aw@io~0dre}vuVI-)$&u+NkrSyVC)K1H>=Ql z0`7{9<|>W*p1SYQ6kiO~`WkAp*NU@{^AZNB+kFEwt5cYHLVq4SCQqKaw33e62MzM} z4aFSw`!3|Vfc36|TPsuWpG!1fl7Y``G~ODJ9UA@a7y%CXK*CwGAvS2=o(W^S0&T;D z{hCH^QGSw;Z3lYaf{bMQv$kWjl7R6`wVPEIbs;Vt;|&MUAZ z+I{XXd*2j_zkklzlATLO5Cs23VX_Q`$ubls%W!ds1`(ozJTd2p_#jTt-}#)96G)1W zLqsRUS%~m7KtRNt`$^D~b0OUYe1AgceL80X@gPqBbVe8FK_U{J5=YeSM??kb?||+? z&NKVz6c;P72w$>5@}!Q@FhqPvf8>tm+#p|^6JU6iw11cjY40Je#;^z%@+5ng#Y|2h zG3uDQ5%G}L;uVfa=#T{259UgDCMUoohLUl~*rQe0gOJS}8F!W3kBn@UOkuJNg~`bY#BW;>&fl)st8oAT O002ovP6b4+LSTXv@kS&7 delta 485 zcmV5(BD3K9SS3lag+-G2O$ zMmc{0oJmAMR5(wilF2SaK@^7T-l{v*a0iWN(ujBnk>JMAZ$qqzu;39aL}SqrnkI-g zB{p8-ckYnx=Jvv{_$pN=_5Ww6Vr;hYKZXW>L%G2p$qn*Dm>QUdLb#$4tr_TLjU)}B z(*U*A1TpQ+oIjj-uJwm5&(y#T*rU_^Y(5gj=&XD&pCfp=Y4T?bx^ z!JqQ_2BS+cOw)sR#~|JrRF{NpAJLw~=s^glWh1(Az@8bLTN~7%wo<(^aaXR6{sAn4c#CQET?&@+(>5`x_Qj=hq|#@428FJ-DP85FggWxU zE~wwO195A?zHs0lQt5Sym-k9d2HG@q!K8|FYD}gPWCca#Ti3`1%txj;*6oe bAJbr;6jxSBt_m|#00000NkvXXu0mjfikIL^ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredGreen.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredGreen.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredGreen.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredLightBlue.png b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredLightBlue.png index 34a0ffdde12fbb882a760fc86e65d45a3dfbfb9d..65ecd8a5cbb0c4c2cdf74ae44a1b8edc3319a271 100644 GIT binary patch delta 298 zcmV+_0oDG)0)+#R7YZN<1^@s68;SVLkuDnw5dZ)S5dnW>Uy+ehI)CsrL3QJ!0?$>)Y5*qaCJ600000Ne4wvM6N<$f}P2Cj{pDw delta 231 zcmV5(BD3K9SS3lag+-G2O$ zMmm3?Nkl-RYsbmccAomVIkMX#BREhQ zJ{tHLp)!E-Ss;k;7xV*{n%8zvK30eJ0ueXCP*f%X5eWmT90ULsiOPT&NF*u)>PRB^ hzwZ)t^u*=7FkkNwpYVmzKZ*bV002ovPDHLkV1h0aU1k6P diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredLightBlue.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredLightBlue.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredLightBlue.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredRed.png b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredRed.png index b2deaaeb76d2f9981b027220612ed2c8f75d92ca..c9eb63a37130957f20a0c873203cb36f794f3426 100644 GIT binary patch delta 420 zcmV;V0bBl_1N{S#7YZN<1^@s68;SVLkuDnw5dZ)S5dnW>Uy+ehIe!6YNklY5Qgus*$Ea_7S`zm|AK|JU?Erp>;wyI!9uXG6YKceC05iFTId%diCVVClG6K`<~-=B<(x%>`pp$9(ytuRC%!H0n|zf5T$@vDS{)<-yxZE#-^zkjnn8Bq?dC@L(Qcwkh; zq9*d_!rm&3-~}$ASzG%MI?t>TVO}h%uk9zwjgBC@XV8rli(oQ^U@{(;eE}c4VA@ju>Rtc< O002ovPDHLkU;%=6M!YEi delta 324 zcmV-K0lWVF1D*qr7Z(r+1^@s6AM^iV00001b5ch_0Itp)>5(BD3K9SS3lag+-G2O$ zMmc`~{7FPXR5(wik}+#SF%*UK*W3yYx;Qwy2`>Hs2WP=S=pb|x9GnXs1P3?4O>hu8 z6bc;*4ua6>`JKyslIRlyeejV>a?Z(pNkVA$|3~HIJ;ejE0!%y&p%}sd+Tim~157x= zaB>RhWCmQ#pEB}koIxWazyz-d4{rWte20Gzc-Da}b`e?2ZeG9~B6DScExaN6hA(Fa zTWCS4aeWeC3u8nwAK?$yptgHZYFwWLT+M2`3|N77jt(s~#{oL9A5g#<_OOJzf4;>F zdnmeNwXK#nPzS9!sjcB47YZN<1^@s68;SVLkuDnw5dZ)S5dnW>Uy+ehIe!5zNkl4xk_o-pow;3_aQJuRd2Zv+-ve`& zW%~lk2m4zHW^kVXnnMcZqgmhEqP_@4tj}ieC$rP@jjyHI@yTgUrzU-MB0@m>Y4-7E zc6QB`n*b95ZIieT7=NZYx+z}FF4Z8Vy-ckF1)Y;__stmmi8e!G=CL$eYc+%>z2R5` zbzQQkQ&=;GP*6&58j7OW#i;1BX&Q^^VpJ3{*LA%wpljV5(BD3K9SS3lag+-G2O$ zMmc`~(n&-?R5(wak_!rhFc3sNV$b5;auJWvLTORaexVhdW}}nlvysw;3AnTKvWiu; ztG9$enqTS7MK0Jh&Hn%i8)FF2A!>6C2%y~~gygeoa}7)V0-zbG0LUeW45wnX2VkC& z`5sD=G#?{yAAsSs=+XlH(e`X#JoclF>=9`}q^39UyaA&f?(7B<62SDzUMKp95yWlN z+bzz(wR5dJTmnc~#NzW7Kn+VE+(?DEqY&oc2ITu6$PmA9a*OwQN#xTk1pS5-L4Gzg f12LE?nXB;uPhu{E(U^Ol00000NkvXXu0mjfnwWaZ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredWhite.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredWhite.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/items/itemCrystalEmpoweredWhite.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +}