[ci skip] spotlessApply with the new settings

3 files changed, 107 insertions, 75 deletions

diff --git a/src/main/java/com/detrav/gui/DetravScannerGUI.java b/src/main/java/com/detrav/gui/DetravScannerGUI.java
index 2eaeb96020..7c3070a55d 100644
--- a/src/main/java/com/detrav/gui/DetravScannerGUI.java
+++ b/src/main/java/com/detrav/gui/DetravScannerGUI.java
@@ -1,22 +1,23 @@
 package com.detrav.gui;
 
-import gregtech.api.util.GT_Utility;
-import net.minecraft.util.StatCollector;
-import org.lwjgl.opengl.GL11;
-
-import com.detrav.gui.textures.DetravMapTexture;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import org.lwjgl.opengl.GL11;
+
+import com.detrav.gui.textures.DetravMapTexture;
+import gregtech.api.util.GT_Utility;
 
 /**
  * Created by wital_000 on 21.03.2016.
  */
 public class DetravScannerGUI extends GuiScreen {
+
     public static final int GUI_ID = 20;
     private static DetravMapTexture map = null;
     OresList oresList = null;
@@ -44,42 +45,50 @@ public class DetravScannerGUI extends GuiScreen {
     @Override
     public void drawScreen(int x, int y, float f) {
         this.drawDefaultBackground();
-        if(map == null) return;
+        if (map == null) return;
         int currentWidth = Math.max(map.width, minWidth);
         int currentHeight = Math.max(map.height, minHeight);
-        int aX = (this.width - currentWidth-100)/2;
-        int aY = (this.height - currentHeight)/2;
+        int aX = (this.width - currentWidth - 100) / 2;
+        int aY = (this.height - currentHeight) / 2;
 
-        if(oresList == null || (prevW != width || prevH != height)) {
+        if (oresList == null || (prevW != width || prevH != height)) {
             oresList = new OresList(
-                this, 100, currentHeight, aY, aY+currentHeight, aX+currentWidth, 10, map.packet.ores, 
-                ((name, invert) -> {
-                    if (map != null) map.loadTexture(null, name, invert);
-                })
-            );
+                    this,
+                    100,
+                    currentHeight,
+                    aY,
+                    aY + currentHeight,
+                    aX + currentWidth,
+                    10,
+                    map.packet.ores,
+                    ((name, invert) -> { if (map != null) map.loadTexture(null, name, invert); }));
             prevW = width;
             prevH = height;
         }
 
         // draw back for ores
-        drawRect(aX,aY,aX+currentWidth+100,aY+currentHeight,0xFFC6C6C6);
+        drawRect(aX, aY, aX + currentWidth + 100, aY + currentHeight, 0xFFC6C6C6);
         map.glBindTexture();
-        map.draw(aX,aY);
+        map.draw(aX, aY);
         oresList.drawScreen(x, y, f);
         mc.getTextureManager().bindTexture(back);
         GL11.glColor4f(0xFF, 0xFF, 0xFF, 0xFF);
 
         // draw corners
-        drawTexturedModalRect(aX-5,aY-5,0,0,5,5);//leftTop
-        drawTexturedModalRect(aX+currentWidth+100,aY-5,171,0,5,5);//RightTop
-        drawTexturedModalRect(aX-5,aY+currentHeight,0,161,5,5);//leftDown
-        drawTexturedModalRect(aX+currentWidth+100,aY+currentHeight,171,161,5,5);//RightDown
-        
+        drawTexturedModalRect(aX - 5, aY - 5, 0, 0, 5, 5);// leftTop
+        drawTexturedModalRect(aX + currentWidth + 100, aY - 5, 171, 0, 5, 5);// RightTop
+        drawTexturedModalRect(aX - 5, aY + currentHeight, 0, 161, 5, 5);// leftDown
+        drawTexturedModalRect(aX + currentWidth + 100, aY + currentHeight, 171, 161, 5, 5);// RightDown
+
         // draw edges
-        for(int i = aX ; i <aX + currentWidth + 100 ; i += 128) drawTexturedModalRect(i,aY-5,5,0,Math.min(128,aX+currentWidth+100-i),5); //top
-        for(int i = aX ; i <aX + currentWidth + 100 ; i += 128) drawTexturedModalRect(i,aY+currentHeight,5,161,Math.min(128,aX+currentWidth+100-i),5); //down
-        for(int i = aY ; i <aY + currentHeight ; i += 128) drawTexturedModalRect(aX-5,i,0,5,5,Math.min(128,aY + currentHeight-i)); //left
-        for(int i = aY ; i <aY + currentHeight ; i += 128) drawTexturedModalRect(aX+currentWidth+100,i,171,5,5,Math.min(128,aY+currentHeight-i)); //right
+        for (int i = aX; i < aX + currentWidth + 100; i += 128)
+            drawTexturedModalRect(i, aY - 5, 5, 0, Math.min(128, aX + currentWidth + 100 - i), 5); // top
+        for (int i = aX; i < aX + currentWidth + 100; i += 128)
+            drawTexturedModalRect(i, aY + currentHeight, 5, 161, Math.min(128, aX + currentWidth + 100 - i), 5); // down
+        for (int i = aY; i < aY + currentHeight; i += 128)
+            drawTexturedModalRect(aX - 5, i, 0, 5, 5, Math.min(128, aY + currentHeight - i)); // left
+        for (int i = aY; i < aY + currentHeight; i += 128)
+            drawTexturedModalRect(aX + currentWidth + 100, i, 171, 5, 5, Math.min(128, aY + currentHeight - i)); // right
 
         if (map.packet.ptype == 2) {
             HashMap<Byte, Short>[][] fluidInfo = map.packet.map;
@@ -96,11 +105,10 @@ public class DetravScannerGUI extends GuiScreen {
                                         + map.packet.metaMap.get(fluidId));
                         info.add(
                                 StatCollector.translateToLocal("gui.detrav.scanner.tooltip.fluid_amount")
-                                        + GT_Utility.formatNumbers(fluidAmount) + " L");
-                    }
-                    else info.add(StatCollector.translateToLocal("gui.detrav.scanner.tooltip.no_fluid"));
-                }
-                else {
+                                        + GT_Utility.formatNumbers(fluidAmount)
+                                        + " L");
+                    } else info.add(StatCollector.translateToLocal("gui.detrav.scanner.tooltip.no_fluid"));
+                } else {
                     info.add(StatCollector.translateToLocal("gui.detrav.scanner.tooltip.no_fluid"));
                 }
                 func_146283_a(info, x, y);
diff --git a/src/main/java/com/detrav/gui/OresList.java b/src/main/java/com/detrav/gui/OresList.java
index a8847d3d64..54c2152f5a 100644
--- a/src/main/java/com/detrav/gui/OresList.java
+++ b/src/main/java/com/detrav/gui/OresList.java
@@ -1,33 +1,35 @@
 package com.detrav.gui;
 
-import cpw.mods.fml.client.GuiScrollingList;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.renderer.Tessellator;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.function.BiConsumer;
-import java.util.function.Consumer;
+
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.renderer.Tessellator;
+
+import cpw.mods.fml.client.GuiScrollingList;
 
 class OresList extends GuiScrollingList {
+
     private final HashMap<String, Integer> ores;
     private final List<String> keys;
     private final GuiScreen parent;
     private final BiConsumer<String, Boolean> onSelected;
     private boolean invert = false;
-    
+
     private int selected = -1;
 
-    public OresList(GuiScreen parent, int width, int height, int top, int bottom, int left, int entryHeight, HashMap<String, Integer> aOres, BiConsumer<String, Boolean> onSelected) {
+    public OresList(GuiScreen parent, int width, int height, int top, int bottom, int left, int entryHeight,
+            HashMap<String, Integer> aOres, BiConsumer<String, Boolean> onSelected) {
         super(parent.mc, width, height, top, bottom, left, entryHeight);
         this.parent = parent;
         this.onSelected = onSelected;
         ores = aOres;
         keys = new ArrayList<>(ores.keySet());
         Collections.sort(keys);
-        if(keys.size() > 1) keys.add(0, "All");
+        if (keys.size() > 1) keys.add(0, "All");
         selected = 0;
     }
 
@@ -40,8 +42,8 @@ class OresList extends GuiScrollingList {
     protected void elementClicked(int index, boolean doubleClick) {
         selected = index;
         if (doubleClick) this.invert = !this.invert;
-        
-        if(onSelected != null) onSelected.accept(keys.get(index), this.invert);
+
+        if (onSelected != null) onSelected.accept(keys.get(index), this.invert);
     }
 
     @Override
@@ -55,11 +57,10 @@ class OresList extends GuiScrollingList {
     @Override
     protected void drawSlot(int slotIdx, int entryRight, int slotTop, int slotBuffer, Tessellator tess) {
         parent.drawString(
-            parent.mc.fontRenderer,
-            parent.mc.fontRenderer.trimStringToWidth(keys.get(slotIdx), listWidth - 10),
-            this.left + 3,
-            slotTop - 1,
-            ores.getOrDefault(keys.get(slotIdx), 0x7d7b76)
-        );
+                parent.mc.fontRenderer,
+                parent.mc.fontRenderer.trimStringToWidth(keys.get(slotIdx), listWidth - 10),
+                this.left + 3,
+                slotTop - 1,
+                ores.getOrDefault(keys.get(slotIdx), 0x7d7b76));
     }
 }
diff --git a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
index 444064594e..01c570d5a1 100644
--- a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
+++ b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
@@ -1,15 +1,17 @@
 package com.detrav.gui.textures;
 
-import com.detrav.net.ProspectingPacket;
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import java.awt.image.WritableRaster;
+
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.texture.AbstractTexture;
 import net.minecraft.client.renderer.texture.TextureUtil;
 import net.minecraft.client.resources.IResourceManager;
+
 import org.lwjgl.opengl.GL11;
 
-import java.awt.Color;
-import java.awt.image.BufferedImage;
-import java.awt.image.WritableRaster;
+import com.detrav.net.ProspectingPacket;
 
 /**
  * Created by wital_000 on 21.03.2016.
@@ -22,8 +24,7 @@ public class DetravMapTexture extends AbstractTexture {
     public int height = -1;
     public boolean invert = false;
 
-    public DetravMapTexture(ProspectingPacket aPacket)
-    {
+    public DetravMapTexture(ProspectingPacket aPacket) {
         packet = aPacket;
     }
 
@@ -49,18 +50,20 @@ public class DetravMapTexture extends AbstractTexture {
                             break;
                         }
                     } else if (packet.ptype == 2) {
-                        final short fluidId = packet.map[i][j].get((byte) 1), fluidSize = packet.map[i][j].get((byte) 2);
+                        final short fluidId = packet.map[i][j].get((byte) 1),
+                                fluidSize = packet.map[i][j].get((byte) 2);
                         final String name = packet.metaMap.get(fluidId);
-                        
+
                         // Variables used to locate within a chunk.
                         final int k = (i % 16), l = (j % 16);
-                        
-                        if( ( (k + l * 16) * 3) < (fluidSize + 48) && (selected.equals("All") || selected.equals(name))) {
+
+                        if (((k + l * 16) * 3) < (fluidSize + 48)
+                                && (selected.equals("All") || selected.equals(name))) {
                             image.setRGB(i, j, packet.ores.getOrDefault(name, Color.BLACK.getRGB()) | 0XFF000000);
                         }
-                    }else if (packet.ptype == 3) {
+                    } else if (packet.ptype == 3) {
                         final short meta = packet.map[i][j].get((byte) 1);
-                        image.setRGB(i, j, ((meta & 0xFF) << 16) + ((meta & 0xFF) << 8) + ((meta & 0xFF)) | 0XFF000000);                        
+                        image.setRGB(i, j, ((meta & 0xFF) << 16) + ((meta & 0xFF) << 8) + ((meta & 0xFF)) | 0XFF000000);
                     }
                 }
                 // draw player pos
@@ -78,28 +81,28 @@ public class DetravMapTexture extends AbstractTexture {
 
             }
         }
-        
+
         return image;
     }
-    
+
     @Override
-    public void loadTexture(IResourceManager resourceManager){
+    public void loadTexture(IResourceManager resourceManager) {
         this.deleteGlTexture();
-        if(packet != null) {
+        if (packet != null) {
             int tId = getGlTextureId();
-            if(tId <0) return;
+            if (tId < 0) return;
             TextureUtil.uploadTextureImageAllocate(this.getGlTextureId(), getImage(), false, false);
             width = packet.getSize();
             height = packet.getSize();
         }
     }
 
-    public void loadTexture(IResourceManager resourceManager, boolean invert){
+    public void loadTexture(IResourceManager resourceManager, boolean invert) {
         this.invert = invert;
         loadTexture(resourceManager);
     }
-    
-    public void loadTexture(IResourceManager resourceManager, String selected, boolean invert){
+
+    public void loadTexture(IResourceManager resourceManager, String selected, boolean invert) {
         this.selected = selected;
         loadTexture(resourceManager, invert);
     }
@@ -111,15 +114,35 @@ public class DetravMapTexture extends AbstractTexture {
     }
 
     public void draw(int x, int y) {
-        float f = 1F / (float)width;
-        float f1 = 1F / (float)height;
+        float f = 1F / (float) width;
+        float f1 = 1F / (float) height;
         int u = 0, v = 0;
         Tessellator tessellator = Tessellator.instance;
         tessellator.startDrawingQuads();
-        tessellator.addVertexWithUV((double)(x), (double)(y + height), 0, (double)((float)(u) * f), (double)((float)(v + height) * f1));
-        tessellator.addVertexWithUV((double)(x + width), (double)(y + height), 0, (double)((float)(u + width) * f), (double)((float)(v + height) * f1));
-        tessellator.addVertexWithUV((double)(x + width), (double)(y), 0, (double)((float)(u + width) * f), (double)((float)(v) * f1));
-        tessellator.addVertexWithUV((double)(x), (double)(y), 0, (double)((float)(u) * f), (double)((float)(v) * f1));
+        tessellator.addVertexWithUV(
+                (double) (x),
+                (double) (y + height),
+                0,
+                (double) ((float) (u) * f),
+                (double) ((float) (v + height) * f1));
+        tessellator.addVertexWithUV(
+                (double) (x + width),
+                (double) (y + height),
+                0,
+                (double) ((float) (u + width) * f),
+                (double) ((float) (v + height) * f1));
+        tessellator.addVertexWithUV(
+                (double) (x + width),
+                (double) (y),
+                0,
+                (double) ((float) (u + width) * f),
+                (double) ((float) (v) * f1));
+        tessellator.addVertexWithUV(
+                (double) (x),
+                (double) (y),
+                0,
+                (double) ((float) (u) * f),
+                (double) ((float) (v) * f1));
         tessellator.draw();
     }