From 37d63bc672fc8e23e23019ef6b1080cceee85723 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 14 Feb 2016 22:31:00 -0600 Subject: [PATCH] Remove some top level sideonlys where they werent meant to be used, fix wireframes rendering too opaquely --- src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java | 3 --- .../java/vazkii/botania/api/boss/IBotaniaBossWithShader.java | 2 -- .../botania/api/corporea/ICorporeaAutoCompleteController.java | 1 - .../vazkii/botania/api/internal/IInternalMethodHandler.java | 4 ---- src/main/java/vazkii/botania/api/item/IBaubleRender.java | 1 - .../botania/api/item/IWireframeCoordinateListProvider.java | 1 - .../java/vazkii/botania/api/item/TinyPotatoRenderEvent.java | 1 - src/main/java/vazkii/botania/api/mana/ILens.java | 1 - src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java | 1 - src/main/java/vazkii/botania/api/wand/ITileBound.java | 1 - .../vazkii/botania/client/core/handler/BoundTileRenderer.java | 2 +- 11 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index ff6dc710d..8f4ec621f 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -33,7 +33,6 @@ public interface IBotaniaBoss extends IBossDisplayData { * You can use BotaniaAPI.internalMethodHandler.getDefaultBossBarTexture() to get * the one used by botania bosses. */ - @SideOnly(Side.CLIENT) public ResourceLocation getBossBarTexture(); /** @@ -41,7 +40,6 @@ public interface IBotaniaBoss extends IBossDisplayData { * boss bar texture. This is for the background, not the bar that shows * the HP. */ - @SideOnly(Side.CLIENT) public Rectangle getBossBarTextureRect(); /** @@ -50,7 +48,6 @@ public interface IBotaniaBoss extends IBossDisplayData { * HP the boss has. The width of the rectangle will be multiplied by the * faction of the boss's current HP by max HP. */ - @SideOnly(Side.CLIENT) public Rectangle getBossBarHPTextureRect(); /** diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java index e64dba2cb..038b287c4 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java @@ -30,13 +30,11 @@ public interface IBotaniaBossWithShader extends IBotaniaBoss { * @param background True if rendering the background of the boss bar, * false if rendering the bar itself that shows the HP. */ - @SideOnly(Side.CLIENT) public int getBossBarShaderProgram(boolean background); /** * A callback for the shader, used to pass in uniforms. Return null for no callback. */ - @SideOnly(Side.CLIENT) public ShaderCallback getBossBarShaderCallback(boolean background, int shader); } diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java index c02047dba..c1b909d5b 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java @@ -21,7 +21,6 @@ public interface ICorporeaAutoCompleteController { /** * Return true if auto completion should be enabled. */ - @SideOnly(Side.CLIENT) public boolean shouldAutoComplete(); } diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 655cd8eeb..c116a46f3 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -106,16 +106,12 @@ public interface IInternalMethodHandler { @SideOnly(Side.CLIENT) public void drawComplexManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res, ItemStack bindDisplay, boolean properlyBound); - @SideOnly(Side.CLIENT) public ItemStack getBindDisplayForFlowerType(SubTileEntity e); - @SideOnly(Side.CLIENT) public void renderLexiconText(int x, int y, int width, int height, String unlocalizedText); - @SideOnly(Side.CLIENT) public ResourceLocation getDefaultBossBarTexture(); - @SideOnly(Side.CLIENT) public void setBossStatus(IBotaniaBoss status); public boolean isBuildcraftPipe(TileEntity tile); diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index 44d467909..38de54964 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -32,7 +32,6 @@ public interface IBaubleRender { * rendering. Will not be called if the item is a ICosmeticAttachable and * has a cosmetic bauble attached to it. */ - @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks); /** diff --git a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java index ae7a1ba13..96a0f25c9 100644 --- a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java @@ -29,7 +29,6 @@ public interface IWireframeCoordinateListProvider { * Returns a list of BlockPos for the wireframes to draw. * Can be null. */ - @SideOnly(Side.CLIENT) public List getWireframesToDraw(EntityPlayer player, ItemStack stack); } diff --git a/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java b/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java index cd86958d3..11b8db411 100644 --- a/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java +++ b/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java @@ -18,7 +18,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; /** * Why would you ever want this ._. */ -@SideOnly(Side.CLIENT) public class TinyPotatoRenderEvent extends Event { public final TileEntity tile; diff --git a/src/main/java/vazkii/botania/api/mana/ILens.java b/src/main/java/vazkii/botania/api/mana/ILens.java index 38ea2fea4..6104a2118 100644 --- a/src/main/java/vazkii/botania/api/mana/ILens.java +++ b/src/main/java/vazkii/botania/api/mana/ILens.java @@ -19,7 +19,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; */ public interface ILens extends ILensEffect { - @SideOnly(Side.CLIENT) public int getLensColor(ItemStack stack); /** diff --git a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java index 4c28dcbf9..4ed522d3a 100644 --- a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java +++ b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java @@ -12,7 +12,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; */ public interface ICoordBoundItem { - @SideOnly(Side.CLIENT) public BlockPos getBinding(ItemStack stack); } diff --git a/src/main/java/vazkii/botania/api/wand/ITileBound.java b/src/main/java/vazkii/botania/api/wand/ITileBound.java index 3b2f42312..c228281c8 100644 --- a/src/main/java/vazkii/botania/api/wand/ITileBound.java +++ b/src/main/java/vazkii/botania/api/wand/ITileBound.java @@ -24,7 +24,6 @@ public interface ITileBound { /** * Gets where this block is bound to, can return null. */ - @SideOnly(Side.CLIENT) public BlockPos getBinding(); } diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 99474f279..be1071004 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -137,7 +137,7 @@ public final class BoundTileRenderer { renderBlockOutline(axis); GL11.glLineWidth(thickness + 3F); - GL11.glColor3ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue()); + GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), ((byte) 64)); renderBlockOutline(axis); } }