Merge branch 'master' into ah-OOG-ah/patchEnch

src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java

@@ -32,7 +32,9 @@ import vazkii.botania.common.core.helper.MathHelper;
 public final class BossBarHandler {
 
 	public static final ResourceLocation defaultBossBar = new ResourceLocation(LibResources.GUI_BOSS_BAR);
-	static IBotaniaBoss currentBoss;
+	private static IBotaniaBoss currentBoss;
+	private static Entity lastBossEntity;
+	private static String lastBossName;
 
 	private static final BarCallback barUniformCallback = new BarCallback();
 
@@ -47,7 +49,13 @@ public final class BossBarHandler {
 		Minecraft mc = Minecraft.getMinecraft();
 		Rectangle bgRect = currentBoss.getBossBarTextureRect();
 		Rectangle fgRect = currentBoss.getBossBarHPTextureRect();
-		String name = currentBoss.func_145748_c_().getFormattedText();
+		Entity e = (Entity) currentBoss;
+		String name;
+		if(lastBossEntity != e) {
+			name = currentBoss.func_145748_c_().getFormattedText();
+			lastBossEntity = e;
+			lastBossName = name;
+		} else name = lastBossName;
 		int c = res.getScaledWidth() / 2;
 		int x = c - bgRect.width / 2;
 		int y = 20;
@@ -66,7 +74,6 @@ public final class BossBarHandler {
 		mc.fontRenderer.drawStringWithShadow(name, tx, y - 10, 0xA2018C);
 		GL11.glEnable(GL11.GL_BLEND);
 
-		Entity e = (Entity) currentBoss;
 		EntityPlayer p = mc.thePlayer;
 		if(e.isDead || !p.worldObj.loadedEntityList.contains(e) || MathHelper.pointDistanceSpace(e.posX, e.posY, e.posZ, p.posX, p.posY, p.posZ) > 32)
 			currentBoss = null;

src/main/java/vazkii/botania/client/core/handler/HUDHandler.java

@@ -51,7 +51,6 @@ import vazkii.botania.api.wiki.IWikiProvider;
 import vazkii.botania.api.wiki.WikiHooks;
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.lib.LibResources;
-import vazkii.botania.common.Botania;
 import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.block.tile.TileAltar;
 import vazkii.botania.common.block.tile.TileRuneAltar;
@@ -67,6 +66,7 @@ import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
 import vazkii.botania.common.item.equipment.bauble.ItemMonocle;
 import vazkii.botania.common.lib.LibObfuscation;
 import vazkii.botania.utils.ReflectionUtils;
+import baubles.common.container.InventoryBaubles;
 import baubles.common.lib.PlayerHandler;
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -131,7 +131,7 @@ public final class HUDHandler {
 					renderCrystalCubeHUD(event.resolution, (TileCorporeaCrystalCube) tile);
 			}
 
-			if(!TileCorporeaIndex.InputHandler.getNearbyIndexes(mc.thePlayer).isEmpty() && mc.currentScreen != null && mc.currentScreen instanceof GuiChat) {
+			if(mc.currentScreen != null && mc.currentScreen instanceof GuiChat && TileCorporeaIndex.InputHandler.hasNearbyIndexes(mc.thePlayer)) {
 				profiler.startSection("nearIndex");
 				renderNearIndexDisplay(event.resolution);
 				profiler.endSection();
@@ -162,21 +162,23 @@ public final class HUDHandler {
 				profiler.endSection();
 			}*/
 
-			if(Botania.proxy.isClientPlayerWearingMonocle()) {
+			EntityPlayer player = mc.thePlayer;
+			InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player);
+
+			if(ItemMonocle.hasMonocle(baubles)) {
 				profiler.startSection("monocle");
-				ItemMonocle.renderHUD(event.resolution, mc.thePlayer);
+				ItemMonocle.renderHUD(event.resolution, player);
 				profiler.endSection();
 			}
 
 			profiler.startSection("manaBar");
-			EntityPlayer player = mc.thePlayer;
 			int totalMana = 0;
 			int totalMaxMana = 0;
 			boolean anyRequest = false;
 			boolean creative = false;
 
 			IInventory mainInv = player.inventory;
-			IInventory baublesInv = PlayerHandler.getPlayerBaubles(player);
+			IInventory baublesInv = baubles;
 
 			int invSize = mainInv.getSizeInventory();
 			int size = invSize;
@@ -260,8 +262,8 @@ public final class HUDHandler {
 			else return;
 		}
 
-		Color color = new Color(Color.HSBtoRGB(0.55F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F));
-		GL11.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) (255 - color.getRed()));
+		int rgb = Color.HSBtoRGB(0.55F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F);
+		GL11.glColor4ub((byte) (rgb >> 16), (byte) (rgb >> 8), (byte) rgb, (byte) (255 - (rgb >> 16)));
 		mc.renderEngine.bindTexture(manaBar);
 
 		GL11.glEnable(GL11.GL_BLEND);
@@ -483,8 +485,7 @@ public final class HUDHandler {
 
 		RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 0, 5, 100, 3);
 
-		Color color_ = new Color(color);
-		GL11.glColor4ub((byte) color_.getRed(), (byte) color_.getGreen(),(byte) color_.getBlue(), (byte) (255F * alpha));
+		GL11.glColor4ub((byte) (color >> 16), (byte) (color >> 8), (byte) color, (byte) (255F * alpha));
 		RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 0, 5, Math.min(100, manaPercentage), 3);
 	}
 }

src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java

@@ -33,6 +33,7 @@ public final class ItemsRemainingRenderHandler {
 
 	private static ItemStack stack;
 	private static int ticks, count;
+	private static String cachedText;
 
 	@SideOnly(Side.CLIENT)
 	public static void render(ScaledResolution resolution, float partTicks) {
@@ -62,17 +63,7 @@ public final class ItemsRemainingRenderHandler {
 			GL11.glColor4f(1F, 1F, 1F, 1F);
 			GL11.glEnable(GL11.GL_BLEND);
 
-			String text = EnumChatFormatting.GREEN + stack.getDisplayName();
-			if(count >= 0) {
-				int max = stack.getMaxStackSize();
-				int stacks = count / max;
-				int rem = count % max;
-
-				if(stacks == 0)
-					text = "" + count;
-				else text = count + " (" + EnumChatFormatting.AQUA + stacks + EnumChatFormatting.RESET + "*" + EnumChatFormatting.GRAY + max + EnumChatFormatting.RESET + "+" + EnumChatFormatting.YELLOW + rem + EnumChatFormatting.RESET + ")";
-			} else if(count == -1)
-				text = "\u221E";
+			String text = cachedText;
 
 			int color = 0x00FFFFFF | (int) (alpha * 0xFF) << 24;
 			mc.fontRenderer.drawStringWithShadow(text, x + 20, y + 6, color);
@@ -92,6 +83,22 @@ public final class ItemsRemainingRenderHandler {
 		ItemsRemainingRenderHandler.stack = stack;
 		ItemsRemainingRenderHandler.count = count;
 		ticks = stack == null ? 0 : maxTicks;
+
+		cachedText = "";
+		if(stack != null) {
+			String text = EnumChatFormatting.GREEN + stack.getDisplayName();
+			if(count >= 0) {
+				int max = stack.getMaxStackSize();
+				int stacks = count / max;
+				int rem = count % max;
+
+				if(stacks == 0)
+					text = "" + count;
+				else text = count + " (" + EnumChatFormatting.AQUA + stacks + EnumChatFormatting.RESET + "*" + EnumChatFormatting.GRAY + max + EnumChatFormatting.RESET + "+" + EnumChatFormatting.YELLOW + rem + EnumChatFormatting.RESET + ")";
+			} else if(count == -1)
+				text = "\u221E";
+			cachedText = text;
+		}
 	}
 
 	public static void set(EntityPlayer player, ItemStack displayStack, Pattern pattern) {

src/main/java/vazkii/botania/client/core/handler/LightningHandler.java

@@ -10,7 +10,6 @@
  */
 package vazkii.botania.client.core.handler;
 
-import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -51,10 +50,11 @@ public class LightningHandler {
 	static double interpPosY;
 	static double interpPosZ;
 
-	private static Vector3 getRelativeViewVector(Vector3 pos) {
-		Entity renderEntity = Minecraft.getMinecraft().renderViewEntity;
-		return new Vector3((float) renderEntity.posX - pos.x, (float) renderEntity.posY + renderEntity.getEyeHeight() - pos.y, (float) renderEntity.posZ - pos.z);
-	}
+	private final Vector3 scratchView = new Vector3();
+	private final Vector3 scratchPoint = new Vector3();
+	private final Vector3 scratchDiff1 = new Vector3();
+	private final Vector3 scratchDiff2 = new Vector3();
+	private final Vector3 scratchRound = new Vector3();
 
 	@SubscribeEvent
 	public void onRenderWorldLast(RenderWorldLastEvent event) {
@@ -74,6 +74,9 @@ public class LightningHandler {
 		interpPosY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * frame;
 		interpPosZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * frame;
 
+		Entity viewEntity = Minecraft.getMinecraft().renderViewEntity;
+		scratchView.set(viewEntity.posX, viewEntity.posY + viewEntity.getEyeHeight(), viewEntity.posZ);
+
 		GL11.glPushMatrix();
 		GL11.glTranslated(-interpPosX, -interpPosY, -interpPosZ);
 
@@ -130,22 +133,23 @@ public class LightningHandler {
 		int renderstart = (int) ((expandTime / 2 - bolt.particleMaxAge + bolt.particleAge) / (float) (expandTime / 2) * bolt.numsegments0);
 		int renderend = (int) ((bolt.particleAge + expandTime) / (float) expandTime * bolt.numsegments0);
 
-		for(Segment rendersegment : bolt.segments) {
+		for(int i = 0; i < bolt.segments.size(); i++) {
+			Segment rendersegment = bolt.segments.get(i);
 			if(rendersegment.segmentno < renderstart || rendersegment.segmentno > renderend)
 				continue;
 
-			Vector3 playervec = getRelativeViewVector(rendersegment.startpoint.point).multiply(-1);
+			Vector3 playervec = scratchPoint.set(rendersegment.startpoint.point).subtract(scratchView);
 
 			double width = 0.025F * (playervec.mag() / 5 + 1) * (1 + rendersegment.light) * 0.5F;
 
-			Vector3 diff1 = playervec.copy().crossProduct(rendersegment.prevdiff).normalize().multiply(width / rendersegment.sinprev);
-			Vector3 diff2 = playervec.copy().crossProduct(rendersegment.nextdiff).normalize().multiply(width / rendersegment.sinnext);
+			Vector3 diff1 = scratchDiff1.set(playervec).crossProduct(rendersegment.prevdiff).normalize().multiply(width / rendersegment.sinprev);
+			Vector3 diff2 = scratchDiff2.set(playervec).crossProduct(rendersegment.nextdiff).normalize().multiply(width / rendersegment.sinnext);
 
 			Vector3 startvec = rendersegment.startpoint.point;
 			Vector3 endvec = rendersegment.endpoint.point;
 
 			int color = inner ? bolt.colorInner : bolt.colorOuter;
-			tessellator.setColorRGBA_I(color, (int) (mainalpha * rendersegment.light * new Color(color).getAlpha()));
+			tessellator.setColorRGBA_I(color, (int) (mainalpha * rendersegment.light * 255));
 
 			tessellator.addVertexWithUV(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z, 0.5, 0);
 			tessellator.addVertexWithUV(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z, 0.5, 0);
@@ -153,7 +157,7 @@ public class LightningHandler {
 			tessellator.addVertexWithUV(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z, 0.5, 1);
 
 			if(rendersegment.next == null) {
-				Vector3 roundend = rendersegment.endpoint.point.copy().add(rendersegment.diff.copy().normalize().multiply(width));
+				Vector3 roundend = scratchRound.set(rendersegment.diff).normalize().multiply(width).add(rendersegment.endpoint.point);
 
 				tessellator.addVertexWithUV(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z, 0, 0);
 				tessellator.addVertexWithUV(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z, 0.5, 0);
@@ -162,7 +166,7 @@ public class LightningHandler {
 			}
 
 			if(rendersegment.prev == null) {
-				Vector3 roundend = rendersegment.startpoint.point.copy().subtract(rendersegment.diff.copy().normalize().multiply(width));
+				Vector3 roundend = scratchRound.set(rendersegment.diff).normalize().multiply(width).multiply(-1).add(rendersegment.startpoint.point);
 
 				tessellator.addVertexWithUV(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z, 0.5, 0);
 				tessellator.addVertexWithUV(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z, 0, 0);
@@ -223,9 +227,9 @@ public class LightningHandler {
 
 			@Override
 			public int compare(Segment o1, Segment o2) {
-				int comp = Integer.valueOf(o1.splitno).compareTo(o2.splitno);
+				int comp = o1.splitno - o2.splitno;
 				if(comp == 0)
-					return Integer.valueOf(o1.segmentno).compareTo(o2.segmentno);
+					return o1.segmentno - o2.segmentno;
 				else return comp;
 			}
 		}

src/main/java/vazkii/botania/client/fx/FXSparkle.java

@@ -68,16 +68,20 @@ public class FXSparkle extends EntityFX {
 		Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles);
 
 		tessellator.startDrawingQuads();
-		for(FXSparkle sparkle : queuedRenders)
-			sparkle.renderQueued(tessellator);
+		if(!queuedRenders.isEmpty()) {
+			for(FXSparkle sparkle : queuedRenders)
+				sparkle.renderQueued(tessellator);
+		}
 		tessellator.draw();
 
-		ShaderHelper.useShader(ShaderHelper.filmGrain);
-		tessellator.startDrawingQuads();
-		for(FXSparkle sparkle : queuedCorruptRenders)
-			sparkle.renderQueued(tessellator);
-		tessellator.draw();
-		ShaderHelper.releaseShader();
+		if(!queuedCorruptRenders.isEmpty()) {
+			ShaderHelper.useShader(ShaderHelper.filmGrain);
+			tessellator.startDrawingQuads();
+			for(FXSparkle sparkle : queuedCorruptRenders)
+				sparkle.renderQueued(tessellator);
+			tessellator.draw();
+			ShaderHelper.releaseShader();
+		}
 
 		queuedRenders.clear();
 		queuedCorruptRenders.clear();

src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java

@@ -28,6 +28,14 @@ public final class ParticleRenderDispatcher {
 	// Called from LightningHandler.onRenderWorldLast since that was
 	// already registered. /shrug
 	public static void dispatch() {
+		if(FXSparkle.queuedRenders.isEmpty() && FXSparkle.queuedCorruptRenders.isEmpty() && FXWisp.queuedRenders.isEmpty() && FXWisp.queuedDepthIgnoringRenders.isEmpty()) {
+			sparkleFxCount = 0;
+			fakeSparkleFxCount = 0;
+			wispFxCount = 0;
+			depthIgnoringWispFxCount = 0;
+			return;
+		}
+
 		Tessellator tessellator = Tessellator.instance;
 
 		Profiler profiler = Minecraft.getMinecraft().mcProfiler;

src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java

@@ -26,7 +26,7 @@ public class NEIInputHandler implements IContainerInputHandler {
 	@Override
 	public boolean keyTyped(GuiContainer gui, char c, int i) {
 		Minecraft mc = Minecraft.getMinecraft();
-		if(TileCorporeaIndex.InputHandler.getNearbyIndexes(mc.thePlayer).isEmpty())
+		if(!TileCorporeaIndex.InputHandler.hasNearbyIndexes(mc.thePlayer))
 			return false;
 		
 		int bind = NEIClientConfig.getKeyBinding(NEIBotaniaConfig.CORPOREA_KEY);

src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java

@@ -19,6 +19,7 @@ import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.RenderGlobal;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.entity.Entity;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.Vec3;
@@ -49,6 +50,15 @@ public class SkyblockSkyRenderer extends IRenderHandler {
 	private static final Field GL_SKY_LIST = ReflectionUtils.findField(RenderGlobal.class, LibObfuscation.GL_SKY_LIST);
 	private static final Field STAR_GL_CALL_LIST = ReflectionUtils.findField(RenderGlobal.class, LibObfuscation.STAR_GL_CALL_LIST);
 
+	// rainbow angles are deterministic per in-game day
+	private static int lastRainbowDay = -1;
+	private static float rainbowAngle1, rainbowAngle2;
+
+	// sky color samples, interpolated across ticks by partialTicks
+	private static int lastSkySampleTick = -1;
+	private static float skyRed0, skyGreen0, skyBlue0;
+	private static float skyRed1, skyGreen1, skyBlue1;
+
 	@Override
 	public void render(float partialTicks, WorldClient world, Minecraft mc) {
 
@@ -56,10 +66,24 @@ public class SkyblockSkyRenderer extends IRenderHandler {
 		int starGLCallList = ReflectionUtils.getInt(STAR_GL_CALL_LIST, mc.renderGlobal);
 
 		GL11.glDisable(GL11.GL_TEXTURE_2D);
-		Vec3 vec3 = world.getSkyColor(mc.renderViewEntity, partialTicks);
-		float f1 = (float)vec3.xCoord;
-		float f2 = (float)vec3.yCoord;
-		float f3 = (float)vec3.zCoord;
+		Entity viewEntity = mc.renderViewEntity;
+		int tick = ClientTickHandler.ticksInGame;
+		if(tick != lastSkySampleTick) {
+			if(lastSkySampleTick != -1) {
+				skyRed0 = skyRed1;
+				skyGreen0 = skyGreen1;
+				skyBlue0 = skyBlue1;
+			}
+			Vec3 sample = world.getSkyColor(viewEntity, 1.0F);
+			skyRed1 = (float) sample.xCoord;
+			skyGreen1 = (float) sample.yCoord;
+			skyBlue1 = (float) sample.zCoord;
+			lastSkySampleTick = tick;
+		}
+		float frac = Math.min(1F, Math.max(0F, partialTicks));
+		float f1 = skyRed0 + (skyRed1 - skyRed0) * frac;
+		float f2 = skyGreen0 + (skyGreen1 - skyGreen0) * frac;
+		float f3 = skyBlue0 + (skyBlue1 - skyBlue0) * frac;
 		float f6;
 
 		float insideVoid = 0;
@@ -245,9 +269,14 @@ public class SkyblockSkyRenderer extends IRenderHandler {
 
 		long time = world.getWorldTime() + 1000;
 		int day = (int) (time / 24000L);
-		Random rand = new Random(day * 0xFF);
-		float angle1 = rand.nextFloat() * 360F;
-		float angle2 = rand.nextFloat() * 360F;
+		if(lastRainbowDay != day) {
+			Random rand = new Random(day * 0xFF);
+			rainbowAngle1 = rand.nextFloat() * 360F;
+			rainbowAngle2 = rand.nextFloat() * 360F;
+			lastRainbowDay = day;
+		}
+		float angle1 = rainbowAngle1;
+		float angle2 = rainbowAngle2;
 		GL11.glColor4f(1F, 1F, 1F, effCelAng1 * (1F - insideVoid));
 		GL11.glRotatef(angle1, 0F, 1F, 0F);
 		GL11.glRotatef(angle2, 0F, 0F, 1F);

src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java

@@ -285,6 +285,13 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ
 			}
 		}
 
+		public static boolean hasNearbyIndexes(EntityPlayer player) {
+			for(TileCorporeaIndex index : indexes)
+				if(isInRangeOfIndex(player, index) && index.worldObj.isRemote == player.worldObj.isRemote)
+					return true;
+			return false;
+		}
+
 		public static List<TileCorporeaIndex> getNearbyIndexes(EntityPlayer player) {
 			List<TileCorporeaIndex> indexList = new ArrayList<>();
 			for(TileCorporeaIndex index : indexes)
@@ -296,7 +303,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ
 		@Override
 		@SideOnly(Side.CLIENT)
 		public boolean shouldAutoComplete() {
-			return !getNearbyIndexes(Minecraft.getMinecraft().thePlayer).isEmpty();
+			return hasNearbyIndexes(Minecraft.getMinecraft().thePlayer);
 		}
 
 	}

src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java

@@ -869,6 +869,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
 	private static Rectangle barRect;
 	@SideOnly(Side.CLIENT)
 	private static Rectangle hpBarRect;
+	private static ItemStack skullStack;
 
 	@Override
 	@SideOnly(Side.CLIENT)
@@ -894,11 +895,12 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
 		int py = y + 12;
 
 		Minecraft mc = Minecraft.getMinecraft();
-		ItemStack stack = new ItemStack(Items.skull, 1, 3);
+		if(skullStack == null)
+			skullStack = new ItemStack(Items.skull, 1, 3);
 		mc.renderEngine.bindTexture(TextureMap.locationItemsTexture);
 		net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
 		GL11.glEnable(GL12.GL_RESCALE_NORMAL);
-		RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, stack, px, py);
+		RenderItem.getInstance().renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, skullStack, px, py);
 		net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
 
 		boolean unicode = mc.fontRenderer.getUnicodeFlag();

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java

@@ -33,6 +33,7 @@ import vazkii.botania.api.item.ICosmeticAttachable;
 import vazkii.botania.api.item.ICosmeticBauble;
 import vazkii.botania.common.lib.LibItemNames;
 import baubles.api.BaubleType;
+import baubles.common.container.InventoryBaubles;
 import baubles.common.lib.PlayerHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -104,8 +105,12 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm
 	}
 
 	public static boolean hasMonocle(EntityPlayer player) {
+		return hasMonocle(PlayerHandler.getPlayerBaubles(player));
+	}
+
+	public static boolean hasMonocle(InventoryBaubles inv) {
 		for(int i = 0; i < 4; i++) {
-			ItemStack stack = PlayerHandler.getPlayerBaubles(player).getStackInSlot(i);
+			ItemStack stack = inv.getStackInSlot(i);
 			if(stack != null) {
 				Item item = stack.getItem();
 				if(item instanceof IBurstViewerBauble)