Code Clean Up (#2)

* intellij code clean up

* optimize imports

* format

* intellij suggestions

* fix empty catch issues

1 files changed, 12 insertions, 16 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/NPCRetexturing.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/NPCRetexturing.java
index a0b0cd64..e234c458 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/NPCRetexturing.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/NPCRetexturing.java
@@ -6,10 +6,8 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.AbstractClientPlayer;
-import net.minecraft.client.renderer.block.model.ModelBlock;
 import net.minecraft.client.resources.IResourceManager;
 import net.minecraft.client.resources.IResourceManagerReloadListener;
-import net.minecraft.client.resources.model.ModelRotation;
 import net.minecraft.util.ResourceLocation;
 
 import java.io.BufferedReader;
@@ -36,17 +34,17 @@ public class NPCRetexturing implements IResourceManagerReloadListener {
         }
     }
 
-    private HashMap<AbstractClientPlayer, Skin> skinOverrideCache = new HashMap<>();
-    private HashMap<String, Skin> skinMap = new HashMap<>();
+    private final HashMap<AbstractClientPlayer, Skin> skinOverrideCache = new HashMap<>();
+    private final HashMap<String, Skin> skinMap = new HashMap<>();
 
     private boolean gettingSkin = false;
 
     public Skin getSkin(AbstractClientPlayer player) {
-        if(gettingSkin) return null;
+        if (gettingSkin) return null;
 
-        if(player.getUniqueID().version() == 4) return null;
+        if (player.getUniqueID().version() == 4) return null;
 
-        if(skinOverrideCache.containsKey(player)) {
+        if (skinOverrideCache.containsKey(player)) {
             return skinOverrideCache.get(player);
         }
 
@@ -54,7 +52,7 @@ public class NPCRetexturing implements IResourceManagerReloadListener {
         ResourceLocation loc = player.getLocationSkin();
         gettingSkin = false;
 
-        if(skinMap.containsKey(loc.getResourcePath())) {
+        if (skinMap.containsKey(loc.getResourcePath())) {
             Skin skin = skinMap.get(loc.getResourcePath());
             skinOverrideCache.put(player, skin);
             return skin;
@@ -72,25 +70,23 @@ public class NPCRetexturing implements IResourceManagerReloadListener {
     public void onResourceManagerReload(IResourceManager resourceManager) {
         skinMap.clear();
 
-        try(BufferedReader reader = new BufferedReader(new InputStreamReader(
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(
                 Minecraft.getMinecraft().getResourceManager().getResource(npcRetexturingJson).getInputStream(), StandardCharsets.UTF_8))) {
             JsonObject json = gson.fromJson(reader, JsonObject.class);
 
-            if(json == null) return;
+            if (json == null) return;
 
-            for(Map.Entry<String, JsonElement> entry : json.entrySet()) {
-                if(entry.getValue().isJsonObject()) {
+            for (Map.Entry<String, JsonElement> entry : json.entrySet()) {
+                if (entry.getValue().isJsonObject()) {
                     JsonObject val = entry.getValue().getAsJsonObject();
 
                     Skin skin = new Skin(new ResourceLocation(val.get("skin").getAsString()), val.get("skinny").getAsBoolean());
-                    skinMap.put("skins/"+entry.getKey(), skin);
+                    skinMap.put("skins/" + entry.getKey(), skin);
                 }
             }
-        } catch(Exception e) {
-        }
+        } catch (Exception ignored) {}
     }
 
-
     public static NPCRetexturing getInstance() {
         return INSTANCE;
     }