From 38024f98ad6b5991f47d78f1c3800c639ded7976 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 18 Jul 2016 15:17:47 -0400 Subject: [PATCH] A few minor fixes, added Ultimate Tier Installer texture --- .../common/GeneratorsCommonProxy.java | 2 +- .../generators/common/MekanismGenerators.java | 2 +- .../common/block/BlockGenerator.java | 5 +++-- .../textures/items/UltimateTierInstaller.png | Bin 1446 -> 15632 bytes 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 34f4062eb..63bc3f00f 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -105,7 +105,7 @@ public class GeneratorsCommonProxy implements IGuiProvider generators.turbineBladesPerCoil = Mekanism.configuration.get("generation", "TurbineBladesPerCoil", 4).getInt(); generators.turbineVentGasFlow = Mekanism.configuration.get("generation", "TurbineVentGasFlow", 16000D).getDouble(); generators.turbineDisperserGasFlow = Mekanism.configuration.get("generation", "TurbineDisperserGasFlow", 640D).getDouble(); - generators.condenserRate = Mekanism.configuration.get("generation", "TurbineCondenserRate", 8000).getInt(); + generators.condenserRate = Mekanism.configuration.get("generation", "TurbineCondenserFlowRate", 32000).getInt(); if(Mekanism.configuration.hasChanged()) { diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index dcc6d0913..8a39f918c 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -157,7 +157,7 @@ public class MekanismGenerators implements IModule " I ", "IFI", " I ", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Generator, 1, 10), Character.valueOf('F'), Blocks.iron_bars })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 13), new Object[] { - "STS", "TBT", "STS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), "ingotTin", Character.valueOf('E'), Items.bucket + "STS", "TBT", "STS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), "ingotTin", Character.valueOf('B'), Items.bucket })); //Reactor Recipes diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index e5a9df04f..4bffd2895 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -22,6 +22,7 @@ import mekanism.common.security.ISecurityTile; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.tile.TileEntityMultiblock; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; @@ -669,7 +670,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); ItemStack itemStack = new ItemStack(GeneratorsBlocks.Generator, 1, world.getBlockMetadata(x, y, z)); - if(itemStack.stackTagCompound == null) + if(itemStack.stackTagCompound == null && !(tileEntity instanceof TileEntityMultiblock)) { itemStack.setTagCompound(new NBTTagCompound()); } @@ -696,7 +697,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB electricItem.setEnergy(itemStack, ((TileEntityElectricBlock)tileEntity).electricityStored); } - if(tileEntity instanceof TileEntityContainerBlock) + if(tileEntity instanceof TileEntityContainerBlock && ((TileEntityContainerBlock)tileEntity).handleInventory()) { ISustainedInventory inventory = (ISustainedInventory)itemStack.getItem(); inventory.setInventory(((TileEntityContainerBlock)tileEntity).getInventory(), itemStack); diff --git a/src/main/resources/assets/mekanism/textures/items/UltimateTierInstaller.png b/src/main/resources/assets/mekanism/textures/items/UltimateTierInstaller.png index ea0f39edf851c89c160a2a706a09686ee35fc41f..0dd5a217fc462be04473cb0ba78c851e825670f6 100644 GIT binary patch literal 15632 zcmeI3eT)?49mj`APdPloA=J|ly0?f0;@-^c+w4wu*Y530_b7|!apVqA%k0dvcN2DZ zmYKQRy({tMP$=&rQcV#-3$gJ9gT~e?DcT~v06`3f5KC)Y(OOE4u_aQg@%qfZ-?O_< zFO7dblkCgy`98nj@0ri@d!A?hna!QczTeb%Ya>NbO&yV77yO-Rd~Rrf-{1MyxB!2q zr6Vgfikg0t@tH#X^r;q#;$N4$d-dMvQeIS&ZGxo4KwCDMhP^4ub7wX!h--mvih({k zoxn0gr?qTrzxPQz~pFiT11v*O`N-pb+~L+#~mgs!#ZfjO|y)J zVR@F}t&FK~nSG7$pGTGAd{;1BNCz#ixnI}QJWXdZnYN6rO;P)3*6nuFjFq-pEwG10 z8%pUy){@fZ=YtgE1c4^1a$1*_l*x!I#FPQuYc?B+N>|~&lIdu)lq#ha=s}KjR!Gxq z8$&0PbS+O!?*ipP*7Vf6hth!V0-7?QiU4+>Upr7}5RR^Jx047I8U!i5W+*sk_&~Mt zOJd0c`k>Gz$r5kn1Sf!%WpMzOv$#Y%{Ng~&Vzs+s zahKiAStW;ut{bLYRfSYFQrK*q-RXC@17W|PWkYsXm~n;eR$G8^GJc!QUkqR2S{1e< zrRhRS1ci~yaO9$sWyDxqw1^TTSb){;w!|1lv~V$-7!w$m%OP>a&=u}gp@Tq`2Z0n; zm1J(gqy<$2M)7*h#p*4sumaUw`SWu1m;}xqkBb6lkvO+#0g~NeiE$7v7l(s%3NcBF z!7)|2m&XJXc=EFJ|ISsFdpUX$N5w5y7fVFebVVJi5R5??Tgh^;ZenXuNXU~USK zb3DTohnnkEKZvHp^^Bkbe;-_MzWg!KS==>Dfk5t9FfHtnQ<9R=78RpTbgLg;>=#mf zK=RQ=$6^EO;-QVHOUM&vF5fzFLW|W=T>!?~<^w7aU}1DCN@6m%gSwQ*RgMONf)2{0 zxo+0QGj86-6-k$Z@vTsEkN#x^-niO=O zoD}*1olf<6=yGF4&(gWT2b6@O!eIfQ%|q8}uIW|WBK>eHG*+pG%&IZf?Lyzg*77PX z?fUZ58x#TCcH{CkAr;IV%G%_&5fyf@`IWx~{~#R?4Vr*>goo)_vAO zHl(@2%Q(dIrLi17xB{Qk;jqEu7i~s8I^`@#^af>kwrj?g$~p@^s8G{!Wj)6Vq2QRG zxQa*2T&3k(;R7sucBV@Y&s9ZO+RDGlKjl06CZi&;ND>4H-Xys2d=Qo3LV(~+f(y?F zQ3);t2;L;P@O%)J;6i}lO@a&02T=(w1PIZrTMOBj+ z>55X+@B)f@a05ksF%Ew(Q`7)MQGZ_p-*J7CqHb0m`{9W&MNK)^5%hOwfB)8Q@77y| z*^lhMWnWKoL#X+c)?L!pmdJN|FE%zbb%?^N5npd)moI8Mvg6Q!sXZNit*QG%-;Nzw zbnfBV_fKDZ{O6apy}j3b=JtPdul`W~<>)o{CT-551>CMvO&`6%Umf;NWA>h5qPuth zNE!OUZo-D^{G8tV^F;zU74Z zh4Wkb?WflJ#@5Y!|C7P@TmQ4(_xYFJjY8)O=UZlMy0PK9#d{jJo*0STHgfpN)6>`Q zxMVtXaMeqXo&8vTZ552L%u2aKYUy`ciDbYn$glQG*^NR=!;#)?pA4Qp{^51@sOa3=ymRdC*^fN1HM8eUnEJ&FYv+zVbKlG3 zqX(W}xTXD>&Nm0{UHb0T8S8$1pLo%^J-ngkvkQMX=KAZuKWIKHKBphO_m0!;E6!h; zcJT3IAE}!UUwQrT>3u(2{Z#7I%qh<@U-I+&KL_oUykZy!9medfq-*8Fzp&(lBu y-3OPyy5*toJs5v=^Pk3h20Fj~lKXld^~6u!{;~B@VWaWRaz|)c@NoN@k^chDn>nQb delta 941 zcmbPGwTyd$ikf7JYeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_tKBiB|rM z3KP5R^i6e>4U7yG%q{f{O-(Ef4RsWZ3=EC+4Gr{-EOiYHtxU|V49ygvK*?_6FDE$# zo1&C7E0@&bJGIDgZbapW}aCUQaG&FQIu`n_=uy8bX zbaS&XHgYs^gz5FnD=taQOHPI9&4lYUbHl6G%2}%@HL)bWC?r2W$5sgvE&&<&CHch} z`2`Bj&I%ggnRzMs<;9vxc9RQPM1+bP70GLbBtyq85sL`eZ6k%Ht4i1+mE6m0a- zf(9lOXVUD++M5?)13g^u|EtN{EU|%z;Tw&zu%*-P_w4Jl8&BoG@B41vyNcp%%iRyhHC=vr6;UOqlSo;!NK5$4}Fe^B1jJ_2zrE=F*^*7hZpTQMP-Em#W%i&PE4@ z`RCJTJBW(5v=r_1F`K>gVur^gr-cryuO{uj`>1GVj;h2XWj>K^*FSakoi0roCR*2x zX7ZeVI_Yrz!vyaKpQ`o>*^6*(j9ObEQmaubcwLIGJy4{zUi!V&!Lnq@EfG3PBClqB z^=CaDA~@sp)0EPS^4qp6G_{_KT6-+o`}eaS5>HQbm!+B>`DwW_#7k|DVPoquzvaO% zH?3F_^*Qj3A-~R-I-O(d{pD5n9e=#hH-TgC*|gwU&n}v5nXenpv%f50jl=fazI)@` lFaK*2tN#Df^q*J)Lww<>X$-1IGk|f+;OXk;vd$@?2>>>fdT;;$