mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 19:05:16 +00:00
The Mana Pool's "water" icon is now a different icon and not the one used for water. (it's still the same icon, just in a different file) Closes #1387
This commit is contained in:
1 parent
8dafb55237
commit
9bfef37e98
4 files changed
+11
-4
No files matched your search
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user