diff --git a/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java b/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java index 19da6afee..d71451ead 100644 --- a/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java +++ b/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java @@ -13,6 +13,8 @@ package vazkii.botania.api.mana; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; /** * A block that implements this can provide an IIcon (block icons only) @@ -21,6 +23,7 @@ import net.minecraft.world.World; */ public interface IPoolOverlayProvider { + @SideOnly(Side.CLIENT) public TextureAtlasSprite getIcon(World world, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java index afcf95259..c9505a58d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -17,6 +17,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IPoolOverlayProvider; @@ -45,6 +47,7 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo } @Override + @SideOnly(Side.CLIENT) public TextureAtlasSprite getIcon(World world, BlockPos pos) { return MiscellaneousIcons.INSTANCE.alchemyCatalystOverlay; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index dac4a7640..187ce65ab 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -18,6 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IPoolOverlayProvider; @@ -48,6 +50,7 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP } @Override + @SideOnly(Side.CLIENT) public TextureAtlasSprite getIcon(World world, BlockPos pos) { return MiscellaneousIcons.INSTANCE.manaVoidOverlay; } diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java index b0ca61875..4dff6ecdc 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java @@ -3,10 +3,13 @@ package vazkii.botania.common.integration.buildcraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public abstract class StatementBase implements IStatement { @Override + @SideOnly(Side.CLIENT) public abstract TextureAtlasSprite getGuiSprite(); @Override diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java index 6edcb6a20..174d97e2d 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -6,6 +6,8 @@ import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.Botania; @@ -17,6 +19,7 @@ import buildcraft.api.statements.ITriggerInternal; public class TriggerManaDetector extends StatementBase implements ITriggerInternal { @Override + @SideOnly(Side.CLIENT) public TextureAtlasSprite getGuiSprite() { return MiscellaneousIcons.INSTANCE.manaDetectorIcon; } diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java index 3ff736215..e502c769e 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java @@ -5,6 +5,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.lang3.text.WordUtils; import vazkii.botania.api.mana.IManaBlock; @@ -35,6 +37,7 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal } @Override + @SideOnly(Side.CLIENT) public TextureAtlasSprite getGuiSprite() { return MiscellaneousIcons.INSTANCE.manaLevelTriggerIcons.get(state); } diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java index ce66538bd..a8e738a21 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java @@ -4,6 +4,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.lib.LibTriggerNames; @@ -19,6 +21,7 @@ public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerE } @Override + @SideOnly(Side.CLIENT) public TextureAtlasSprite getGuiSprite() { return MiscellaneousIcons.INSTANCE.runeAltarTriggerIcon; }