From 3f694dc45c0e135799431e0224724096c25767c2 Mon Sep 17 00:00:00 2001 From: LoveHoly Date: Wed, 10 Sep 2014 06:17:43 +0900 Subject: [PATCH] =?UTF-8?q?=ED=98=B8=ED=99=98=EC=84=B1=20=EB=B3=B4?= =?UTF-8?q?=EC=99=84,=EB=B2=84=EA=B7=B8=EC=88=98=EC=A0=95,=ED=85=8D?= =?UTF-8?q?=EC=8A=A4=EC=B3=90=20=EC=88=98=EC=A0=95=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?1.03b?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../ExAstris/Block/BlockSieveAutomatic.java | 2 +- src/main/java/ExAstris/Proxy/ProxyClient.java | 19 +++++++++++------- .../textures/blocks/ModelSieveAutomatic.png | Bin 4032 -> 4009 bytes 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index cb375f1..32431e9 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.03a" +version = "1.03b" group= "exastris" archivesBaseName = "Ex-Astris" diff --git a/src/main/java/ExAstris/Block/BlockSieveAutomatic.java b/src/main/java/ExAstris/Block/BlockSieveAutomatic.java index 5ac2d58..c2ac98e 100644 --- a/src/main/java/ExAstris/Block/BlockSieveAutomatic.java +++ b/src/main/java/ExAstris/Block/BlockSieveAutomatic.java @@ -39,7 +39,7 @@ public BlockSieveAutomatic() { @Override public void registerBlockIcons(IIconRegister register) { - blockIcon = Blocks.planks.getIcon(0,0); + blockIcon = Blocks.iron_block.getIcon(0,0); meshIcon = register.registerIcon(ModData.TEXTURE_LOCATION + ":" + "IconSieveMesh"); } diff --git a/src/main/java/ExAstris/Proxy/ProxyClient.java b/src/main/java/ExAstris/Proxy/ProxyClient.java index bc891c2..481cb46 100644 --- a/src/main/java/ExAstris/Proxy/ProxyClient.java +++ b/src/main/java/ExAstris/Proxy/ProxyClient.java @@ -3,6 +3,7 @@ import net.minecraft.item.Item; import net.minecraftforge.client.MinecraftForgeClient; import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.common.Loader; import exnihilo.blocks.models.ModelSieveMesh; import ExAstris.ExAstrisBlock; import ExAstris.Block.Model.ModelBarrelThaumium; @@ -21,13 +22,17 @@ public ProxyClient() } @Override public void initializeRenderers() { - ModelBarrelThaumium barrel = new ModelBarrelThaumium(); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBarrelThaumium.class, new RenderBarrelThaumium(barrel)); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ExAstrisBlock.BarrelThaumium), new ItemRenderBarrelThaumium(barrel)); + if(Loader.isModLoaded("Thaumcraft")){ + ModelBarrelThaumium barrel = new ModelBarrelThaumium(); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBarrelThaumium.class, new RenderBarrelThaumium(barrel)); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ExAstrisBlock.BarrelThaumium), new ItemRenderBarrelThaumium(barrel)); + } + if(Loader.isModLoaded("ThermalExpansion")){ + ModelSieveAutomatic sieve = new ModelSieveAutomatic(); + ModelSieveMesh mesh = new ModelSieveMesh(); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySieveAutomatic.class, new RenderSieveAutomatic(sieve, mesh)); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ExAstrisBlock.SieveAutomatic), new ItemRenderSieveAutomatic(sieve, mesh)); + } - ModelSieveAutomatic sieve = new ModelSieveAutomatic(); - ModelSieveMesh mesh = new ModelSieveMesh(); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySieveAutomatic.class, new RenderSieveAutomatic(sieve, mesh)); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ExAstrisBlock.SieveAutomatic), new ItemRenderSieveAutomatic(sieve, mesh)); } } diff --git a/src/main/resources/assets/exastris/textures/blocks/ModelSieveAutomatic.png b/src/main/resources/assets/exastris/textures/blocks/ModelSieveAutomatic.png index aa4d370b4659b3bccb874686e79535606e63720c..4e1e25726f83e480ca7268c0f2830ae94386249d 100644 GIT binary patch delta 1276 zcmb8tYgCd47zgkdNRR1h-f%88ys=?rdc0?68WNg}sg+l}WG(5aq>z^iUB0;TKGfmH zmbYeyZfN*sxdeNY>df*=^G0AeE%YV4i!*04$A^8~m!9YA@BiWdoJVSZ+a7vk431IA zK~Wc!b9J)Jkr1E+tVu$XJ)MqOZ7;Mb3j_kxA%fEB-IL_2jxwpo;*q?d@(YIHVr<@& zfmvu`X!W@s<=uc&`FWhP^WOeB4cE(N-sAW3>#vX-WjfhG+eLT+&PN)ul}e?jc4jONai{h;g+q>f_`5Vl+ zf-Nxuo4Z=+*5(ry;n*a3uP(6)7vQPtws+#-cb+mFU4H%hVkkuJW;gcbw+e+(*kFXW zg|wtaVT&?fbvRONxFIVOeeaoFk@9w-@EDDsHF$eDEa6;A3}`4vQL!fiuTqD)w%wYQ z1e_n-9Tus2$i63M=kS;Hu9p818z-f<3tKCDfxYN>- z`X%lG*V<-IttQiHzwJv0c#he_9tpkPsI4mf3%|{uk{7jK$dx~l(!8U>;24`krBahq(ZRC z`m?pvI(uhgbhN%ydhHFr1?o_W=Q8j9qer5Ffv}7-XIv;2NnHi7--J!+^23}b-K@bnk|~2&j490&bB_RLrYhL z?BOBj5`rpzJmJ~-60XDHMkH(SuRI=P?k)Ia9aTeQWH4tgZoKlBlL>!d1YN$Ow5jBg9K=z8VwcMih<1(4>Exmy7Q0#-GAC^A-x}Mhr?yX zp89lBqbc=c>p8lK<+J}??$Yqhh)p>E-Rk6Hj7pq+n89Gct!z@YPTyc-Y3fqo#SOtV zm-}5^%;F!fQwm%WLsEUV2{_;-a80y8^|nPdBDLW+!LNAau;Keh7haUo_`CZ&t%CpP zmK5`gs7}Q7INhwgRd0l|lAovD%Srlw>ud8pYS;MMkv?Uy-AtnK4x@kXudDdA`mJft zL=%0A_cgkm*useYGZ0bwbh~4Xry?OL9)L_Cqst^`YtE5WHQLOWn+TAaelQ`rcxRzN zqoNQufb0e|y?AcmfVB|={{!2Q^dLPpDsqx4{)-#w(=(LGYfUfi5F+}M-IFbh;T1IS k9^ic3=6oFgD9thiO@S4R`@FcYd<@VJB{-ZcBAxi|Uz~?lf&c&j delta 1300 zcmZ1}e?Wf2KCb$=o-U3d6}R5ZJ)d>QP3HLiP1j#rC-PF_Ob z+P`lLe!lrLao?ed#eVwn`%11w*;af|xFq5~@6Q{Rm+$uO{*`BNq5jjSO;vm6sjOU= z9hp7#`OZrwS2Ij5-Mcq0Zg17nj}{YEYV&({eR#Y%ed2?lmv7&^v3Ndb)v8OMpP#?` z_;~-~m*?Ievj6K^D){34{CPW;`~P=oIxV7b+Q{;G$h4)OZ01{iUHLyYR{MN$?Cvt( zNhbF8`p@UgnO(DNmDbeMm5Ve|)`r%x?58b}7ZbCqeRY`qebMrg=>x; zJ$h}6pD8lecb@^jxIz3h2un945!M zgxy!~U%S<}zI)LM)7&2y7i(}$P5pUOYhSi)%p!)_vu7{o+gQi_+`SnX8+(7B%skBh z_wwS-{g1CNm0Rb~u-VUt+u*L@K3{+7y8rLa|GYJMd)59ea{t^J>vosF|7gfs7#1GB zbCn{uz;Qzm?@zN5M+gH)3`5>yHa!RHNS=e74}y;gtYBDtv17H=CWha?f5%*%z-nRf zI#a$yv4Owk(Dj2e`)4 zeznRcp8u-dwLM$+Ob5gMd%H|6D}I+<^4p-Z^6Qg&EzT=I#VO(pci1h&>sy?d#Tx=L z9xw@T@y0MXEo|g=&@d@r%3dA@An