From e88d5b0d464759b591174fc6aae6e38b80473d55 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 2 Aug 2015 02:04:31 +0200 Subject: [PATCH] Changed Recipes around a bit, Ore Magnet Textures --- .../actuallyadditions/blocks/BlockOreMagnet.java | 7 ++++++- .../actuallyadditions/crafting/BlockCrafting.java | 4 ++-- .../textures/blocks/blockOreMagnet.png | Bin 0 -> 658 bytes .../textures/blocks/blockOreMagnetBottom.png | Bin 0 -> 706 bytes .../textures/blocks/blockOreMagnetTop.png | Bin 0 -> 740 bytes 5 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnet.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnetBottom.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnetTop.png diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java index 18896e6d1..7d66b1d60 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java @@ -21,6 +21,9 @@ import java.util.List; public class BlockOreMagnet extends BlockContainerBase implements INameableItem{ + private IIcon topIcon; + private IIcon bottomIcon; + public BlockOreMagnet(){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); @@ -36,13 +39,15 @@ public class BlockOreMagnet extends BlockContainerBase implements INameableItem{ @Override public IIcon getIcon(int side, int meta){ - return this.blockIcon; + return (side == 1 ? this.topIcon : (side == 0 ? this.bottomIcon : this.blockIcon)); } @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg){ this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); + this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Bottom"); } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java index d7dd646f0..3b194ebe1 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java @@ -92,7 +92,7 @@ public class BlockCrafting{ //Lava Factory if(ConfigCrafting.LAVA_FACTORY.isEnabled()) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLavaFactoryController), - " C ", "ISI", " L ", + "SCS", "ISI", "LLL", 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), 'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'I', "blockIron", @@ -100,7 +100,7 @@ public class BlockCrafting{ //Casing if(ConfigCrafting.CASING.isEnabled()) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 8, TheMiscBlocks.LAVA_FACTORY_CASE.ordinal()), + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 32, TheMiscBlocks.LAVA_FACTORY_CASE.ordinal()), "ICI", 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), 'I', "blockIron")); diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnet.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnet.png new file mode 100644 index 0000000000000000000000000000000000000000..8e1a53740c4b6b6bd71c24cd574bcdf409319cc5 GIT binary patch literal 658 zcmV;D0&V??P)WFU8GbZ8()Nlj2>E@cM*00H(%L_t(I%T<$2PV_tw zgr9bIoD87h5I_h&BHaHJED#{F;RGzn%s6g;i;=DOv*d*>cUN^)S;lcJBEmS1e1Csq zW&o_~ikT5Y0HBltfV(qI6Q7@-^nH)q-`|%~3L-+^_qaRmPD%-P2WU-m&H#u=YaGUL zL{%GVE$sUqRYgQdDUniYAZCWDGL9p1dwW~z!^$M*jJp#;XnWf>N-305P*sLuKt!+@ zBipu-b4Eni@Au5}%=`O0Ap}xN0L=5u$Hxc1zrTnG>$;wsr<59E&Y5|hS(b$m0`88g z(sdonvheu$$lu>z8#ASZ+}zxhszE7*{eIu*t16Y@wr!XhKR-VV!$6Gj?9wm{)aCAo z2wm4T)z@|9bUNYg9FNB)q^goqBGkfaQ3!#YGyk$OGcGSLxxT&zXpBSz%Q+K5Xb!kL zUDvT~8!<*ymBZn{x~~5VQ*|x$ea~*UBgTk`@bdD4yJKdQQaBtAm>KTQJkKp?6)+r+ zN7i*^+cs2{Wm$NBer_sPH(p;~d3$?ng_Vum-QAUXQA)wxn`rg??=mxDjC5UhW;#t1 zUteD>-!EYlLg)%FJ4_GdXAe16Ht63tsn+)Bpeg07*qoM6N<$g7}>oZ~y=R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnetBottom.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnetBottom.png new file mode 100644 index 0000000000000000000000000000000000000000..187a42d751a870fa454a9d813d90f0db1243c70e GIT binary patch literal 706 zcmV;z0zLhSP)WFU8GbZ8()Nlj2>E@cM*00JgSL_t(I%axNoPU}Dv zg}?cc9U~OUi6C;50*Dzxc0%I?Sjpay7m&s~iNJwWX)F}sf+j-F%)BD9_0SW=yVA7h zo_oGCB27~-gdj~*-rnBOS_5!A9?@DOr3Aox4}fzHV+^mauY_TUxWB*m-g|@)gkgwt z4(A+g+v1!9=tZry00<#^VV$NayWI}w9LM7kDJ9$OmeFX$-_tY=v)POw2yo6Jgy8n} z7IAlX=ao_jA@JUFI2-_&PNzQv_WL~maU7$RVlWsWgg^&D!0B|tT1(S3jK^b=Bw;d{ zP*oKG#u$dfA$48z`T5E9^>y!7wrz{Gmfda#K$0ZP=X2`1X0=+eTCJ$-n)!TAk|Y3B zRn_ODopUIq7>!0ur&A`A37gG^JkKf15`a9kdkYyPFMNzO=EO>c&VZYzgG!1baBc((bV|-VP!{P8N z#*dGW9%CHGc<)h4A!f6g?@Hvo@16Wsr15x6N6tBiHpWm@Rp0Nct1GtK?LVP4O~cL2 z4N57ZDB}D3n}>&o^JnTvbTpJwD5db;_i1;Qt+nUPTA!D8H8#c&MG=>mmqbxS5Cmwg oxwyFKAAppS$HzykwODKU1K*Dpl+o1s0RR9107*qoM6N<$f*^%9&Hw-a literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnetTop.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnetTop.png new file mode 100644 index 0000000000000000000000000000000000000000..283b945eece26b66e5083058d9622d882864892d GIT binary patch literal 740 zcmVWFU8GbZ8()Nlj2>E@cM*00Kx!L_t(I%T<#-Pa8oH zhM)a7pYQA{zX6@ErHJwaP!I+GAYE!eivL1Nmo%0|kpenIks?C43>6A3MAXm(n-8Ir zrQ5xo6xOc9NGt8f%scPSyrZhB5~UPXRdIKBhqV@f)oO*c7Ogb^A_71Nfx51_y}c#R zbJS=w5)nZuMV{w`5C|dQoFjw)kU+bx13)R2fOS<>7-Le_7?|fd#u$`RIOlNAr6kr` zj4@PIh1%HIkmwkhbX`XX0j+gf-g`s@5y2Qkzu!kGh3)lvc<<@D4y6=ZTU$h%&*$kr z0vTfv5mu`eT5D{iEFx@gZ}T_&0pRnnSEdx*%o9{qkF=iIx%tK%Eyzdo!FyU;WZ-h1BO-gtU? z;_>m3wr$s6i@gQ-@omP{@eMcEmwcW7d`vmZ77J>$;{W3WmcWMN!b}^|01bmL+9bG8hc7)-oIp+1%Vrp#K5y W