Reorganise and clean up client event handlers

src/main/java/electroblob/wizardry/client/renderer/RayHelper.java

@@ -1,14 +1,14 @@
 package electroblob.wizardry.client.renderer;
 
 /** Instances of this class can calculate their distance from the camera viewpoint and sort themselves accordingly. */
-class RayHelper implements Comparable<RayHelper> {
+public class RayHelper implements Comparable<RayHelper> {
 
 	int ordinal;
-	double x1, y1, z1;
-	double x2, y2, z2;
+	public double x1, y1, z1;
+	public double x2, y2, z2;
 	double offsetX, offsetY, offsetZ;
 
-	RayHelper(int ordinal, double x1, double y1, double z1, double x2, double y2, double z2, double offsetX,
+	public RayHelper(int ordinal, double x1, double y1, double z1, double x2, double y2, double z2, double offsetX,
 			double offsetY, double offsetZ){
 		this.ordinal = ordinal;
 		this.x1 = x1;
@@ -37,13 +37,7 @@ class RayHelper implements Comparable<RayHelper> {
 
 	@Override
 	public int compareTo(RayHelper ray){
-		if(this.getDistanceFromViewpoint() > ray.getDistanceFromViewpoint()){
-			return -1;
-		}else if(this.getDistanceFromViewpoint() < ray.getDistanceFromViewpoint()){
-			return 1;
-		}else{
-			return 0;
-		}
+		return Double.compare(ray.getDistanceFromViewpoint(), this.getDistanceFromViewpoint());
 	}
 
 }

src/main/java/electroblob/wizardry/client/renderer/effect/RenderContainmentField.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.effect;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.potion.PotionContainment;

src/main/java/electroblob/wizardry/client/renderer/effect/RenderShadowWard.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.effect;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.registry.Spells;

src/main/java/electroblob/wizardry/client/renderer/effect/RenderShield.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.effect;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.data.WizardData;

src/main/java/electroblob/wizardry/client/renderer/effect/RenderWings.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.effect;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.registry.Spells;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderBlackHole.java

@@ -1,6 +1,7 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.Wizardry;
+import electroblob.wizardry.client.renderer.RayHelper;
 import electroblob.wizardry.entity.construct.EntityBlackHole;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.*;
@@ -63,7 +64,7 @@ public class RenderBlackHole extends Render<EntityBlackHole> {
 		// coordinates which were inconsistent with my calculated ones. Since I know those will give the desired
 		// effect anyway, I just used them directly instead.
 
-		ArrayList<RayHelper> rays = new ArrayList<RayHelper>(1);
+		ArrayList<RayHelper> rays = new ArrayList<>(1);
 
 		for(int j = 0; j < 30; j++){
 

src/main/java/electroblob/wizardry/client/renderer/entity/RenderBlank.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.entity.RenderManager;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderBubble.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.entity.construct.EntityBubble;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderDecay.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.entity.construct.EntityDecay;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderDecoy.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.entity.living.EntityDecoy;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderEvilWizard.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.client.model.ModelWizard;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderFireRing.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.entity.construct.EntityFireRing;
 import net.minecraft.client.Minecraft;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderForceArrow.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.entity.projectile.EntityForceArrow;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderForcefield.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.entity.construct.EntityForcefield;
 import net.minecraft.client.renderer.BufferBuilder;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderHammer.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.client.model.ModelHammer;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderIceGiant.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.client.model.ModelIceGiant;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderIceSpike.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.entity.construct.EntityIceSpike;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderLightningDisc.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.entity.projectile.EntityLightningDisc;
 import net.minecraft.client.renderer.BufferBuilder;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderMagicArrow.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.entity.projectile.EntityMagicArrow;
 import net.minecraft.client.renderer.BufferBuilder;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderPhoenix.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.client.model.ModelPhoenix;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderPossessingPlayer.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.spell.Possession;
 import net.minecraft.client.renderer.entity.Render;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderProjectile.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.entity.projectile.EntityMagicProjectile;
 import net.minecraft.client.Minecraft;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderRemnant.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.client.model.ModelRemnant;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderSigil.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.entity.construct.EntityHealAura;
 import electroblob.wizardry.entity.construct.EntityMagicConstruct;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderSpiritHorse.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.entity.living.EntitySpiritHorse;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderSpiritWolf.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.entity.living.EntitySpiritWolf;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderStrayMinion.java

@@ -1,5 +1,6 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
+import electroblob.wizardry.client.renderer.entity.layers.LayerStrayMinionClothing;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.entity.RenderSkeleton;
 import net.minecraft.entity.monster.AbstractSkeleton;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderWizard.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.client.model.ModelWizard;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderWraithMinion.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.entity.living.EntityBlazeMinion;
 import net.minecraft.client.model.ModelBlaze;

src/main/java/electroblob/wizardry/client/renderer/entity/RenderZombieSpawner.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.entity.construct.EntityZombieSpawner;

src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerDisintegrateAnimation.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity.layers;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.spell.Disintegration;

src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerFrost.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity.layers;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.block.BlockStatue;

src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerStone.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity.layers;
 
 import electroblob.wizardry.block.BlockStatue;
 import electroblob.wizardry.client.ClientProxy;

src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerStrayMinionClothing.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity.layers;
 
 import electroblob.wizardry.entity.living.EntityStrayMinion;
 import net.minecraft.client.model.ModelSkeleton;

src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerSummonAnimation.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity.layers;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.entity.living.ISummonedCreature;

src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerTiledOverlay.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.entity.layers;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.ModelBase;

src/main/java/electroblob/wizardry/client/renderer/overlay/RenderBlinkEffect.java

@@ -0,0 +1,77 @@
+package electroblob.wizardry.client.renderer.overlay;
+
+import electroblob.wizardry.Wizardry;
+import electroblob.wizardry.client.WizardryClientEventHandler;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.event.FOVUpdateEvent;
+import net.minecraftforge.client.event.RenderGameOverlayEvent;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
+import net.minecraftforge.fml.relauncher.Side;
+import org.lwjgl.opengl.GL11;
+
+@EventBusSubscriber(Side.CLIENT)
+public class RenderBlinkEffect {
+
+	/** The remaining time for which the blink screen overlay effect will be displayed in first-person. Since this is
+	 * only for the first-person player (the instance of which is itself stored in a static variable), this can simply
+	 * be stored statically here, rather than needing to be in {@code WizardData}. */
+	private static int blinkEffectTimer;
+	/** The number of ticks the blink effect lasts for. */
+	private static final int BLINK_EFFECT_DURATION = 8;
+
+	private static final ResourceLocation SCREEN_OVERLAY_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/blink_overlay.png");
+
+	/** Starts the first-person blink overlay effect. */
+	public static void playBlinkEffect(){
+		if(Wizardry.settings.blinkEffect) blinkEffectTimer = BLINK_EFFECT_DURATION;
+	}
+
+	@SubscribeEvent
+	public static void onPlayerTickEvent(TickEvent.PlayerTickEvent event){
+
+		if(event.player == Minecraft.getMinecraft().player && event.phase == TickEvent.Phase.END){
+
+			if(Wizardry.settings.blinkEffect){
+				if(blinkEffectTimer > 0) blinkEffectTimer--;
+			}else{
+				blinkEffectTimer = 0;
+			}
+		}
+	}
+
+	@SubscribeEvent
+	public static void onFOVUpdateEvent(FOVUpdateEvent event){
+
+		if(blinkEffectTimer > 0){
+			float f = ((float)Math.max(blinkEffectTimer - 2, 0))/BLINK_EFFECT_DURATION;
+			event.setNewfov(event.getFov() + f * f * 0.7f);
+		}
+	}
+
+	@SubscribeEvent
+	public static void onRenderGameOverlayEvent(RenderGameOverlayEvent.Post event){
+
+		if(event.getType() == RenderGameOverlayEvent.ElementType.HELMET){
+
+			if(blinkEffectTimer > 0){
+
+				float alpha = ((float)blinkEffectTimer)/BLINK_EFFECT_DURATION;
+
+				OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE, GL11.GL_ZERO);
+				GlStateManager.color(1, 1, 1, alpha);
+				GlStateManager.disableAlpha();
+
+				WizardryClientEventHandler.renderScreenOverlay(event.getResolution(), SCREEN_OVERLAY_TEXTURE);
+
+				GlStateManager.enableAlpha();
+				GlStateManager.color(1, 1, 1, 1);
+			}
+		}
+	}
+
+}

src/main/java/electroblob/wizardry/client/renderer/overlay/RenderFrostOverlay.java

@@ -0,0 +1,40 @@
+package electroblob.wizardry.client.renderer.overlay;
+
+import electroblob.wizardry.Wizardry;
+import electroblob.wizardry.client.WizardryClientEventHandler;
+import electroblob.wizardry.registry.WizardryPotions;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.event.RenderGameOverlayEvent;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.relauncher.Side;
+import org.lwjgl.opengl.GL11;
+
+@EventBusSubscriber(Side.CLIENT)
+public class RenderFrostOverlay {
+
+	private static final ResourceLocation SCREEN_OVERLAY_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/frost_overlay.png");
+
+	@SubscribeEvent
+	public static void onRenderGameOverlayEvent(RenderGameOverlayEvent.Post event){
+
+		if(event.getType() == RenderGameOverlayEvent.ElementType.HELMET){
+
+			if(Minecraft.getMinecraft().player.isPotionActive(WizardryPotions.frost)){
+
+				OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
+				GlStateManager.color(1, 1, 1, 1);
+				GlStateManager.disableAlpha();
+
+				WizardryClientEventHandler.renderScreenOverlay(event.getResolution(), SCREEN_OVERLAY_TEXTURE);
+
+				GlStateManager.enableAlpha();
+				GlStateManager.color(1, 1, 1, 1);
+			}
+		}
+	}
+
+}

src/main/java/electroblob/wizardry/client/renderer/overlay/RenderSixthSense.java

@@ -0,0 +1,104 @@
+package electroblob.wizardry.client.renderer.overlay;
+
+import electroblob.wizardry.Wizardry;
+import electroblob.wizardry.client.WizardryClientEventHandler;
+import electroblob.wizardry.constants.Constants;
+import electroblob.wizardry.registry.Spells;
+import electroblob.wizardry.registry.WizardryPotions;
+import electroblob.wizardry.spell.Spell;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.event.RenderGameOverlayEvent;
+import net.minecraftforge.client.event.RenderLivingEvent;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.relauncher.Side;
+import org.lwjgl.opengl.GL11;
+
+@EventBusSubscriber(Side.CLIENT)
+public class RenderSixthSense {
+
+	private static final ResourceLocation MARKER_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/sixth_sense_marker.png");
+	private static final ResourceLocation SCREEN_OVERLAY_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/sixth_sense_overlay.png");
+
+	@SubscribeEvent
+	public static void onRenderGameOverlayEvent(RenderGameOverlayEvent.Post event){
+
+		if(event.getType() == RenderGameOverlayEvent.ElementType.HELMET){
+
+			if(Minecraft.getMinecraft().player.isPotionActive(WizardryPotions.sixth_sense)){
+
+				OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
+				GlStateManager.color(1, 1, 1, 1);
+				GlStateManager.disableAlpha();
+
+				WizardryClientEventHandler.renderScreenOverlay(event.getResolution(), SCREEN_OVERLAY_TEXTURE);
+
+				GlStateManager.enableAlpha();
+				GlStateManager.color(1, 1, 1, 1);
+			}
+		}
+	}
+
+	@SubscribeEvent
+	public static void onRenderLivingEvent(RenderLivingEvent.Post<EntityLivingBase> event){
+
+		Minecraft mc = Minecraft.getMinecraft();
+		RenderManager renderManager = event.getRenderer().getRenderManager();
+
+		if(mc.player.isPotionActive(WizardryPotions.sixth_sense) && !(event.getEntity() instanceof EntityArmorStand)
+				&& event.getEntity() != mc.player && mc.player.getActivePotionEffect(WizardryPotions.sixth_sense) != null
+				&& event.getEntity().getDistance(mc.player) < Spells.sixth_sense.getProperty(Spell.EFFECT_RADIUS).floatValue()
+				* (1 + mc.player.getActivePotionEffect(WizardryPotions.sixth_sense).getAmplifier() * Constants.RANGE_INCREASE_PER_LEVEL)){
+
+			Tessellator tessellator = Tessellator.getInstance();
+			BufferBuilder buffer = tessellator.getBuffer();
+
+			GlStateManager.pushMatrix();
+
+			GlStateManager.disableCull();
+			GlStateManager.enableBlend();
+			GlStateManager.disableLighting();
+			OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240f, 240f);
+			GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+			// Disabling depth test allows it to be seen through everything.
+			GlStateManager.disableDepth();
+
+			GlStateManager.translate(event.getX(), event.getY() + event.getEntity().height * 0.6, event.getZ());
+
+			// This counteracts the reverse rotation behaviour when in front f5 view.
+			// Fun fact: this is a bug with vanilla too! Look at a snowball in front f5 view, for example.
+			float yaw = mc.gameSettings.thirdPersonView == 2 ? renderManager.playerViewX : -renderManager.playerViewX;
+			GlStateManager.rotate(180 - renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
+			GlStateManager.rotate(yaw, 1.0F, 0.0F, 0.0F);
+
+			buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
+
+			mc.renderEngine.bindTexture(MARKER_TEXTURE);
+
+			buffer.pos(-0.6, 0.6, 0).tex(0, 0).endVertex();
+			buffer.pos(0.6, 0.6, 0).tex(1, 0).endVertex();
+			buffer.pos(0.6, -0.6, 0).tex(1, 1).endVertex();
+			buffer.pos(-0.6, -0.6, 0).tex(0, 1).endVertex();
+
+			tessellator.draw();
+
+			GlStateManager.enableCull();
+			GlStateManager.disableBlend();
+			GlStateManager.enableLighting();
+			GlStateManager.enableDepth();
+
+			GlStateManager.popMatrix();
+		}
+
+	}
+
+}

src/main/java/electroblob/wizardry/client/renderer/overlay/RenderTargetPointers.java

@@ -0,0 +1,134 @@
+package electroblob.wizardry.client.renderer.overlay;
+
+import electroblob.wizardry.Wizardry;
+import electroblob.wizardry.data.WizardData;
+import electroblob.wizardry.item.ISpellCastingItem;
+import electroblob.wizardry.util.RayTracer;
+import electroblob.wizardry.util.WizardryUtilities;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraftforge.client.event.RenderLivingEvent;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.relauncher.Side;
+import org.lwjgl.opengl.GL11;
+
+@EventBusSubscriber(Side.CLIENT)
+public class RenderTargetPointers {
+
+	private static final ResourceLocation POINTER_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/pointer.png");
+	private static final ResourceLocation TARGET_POINTER_TEXTURE = new ResourceLocation(Wizardry.MODID, "textures/gui/target_pointer.png");
+
+	@SubscribeEvent
+	public static void onRenderLivingEvent(RenderLivingEvent.Post<EntityLivingBase> event){
+
+		Minecraft mc = Minecraft.getMinecraft();
+		WizardData data = WizardData.get(mc.player);
+		RenderManager renderManager = event.getRenderer().getRenderManager();
+
+		ItemStack wand = mc.player.getHeldItemMainhand();
+
+		if(!(wand.getItem() instanceof ISpellCastingItem)){
+			wand = mc.player.getHeldItemOffhand();
+		}
+
+		// Target selection pointer
+		if(mc.player.isSneaking() && wand.getItem() instanceof ISpellCastingItem && WizardryUtilities.isLiving(event.getEntity())
+				&& data != null && data.selectedMinion != null){
+
+			// -> Moved this in here so it isn't called every tick
+			RayTraceResult rayTrace = RayTracer.standardEntityRayTrace(mc.world, mc.player, 16, false);
+
+			if(rayTrace != null && rayTrace.entityHit == event.getEntity()){
+
+				Tessellator tessellator = Tessellator.getInstance();
+				BufferBuilder buffer = tessellator.getBuffer();
+
+				GlStateManager.pushMatrix();
+
+				GlStateManager.disableCull();
+				GlStateManager.disableLighting();
+				OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240f, 240f);
+				// Disabling depth test allows it to be seen through everything.
+				GlStateManager.disableDepth();
+				GlStateManager.color(1, 1, 1, 1);
+
+				GlStateManager.translate(event.getX(), event.getY() + event.getEntity().height + 0.5, event.getZ());
+
+				// This counteracts the reverse rotation behaviour when in front f5 view.
+				// Fun fact: this is a bug with vanilla too! Look at a snowball in front f5 view, for example.
+				float yaw = mc.gameSettings.thirdPersonView == 2 ? renderManager.playerViewX : -renderManager.playerViewX;
+				GlStateManager.rotate(180 - renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
+				GlStateManager.rotate(yaw, 1.0F, 0.0F, 0.0F);
+
+				buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
+
+				mc.renderEngine.bindTexture(TARGET_POINTER_TEXTURE);
+
+				buffer.pos(-0.2, 0.24, 0).tex(0, 0).endVertex();
+				buffer.pos(0.2, 0.24, 0).tex(9f / 16f, 0).endVertex();
+				buffer.pos(0.2, -0.24, 0).tex(9f / 16f, 11f / 16f).endVertex();
+				buffer.pos(-0.2, -0.24, 0).tex(0, 11f / 16f).endVertex();
+
+				tessellator.draw();
+
+				GlStateManager.enableCull();
+				GlStateManager.enableLighting();
+				GlStateManager.enableDepth();
+
+				GlStateManager.popMatrix();
+			}
+		}
+
+		// Summoned creature selection pointer
+		if(data != null && data.selectedMinion != null && data.selectedMinion.get() == event.getEntity()){
+
+			Tessellator tessellator = Tessellator.getInstance();
+			BufferBuilder buffer = tessellator.getBuffer();
+
+			GlStateManager.pushMatrix();
+
+			GlStateManager.disableCull();
+			GlStateManager.disableLighting();
+			OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240f, 240f);
+			// Disabling depth test allows it to be seen through everything.
+			GlStateManager.disableDepth();
+			GlStateManager.color(1, 1, 1, 1);
+
+			GlStateManager.translate(event.getX(), event.getY() + event.getEntity().height + 0.5, event.getZ());
+
+			// This counteracts the reverse rotation behaviour when in front f5 view.
+			// Fun fact: this is a bug with vanilla too! Look at a snowball in front f5 view, for example.
+			float yaw = mc.gameSettings.thirdPersonView == 2 ? renderManager.playerViewX : -renderManager.playerViewX;
+			GlStateManager.rotate(180 - renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
+			GlStateManager.rotate(yaw, 1.0F, 0.0F, 0.0F);
+
+			buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
+
+			mc.renderEngine.bindTexture(POINTER_TEXTURE);
+
+			buffer.pos(-0.2, 0.24, 0).tex(0, 0).endVertex();
+			buffer.pos(0.2, 0.24, 0).tex(9f / 16f, 0).endVertex();
+			buffer.pos(0.2, -0.24, 0).tex(9f / 16f, 11f / 16f).endVertex();
+			buffer.pos(-0.2, -0.24, 0).tex(0, 11f / 16f).endVertex();
+
+			tessellator.draw();
+
+			GlStateManager.enableCull();
+			GlStateManager.enableLighting();
+			GlStateManager.enableDepth();
+
+			GlStateManager.popMatrix();
+		}
+	}
+
+}

src/main/java/electroblob/wizardry/client/renderer/overlay/RenderTransportationUI.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.overlay;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.data.WizardData;
@@ -90,7 +90,7 @@ public class RenderTransportationUI {
 				// However, if that's outside the render distance it won't render at all! To fudge our way around this
 				// problem, we're capping the distance to just below the render distance and adjusting the scale accordingly
 				double distanceCap = Minecraft.getMinecraft().gameSettings.renderDistanceChunks * 16 - 8;
-				double displayDist = distance > distanceCap ? distanceCap : distance;
+				double displayDist = Math.min(distance, distanceCap);
 				double factor = displayDist/distance;
 
 				GlStateManager.translate(position.x * factor, position.y * factor, position.z * factor);
@@ -109,9 +109,9 @@ public class RenderTransportationUI {
 
 				float f = location == target ? 1 : 0.5f; // Makes it obvious which one is being aimed at
 
-				buffer.pos(-iconSize, iconSize, 0).tex(0, 0).color(f, 1, f, f).endVertex();
-				buffer.pos(iconSize, iconSize, 0).tex(1, 0).color(f, 1, f, f).endVertex();
-				buffer.pos(iconSize, -iconSize, 0).tex(1, 1).color(f, 1, f, f).endVertex();
+				buffer.pos(-iconSize,  iconSize, 0).tex(0, 0).color(f, 1, f, f).endVertex();
+				buffer.pos( iconSize,  iconSize, 0).tex(1, 0).color(f, 1, f, f).endVertex();
+				buffer.pos( iconSize, -iconSize, 0).tex(1, 1).color(f, 1, f, f).endVertex();
 				buffer.pos(-iconSize, -iconSize, 0).tex(0, 1).color(f, 1, f, f).endVertex();
 
 				tessellator.draw();
@@ -157,10 +157,10 @@ public class RenderTransportationUI {
 		Tessellator tessellator = Tessellator.getInstance();
 		BufferBuilder bufferbuilder = tessellator.getBuffer();
 		bufferbuilder.begin(7, DefaultVertexFormats.POSITION_COLOR);
-		bufferbuilder.pos((double)(-i - 1), (double)(-1 + verticalShift), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
-		bufferbuilder.pos((double)(-i - 1), (double)(8 + verticalShift), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
-		bufferbuilder.pos((double)(i + 1), (double)(8 + verticalShift), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
-		bufferbuilder.pos((double)(i + 1), (double)(-1 + verticalShift), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
+		bufferbuilder.pos((-i - 1), (-1 + verticalShift), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
+		bufferbuilder.pos((-i - 1), ( 8 + verticalShift), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
+		bufferbuilder.pos(( i + 1), ( 8 + verticalShift), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
+		bufferbuilder.pos(( i + 1), (-1 + verticalShift), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
 		tessellator.draw();
 		GlStateManager.enableTexture2D();
 

src/main/java/electroblob/wizardry/client/renderer/tileentity/RenderArcaneLock.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.tileentity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.spell.ArcaneLock;

src/main/java/electroblob/wizardry/client/renderer/tileentity/RenderArcaneWorkbench.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.tileentity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.inventory.ContainerArcaneWorkbench;

src/main/java/electroblob/wizardry/client/renderer/tileentity/RenderLectern.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.tileentity;
 
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.tileentity.TileEntityLectern;

src/main/java/electroblob/wizardry/client/renderer/tileentity/RenderMagicLight.java

@@ -1,6 +1,10 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.tileentity;
 
 import electroblob.wizardry.Wizardry;
+import electroblob.wizardry.block.BlockMagicLight;
+import electroblob.wizardry.item.ISpellCastingItem;
+import electroblob.wizardry.item.ItemArtefact;
+import electroblob.wizardry.registry.WizardryItems;
 import electroblob.wizardry.tileentity.TileEntityMagicLight;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.*;
@@ -8,8 +12,14 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraftforge.client.event.DrawBlockHighlightEvent;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.relauncher.Side;
 import org.lwjgl.opengl.GL11;
 
+@EventBusSubscriber(Side.CLIENT)
 public class RenderMagicLight extends TileEntitySpecialRenderer<TileEntityMagicLight> {
 
 	private static final ResourceLocation RAY_TEXTURE = new ResourceLocation(Wizardry.MODID,
@@ -125,4 +135,19 @@ public class RenderMagicLight extends TileEntitySpecialRenderer<TileEntityMagicL
 		GlStateManager.popMatrix();
 	}
 
+	@SubscribeEvent
+	public static void onDrawBlockHighlightEvent(DrawBlockHighlightEvent event){
+		// Hide the block outline for magic light blocks unless the player can dispel them
+		if(event.getTarget().typeOfHit == RayTraceResult.Type.BLOCK
+				&& event.getPlayer().world.getBlockState(event.getTarget().getBlockPos()).getBlock() instanceof BlockMagicLight){
+
+			if((!(event.getPlayer().getHeldItemMainhand().getItem() instanceof ISpellCastingItem)
+					&& !(event.getPlayer().getHeldItemOffhand().getItem() instanceof ISpellCastingItem))
+					|| !ItemArtefact.isArtefactActive(event.getPlayer(), WizardryItems.charm_light)){
+
+				event.setCanceled(true);
+			}
+		}
+	}
+
 }

src/main/java/electroblob/wizardry/client/renderer/tileentity/RenderStatue.java

@@ -1,4 +1,4 @@
-package electroblob.wizardry.client.renderer;
+package electroblob.wizardry.client.renderer.tileentity;
 
 import electroblob.wizardry.tileentity.TileEntityStatue;
 import net.minecraft.client.Minecraft;