Code Clean Up (#2)

* intellij code clean up

* optimize imports

* format

* intellij suggestions

* fix empty catch issues

1 files changed, 51 insertions, 59 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/FancyPortals.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/FancyPortals.java
index a9be6fd5..cb946426 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/FancyPortals.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/FancyPortals.java
@@ -1,14 +1,8 @@
 package io.github.moulberry.notenoughupdates.miscfeatures;
 
-import io.github.moulberry.notenoughupdates.cosmetics.CapeNode;
-import io.github.moulberry.notenoughupdates.util.ReverseWorldRenderer;
-import io.github.moulberry.notenoughupdates.util.TexLoc;
 import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.multiplayer.WorldClient;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderGlobal;
 import net.minecraft.client.renderer.WorldRenderer;
@@ -17,39 +11,35 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.client.renderer.vertex.VertexFormat;
 import net.minecraft.client.renderer.vertex.VertexFormatElement;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.network.play.server.S07PacketRespawn;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.client.event.RenderLivingEvent;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.util.glu.Project;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.nio.ByteBuffer;
 import java.util.List;
 
 public class FancyPortals {
 
-    private static ResourceLocation[] RENDERS = new ResourceLocation[6];
+    private static final ResourceLocation[] RENDERS = new ResourceLocation[6];
 
     static {
-        for(int i=0; i<6; i++) {
-            RENDERS[i] = new ResourceLocation("notenoughupdates:portal_panoramas/nether/pansc-"+(i+1)+".png");
+        for (int i = 0; i < 6; i++) {
+            RENDERS[i] = new ResourceLocation("notenoughupdates:portal_panoramas/nether/pansc-" + (i + 1) + ".png");
         }
     }
 
     public static int perspectiveId = -1;
+
     public static boolean overridePerspective() {
-        if(perspectiveId >= 0 && !Keyboard.isKeyDown(Keyboard.KEY_K)) {
-            if(perspectiveId == 0) {
+        if (perspectiveId >= 0 && !Keyboard.isKeyDown(Keyboard.KEY_K)) {
+            if (perspectiveId == 0) {
                 GlStateManager.matrixMode(5889);
                 GlStateManager.loadIdentity();
                 GlStateManager.ortho(0.0D, 7, 7, 0.0D, -100D, 100D);
@@ -58,13 +48,13 @@ public class FancyPortals {
                 GlStateManager.loadIdentity();
                 GlStateManager.translate(3.5F, 3.5F, -1.0F);
                 GlStateManager.rotate(-90, 1, 0, 0);
-            } else if(perspectiveId <= 4) {
+            } else if (perspectiveId <= 4) {
                 GlStateManager.matrixMode(5889);
                 GlStateManager.loadIdentity();
                 Project.gluPerspective(90, 1, 0.05F, 160 * MathHelper.SQRT_2);
                 GlStateManager.matrixMode(5888);
                 GlStateManager.loadIdentity();
-                GlStateManager.rotate(perspectiveId*90, 0, 1, 0);
+                GlStateManager.rotate(perspectiveId * 90, 0, 1, 0);
                 GlStateManager.translate(0, -3.5f, 0);
             } else {
                 GlStateManager.matrixMode(5889);
@@ -84,7 +74,7 @@ public class FancyPortals {
     private static WorldRenderer surfaceWorldRenderer = null;
 
     private static WorldRenderer getSurfaceWorldRenderer() {
-        if(surfaceWorldRenderer != null && !Keyboard.isKeyDown(Keyboard.KEY_O)) {
+        if (surfaceWorldRenderer != null && !Keyboard.isKeyDown(Keyboard.KEY_O)) {
             return surfaceWorldRenderer;
         }
 
@@ -94,35 +84,35 @@ public class FancyPortals {
     }
 
     private static void drawPoint(WorldRenderer worldRenderer, int x, int y) {
-        float xDist = 1-Math.abs(x-50)/50f;
-        float yDist = 1-Math.abs(y-50)/50f;
+        float xDist = 1 - Math.abs(x - 50) / 50f;
+        float yDist = 1 - Math.abs(y - 50) / 50f;
         float distToEdge = Math.min(xDist, yDist);
 
         float z = 0.4142f;
-        if(distToEdge < 1/3.5f) {
-            if(y > 50 && yDist < xDist) {
-                float circleH = 1.414f - distToEdge*3.5f*1.414f;
-                z = (float)Math.sqrt(2f-circleH*circleH);
+        if (distToEdge < 1 / 3.5f) {
+            if (y > 50 && yDist < xDist) {
+                float circleH = 1.414f - distToEdge * 3.5f * 1.414f;
+                z = (float) Math.sqrt(2f - circleH * circleH);
                 z *= 0.4142f / 1.4142f;
             } else {
-                float circleH = 1 - distToEdge*3.5f;
-                z = (float)Math.sqrt(2f-circleH*circleH)-1;
+                float circleH = 1 - distToEdge * 3.5f;
+                z = (float) Math.sqrt(2f - circleH * circleH) - 1;
             }
         }
 
-        worldRenderer.pos(x*7/100f, y*7/100f, z).tex(x/100f, y/100f).endVertex();
+        worldRenderer.pos(x * 7 / 100f, y * 7 / 100f, z).tex(x / 100f, y / 100f).endVertex();
     }
 
     private static WorldRenderer createSurfaceWorldRenderer() {
-        WorldRenderer worldRenderer = new WorldRenderer(20*100*100);
+        WorldRenderer worldRenderer = new WorldRenderer(20 * 100 * 100);
         worldRenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
 
-        for(int x=0; x<100; x++) {
-            for(int y=0; y<100; y++) {
+        for (int x = 0; x < 100; x++) {
+            for (int y = 0; y < 100; y++) {
                 drawPoint(worldRenderer, x, y);
-                drawPoint(worldRenderer, x, y+1);
-                drawPoint(worldRenderer, x+1, y+1);
-                drawPoint(worldRenderer, x+1, y);
+                drawPoint(worldRenderer, x, y + 1);
+                drawPoint(worldRenderer, x + 1, y + 1);
+                drawPoint(worldRenderer, x + 1, y);
             }
         }
 
@@ -132,7 +122,7 @@ public class FancyPortals {
     private static long overridingRenderMillis = -1;
 
     public static void onRespawnPacket(S07PacketRespawn packet) {
-        if(true) return;
+        if (true) return;
         if (packet.getDimensionID() != Minecraft.getMinecraft().thePlayer.dimension) {
             overridingRenderMillis = System.currentTimeMillis();
         }
@@ -143,22 +133,22 @@ public class FancyPortals {
     }
 
     public static boolean shouldRenderWorldOverlay() {
-        if(overridingRenderMillis > 0) {
-            if(Minecraft.getMinecraft().theWorld != null && Minecraft.getMinecraft().thePlayer != null) {
+        if (overridingRenderMillis > 0) {
+            if (Minecraft.getMinecraft().theWorld != null && Minecraft.getMinecraft().thePlayer != null) {
                 RenderGlobal renderGlobal = Minecraft.getMinecraft().renderGlobal;
                 int loaded = 0;
-                for(RenderGlobal.ContainerLocalRenderInformation info : renderGlobal.renderInfos) {
+                for (RenderGlobal.ContainerLocalRenderInformation info : renderGlobal.renderInfos) {
                     CompiledChunk compiledchunk = info.renderChunk.compiledChunk;
 
                     if (compiledchunk != CompiledChunk.DUMMY && !compiledchunk.isEmpty()) {
-                        if(++loaded >= 5) {
+                        if (++loaded >= 5) {
                             overridingRenderMillis = -1;
                             return false;
                         }
                     }
                 }
             }
-            if(System.currentTimeMillis() - overridingRenderMillis > 1000) {
+            if (System.currentTimeMillis() - overridingRenderMillis > 1000) {
                 overridingRenderMillis = -1;
                 return false;
             }
@@ -168,8 +158,8 @@ public class FancyPortals {
     }
 
     public static void onUpdateCameraAndRender(float partialTicks, long nanoTime) {
-        if(overridingRenderMillis > 0) {
-            if(Minecraft.getMinecraft().theWorld != null && Minecraft.getMinecraft().thePlayer != null) {
+        if (overridingRenderMillis > 0) {
+            if (Minecraft.getMinecraft().theWorld != null && Minecraft.getMinecraft().thePlayer != null) {
                 Minecraft.getMinecraft().thePlayer.timeInPortal = 0.3f;
                 Minecraft.getMinecraft().thePlayer.prevTimeInPortal = 0.3f;
             }
@@ -194,36 +184,40 @@ public class FancyPortals {
     }
 
     private static void renderWorld() {
-        for(int i=5; i>=0; i--) {
+        for (int i = 5; i >= 0; i--) {
             GlStateManager.pushMatrix();
 
             GlStateManager.disableDepth();
             GlStateManager.disableLighting();
 
-
             GlStateManager.rotate(180, 0, 0, 1);
             GlStateManager.rotate(-90, 0, 1, 0);
 
-            if(i != 0) GlStateManager.translate(0, -3.49, 0);
+            if (i != 0) GlStateManager.translate(0, -3.49, 0);
 
             switch (i) {
                 case 1:
-                    GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); break;
+                    GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F);
+                    break;
                 case 2:
-                    GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F); break;
+                    GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F);
+                    break;
                 case 3:
-                    GlStateManager.rotate(-90.0F, 0.0F, 1.0F, 0.0F); break;
+                    GlStateManager.rotate(-90.0F, 0.0F, 1.0F, 0.0F);
+                    break;
                 case 5:
-                    GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F); break;
+                    GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F);
+                    break;
                 case 0:
-                    GlStateManager.rotate(-90.0F, 1.0F, 0.0F, 0.0F); break;
+                    GlStateManager.rotate(-90.0F, 1.0F, 0.0F, 0.0F);
+                    break;
             }
 
             Minecraft.getMinecraft().getTextureManager().bindTexture(RENDERS[i]);
             GlStateManager.color(1, 1, 1, 1);
-            if(i != 0) GlStateManager.translate(0, 0, 3.49);
+            if (i != 0) GlStateManager.translate(0, 0, 3.49);
 
-            if(i != 0) {
+            if (i != 0) {
                 GlStateManager.translate(-3.5f, -3.5f, 0);
                 WorldRenderer worldRenderer = getSurfaceWorldRenderer();
                 VertexFormat vertexformat = worldRenderer.getVertexFormat();
@@ -254,8 +248,8 @@ public class FancyPortals {
 
     @SubscribeEvent
     public void onRenderLast(RenderWorldLastEvent event) {
-        if(true) return;
-        if(!Minecraft.getMinecraft().getFramebuffer().isStencilEnabled())
+        if (true) return;
+        if (!Minecraft.getMinecraft().getFramebuffer().isStencilEnabled())
             Minecraft.getMinecraft().getFramebuffer().enableStencil();
 
         GL11.glEnable(GL11.GL_STENCIL_TEST);
@@ -275,23 +269,22 @@ public class FancyPortals {
         double viewerZ = viewer.lastTickPosZ + (viewer.posZ - viewer.lastTickPosZ) * event.partialTicks;
         GlStateManager.pushMatrix();
 
-        GlStateManager.translate(-viewerX+12+5/16f, -viewerY+100, -viewerZ+39);
+        GlStateManager.translate(-viewerX + 12 + 5 / 16f, -viewerY + 100, -viewerZ + 39);
         GlStateManager.rotate(90, 0, 1, 0);
         Gui.drawRect(0, 5, 3, 0, 0xffffffff);
         GlStateManager.rotate(180, 0, 1, 0);
-        GlStateManager.translate(-3, 0, -6/16f);
+        GlStateManager.translate(-3, 0, -6 / 16f);
         Gui.drawRect(0, 5, 3, 0, 0xffffffff);
 
         GlStateManager.popMatrix();
 
-
         GL11.glColorMask(true, true, true, true);
 
         // Only pass stencil test if equal to 1
         GL11.glStencilMask(0x00);
         GL11.glStencilFunc(GL11.GL_EQUAL, 1, 0xFF);
 
-        GlStateManager.translate(-viewerX+12, -viewerY+100, -viewerZ+37.5f);
+        GlStateManager.translate(-viewerX + 12, -viewerY + 100, -viewerZ + 37.5f);
 
         renderWorld();
 
@@ -299,5 +292,4 @@ public class FancyPortals {
         GlStateManager.enableCull();
     }
 
-
 }