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 aa4d370..4e1e257 100644 Binary files a/src/main/resources/assets/exastris/textures/blocks/ModelSieveAutomatic.png and b/src/main/resources/assets/exastris/textures/blocks/ModelSieveAutomatic.png differ