IntelliJ's Code Clean Up

15 files changed, 33 insertions, 50 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxBats.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxBats.java
index 92df3989..509bdfa3 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxBats.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxBats.java
@@ -26,7 +26,7 @@ public class FeatureBoxBats extends SimpleFeature implements WorldRenderListener
     }
 
 
-    private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
+    private final SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
     @Override
     public void drawWorld(float partialTicks) {
         if (!isEnabled()) return;
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxSkelemaster.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxSkelemaster.java
index 545a5449..7fb95532 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxSkelemaster.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxSkelemaster.java
@@ -26,7 +26,7 @@ public class FeatureBoxSkelemaster extends SimpleFeature implements WorldRenderL
     }
 
 
-    private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
+    private final SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
     @Override
     public void drawWorld(float partialTicks) {
         if (!isEnabled()) return;
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxStarMobs.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxStarMobs.java
index e647e0de..881773af 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxStarMobs.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxStarMobs.java
@@ -25,7 +25,7 @@ public class FeatureBoxStarMobs extends SimpleFeature implements WorldRenderList
     }
 
 
-    private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
+    private final SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
     @Override
     public void drawWorld(float partialTicks) {
         if (!isEnabled()) return;
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonCurrentRoomSecrets.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonCurrentRoomSecrets.java
index 667ce16d..ca9cbb8f 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonCurrentRoomSecrets.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonCurrentRoomSecrets.java
@@ -51,9 +51,7 @@ public class FeatureDungeonCurrentRoomSecrets extends TextHUDFeature implements
 
     @Override
     public List<String> getUsedTextStyle() {
-        return Arrays.asList(new String[] {
-                "title", "separator", "currentSecrets", "separator2", "totalSecrets"
-        });
+        return Arrays.asList("title", "separator", "currentSecrets", "separator2", "totalSecrets");
     }
 
     @Override
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonDeaths.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonDeaths.java
index c50333b3..abd03765 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonDeaths.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonDeaths.java
@@ -46,8 +46,7 @@ public class FeatureDungeonDeaths extends TextHUDFeature implements ChatListener
     public boolean isHUDViewable() {
         if (!skyblockStatus.isOnDungeon()) return false;
         DungeonContext context = skyblockStatus.getContext();
-        if (context == null) return false;
-        return true;
+        return context != null;
     }
 
     @Override
@@ -57,9 +56,7 @@ public class FeatureDungeonDeaths extends TextHUDFeature implements ChatListener
 
     @Override
     public List<String> getUsedTextStyle() {
-        return Arrays.asList(new String[] {
-                "username", "separator", "deaths", "total", "totalDeaths"
-        });
+        return Arrays.asList("username", "separator", "deaths", "total", "totalDeaths");
     }
 
     @Override
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java
index 1cfb204b..067f4ad8 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java
@@ -105,7 +105,7 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener,
     public void drawHUD(float partialTicks) {
         if (!skyblockStatus.isOnDungeon()) return;
         if (skyblockStatus.getContext() == null || !skyblockStatus.getContext().getMapProcessor().isInitialized()) return;
-        if (!on) return;;
+        if (!on) return;
 
         DungeonContext context = skyblockStatus.getContext();
         MapProcessor mapProcessor = context.getMapProcessor();
@@ -113,7 +113,7 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener,
         Rectangle featureRect =getFeatureRect().getRectangle();
         Gui.drawRect(0,0,featureRect.width, featureRect.height, RenderUtils.getColorAt(featureRect.x, featureRect.y, this.<AColor>getParameter("background_color").getValue()));
         GlStateManager.color(1,1,1,1);
-        GlStateManager.pushMatrix();;
+        GlStateManager.pushMatrix();
         if (mapData == null) {
             Gui.drawRect(0,0,featureRect.width, featureRect.height, 0xFFFF0000);
         } else {
@@ -209,9 +209,9 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener,
 
 
 
-    private DynamicTexture mapTexture = new DynamicTexture(128, 128);
-    private ResourceLocation location = Minecraft.getMinecraft().getTextureManager().getDynamicTextureLocation("dungeonmap/map", mapTexture);
-    private int[] mapTextureData = mapTexture.getTextureData();
+    private final DynamicTexture mapTexture = new DynamicTexture(128, 128);
+    private final ResourceLocation location = Minecraft.getMinecraft().getTextureManager().getDynamicTextureLocation("dungeonmap/map", mapTexture);
+    private final int[] mapTextureData = mapTexture.getTextureData();
 
     private void updateMapTexture(byte[] colors, MapProcessor mapProcessor, List<DungeonRoom> dungeonRooms) {
         for (int i = 0; i < 16384; ++i) {
@@ -327,10 +327,10 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener,
                     float f4 = (float)(b0 / 4 + 1) / 4.0F;
                     worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX);
                     float f5 = -0.001F;
-                    worldrenderer.pos(-1.0D, 1.0D, (double)((float)k * -0.001F)).tex((double)f1, (double)f2).endVertex();
-                    worldrenderer.pos(1.0D, 1.0D, (double)((float)k * -0.001F)).tex((double)f3, (double)f2).endVertex();
-                    worldrenderer.pos(1.0D, -1.0D, (double)((float)k * -0.001F)).tex((double)f3, (double)f4).endVertex();
-                    worldrenderer.pos(-1.0D, -1.0D, (double)((float)k * -0.001F)).tex((double)f1, (double)f4).endVertex();
+                    worldrenderer.pos(-1.0D, 1.0D, (float)k * -0.001F).tex(f1, f2).endVertex();
+                    worldrenderer.pos(1.0D, 1.0D, (float)k * -0.001F).tex(f3, f2).endVertex();
+                    worldrenderer.pos(1.0D, -1.0D, (float)k * -0.001F).tex(f3, f4).endVertex();
+                    worldrenderer.pos(-1.0D, -1.0D, (float)k * -0.001F).tex(f1, f4).endVertex();
                     tessellator.draw();
                     GlStateManager.popMatrix();
                     ++k;
@@ -349,10 +349,10 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener,
         GlStateManager.tryBlendFuncSeparate(1, 771, 0, 1);
         GlStateManager.disableAlpha();
         worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX);
-        worldrenderer.pos((float)(i) + f, (double)((float)(j + 128) - f), -0.009999999776482582D).tex(0.0D, 1.0D).endVertex();
-        worldrenderer.pos((float)(i + 128) - f, (double)((float)(j + 128) - f), -0.009999999776482582D).tex(1.0D, 1.0D).endVertex();
-        worldrenderer.pos((float)(i + 128) - f, (double)((float)(j) + f), -0.009999999776482582D).tex(1.0D, 0.0D).endVertex();
-        worldrenderer.pos((float)(i) + f, (double)((float)(j) + f), -0.009999999776482582D).tex(0.0D, 0.0D).endVertex();
+        worldrenderer.pos((float)(i) + f, (float)(j + 128) - f, -0.009999999776482582D).tex(0.0D, 1.0D).endVertex();
+        worldrenderer.pos((float)(i + 128) - f, (float)(j + 128) - f, -0.009999999776482582D).tex(1.0D, 1.0D).endVertex();
+        worldrenderer.pos((float)(i + 128) - f, (float)(j) + f, -0.009999999776482582D).tex(1.0D, 0.0D).endVertex();
+        worldrenderer.pos((float)(i) + f, (float)(j) + f, -0.009999999776482582D).tex(0.0D, 0.0D).endVertex();
         tessellator.draw();
         GlStateManager.enableAlpha();
         GlStateManager.disableBlend();
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMilestone.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMilestone.java
index 45f0f016..fcd0ac14 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMilestone.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMilestone.java
@@ -53,9 +53,7 @@ public class FeatureDungeonMilestone extends TextHUDFeature implements ChatListe
 
     @Override
     public List<String> getUsedTextStyle() {
-        return Arrays.asList(new String[] {
-                "title", "separator", "number"
-        });
+        return Arrays.asList("title", "separator", "number");
     }
 
     @Override
@@ -84,7 +82,7 @@ public class FeatureDungeonMilestone extends TextHUDFeature implements ChatListe
 
     @Override
     public void onChat(ClientChatReceivedEvent clientChatReceivedEvent) {
-        if (clientChatReceivedEvent.type == 2) return;;
+        if (clientChatReceivedEvent.type == 2) return;
         if (!skyblockStatus.isOnDungeon()) return;
         DungeonContext context = skyblockStatus.getContext();
         if (context == null) return;
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonRealTime.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonRealTime.java
index 416db257..85873e4b 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonRealTime.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonRealTime.java
@@ -58,9 +58,7 @@ public class FeatureDungeonRealTime extends TextHUDFeature implements DungeonSta
 
     @Override
     public java.util.List<String> getUsedTextStyle() {
-        return Arrays.asList(new String[] {
-                "title", "discriminator", "separator", "number"
-        });
+        return Arrays.asList("title", "discriminator", "separator", "number");
     }
 
     @Override
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonSBTime.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonSBTime.java
index 69626269..380aba67 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonSBTime.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonSBTime.java
@@ -29,7 +29,7 @@ import java.util.List;
 
 public class FeatureDungeonSBTime extends TextHUDFeature {
 
-    private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
+    private final SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
 
     public FeatureDungeonSBTime() {
         super("Dungeon", "Display Ingame Dungeon Time", "Display how much time skyblock thinks has passed since dungeon run started", "dungeon.stats.igtime", true, getFontRenderer().getStringWidth("Time(IG): 1h 59m 59s"), getFontRenderer().FONT_HEIGHT);
@@ -78,9 +78,7 @@ public class FeatureDungeonSBTime extends TextHUDFeature {
 
     @Override
     public java.util.List<String> getUsedTextStyle() {
-        return Arrays.asList(new String[] {
-                "title", "discriminator", "separator", "number"
-        });
+        return Arrays.asList("title", "discriminator", "separator", "number");
     }
 
     @Override
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonScore.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonScore.java
index c5b9618e..842ece7d 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonScore.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonScore.java
@@ -93,7 +93,7 @@ public class FeatureDungeonScore extends TextHUDFeature implements StompConnecte
         dummyText2.add(new StyledText("S","currentScore"));
         dummyText2.add(new StyledText("->","arrow"));
         dummyText2.add(new StyledText("S+ ","nextScore"));
-        dummyText2.add(new StyledText("(","brackets"));;
+        dummyText2.add(new StyledText("(","brackets"));
         dummyText2.add(new StyledText("1 Required 1 crypt","required"));
         dummyText2.add(new StyledText(")","brackets"));
 
@@ -101,9 +101,7 @@ public class FeatureDungeonScore extends TextHUDFeature implements StompConnecte
 
     @Override
     public java.util.List<String> getUsedTextStyle() {
-        return Arrays.asList(new String[] {
-                "scorename", "separator", "score", "brackets", "etc", "currentScore", "arrow", "nextScore", "required"
-        });
+        return Arrays.asList("scorename", "separator", "score", "brackets", "etc", "currentScore", "arrow", "nextScore", "required");
 
     }
 
@@ -351,7 +349,7 @@ public class FeatureDungeonScore extends TextHUDFeature implements StompConnecte
         actualBit.add(new StyledText(currentLetter,"currentScore"));
         actualBit.add(new StyledText("->","arrow"));
         actualBit.add(new StyledText(nextLetter+" ","nextScore"));
-        actualBit.add(new StyledText("(","brackets"));;
+        actualBit.add(new StyledText("(","brackets"));
         actualBit.add(new StyledText(reqPT2+" required "+tombsBreakable+" crypt "+secrets+" secrets","required"));
         actualBit.add(new StyledText(")","brackets"));
         return actualBit;
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonSecrets.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonSecrets.java
index b6c4bde7..7ef9dfce 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonSecrets.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonSecrets.java
@@ -103,9 +103,7 @@ public class FeatureDungeonSecrets extends TextHUDFeature {
 
     @Override
     public java.util.List<String> getUsedTextStyle() {
-        return Arrays.asList(new String[] {
-                "title", "separator", "currentSecrets", "separator2", "totalSecrets", "unknown"
-        });
+        return Arrays.asList("title", "separator", "currentSecrets", "separator2", "totalSecrets", "unknown");
     }
 
     @Override
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureHideNameTags.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureHideNameTags.java
index d5476bc8..63f9bd58 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureHideNameTags.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureHideNameTags.java
@@ -17,7 +17,7 @@ public class FeatureHideNameTags extends SimpleFeature implements EntityLivingRe
     }
 
 
-    private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
+    private final SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
 
     @Override
     public void onEntityRenderPre(RenderLivingEvent.Pre renderPlayerEvent) {
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeaturePlayerESP.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeaturePlayerESP.java
index 490f4c18..d464d6d6 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeaturePlayerESP.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeaturePlayerESP.java
@@ -37,7 +37,7 @@ public class FeaturePlayerESP extends SimpleFeature implements PlayerRenderListe
     }
 
 
-    private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
+    private final SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
 
     private boolean preCalled = false;
     @Override
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureWarnLowHealth.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureWarnLowHealth.java
index aafca543..527106db 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureWarnLowHealth.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureWarnLowHealth.java
@@ -43,7 +43,7 @@ public class FeatureWarnLowHealth extends TextHUDFeature {
     }
 
 
-    private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
+    private final SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
 
 
     @Override
@@ -53,9 +53,7 @@ public class FeatureWarnLowHealth extends TextHUDFeature {
 
     @Override
     public List<String> getUsedTextStyle() {
-        return Arrays.asList(new String[] {
-                "title", "separator", "number", "unit"
-        });
+        return Arrays.asList("title", "separator", "number", "unit");
     }
 
     private static final java.util.List<StyledText> dummyText=  new ArrayList<StyledText>();
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureWatcherWarning.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureWatcherWarning.java
index b5a93f1b..d2b50f3a 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureWatcherWarning.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureWatcherWarning.java
@@ -43,7 +43,7 @@ public class FeatureWatcherWarning extends TextHUDFeature implements ChatListene
         return Collections.singletonList("warning");
     }
 
-    private UUID lastRoomUID = UUID.randomUUID();
+    private final UUID lastRoomUID = UUID.randomUUID();
     private long warning = 0;
 
     private static final List<StyledText> text = new ArrayList<StyledText>();