diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 243d9d371..ca840a0a7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -31,6 +31,7 @@ import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPool; +import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.block.tile.mana.TilePool; public class RenderTilePool extends TileEntitySpecialRenderer { @@ -123,10 +124,8 @@ public class RenderTilePool extends TileEntitySpecialRenderer { GL11.glRotatef(90F, 1F, 0F, 0F); GL11.glScalef(s, s, s); - IIcon waterIcon = Blocks.water.getIcon(0, 0); - ShaderHelper.useShader(ShaderHelper.manaPool); - renderIcon(0, 0, waterIcon, 16, 16, 240); + renderIcon(0, 0, BlockPool.manaIcon, 16, 16, 240); ShaderHelper.releaseShader(); GL11.glEnable(GL11.GL_ALPHA_TEST); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index b5345097e..439bb2813 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -33,6 +33,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; @@ -48,6 +49,8 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, boolean lastFragile = false; + public static IIcon manaIcon; + public BlockPool() { super(Material.rock); setHardness(2.0F); @@ -70,7 +73,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, @Override public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP + manaIcon = IconHelper.forName(par1IconRegister, "manaWater"); } @Override diff --git a/src/main/resources/assets/botania/textures/blocks/manaWater.png b/src/main/resources/assets/botania/textures/blocks/manaWater.png new file mode 100644 index 000000000..c7e90b073 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/manaWater.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/manaWater.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/manaWater.png.mcmeta new file mode 100644 index 000000000..0645f48c6 --- /dev/null +++ b/src/main/resources/assets/botania/textures/blocks/manaWater.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +}