Prettified Code!

7 files changed, 78 insertions, 105 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/sign/IEditSign.java b/src/main/java/at/hannibal2/skyhanni/sign/IEditSign.java
index 278ec7224..d7277dd26 100644
--- a/src/main/java/at/hannibal2/skyhanni/sign/IEditSign.java
+++ b/src/main/java/at/hannibal2/skyhanni/sign/IEditSign.java
@@ -4,4 +4,4 @@ public interface IEditSign {
     TextInputUtil getTextInputUtil();
 
     SignSelectionList getSignSelectionList();
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/sign/IModifiedSign.java b/src/main/java/at/hannibal2/skyhanni/sign/IModifiedSign.java
index 38375d5ac..912663c2d 100644
--- a/src/main/java/at/hannibal2/skyhanni/sign/IModifiedSign.java
+++ b/src/main/java/at/hannibal2/skyhanni/sign/IModifiedSign.java
@@ -16,4 +16,4 @@ public interface IModifiedSign {
     int getSelectionStart();
 
     int getSelectionEnd();
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/sign/LorenzSignUtils.java b/src/main/java/at/hannibal2/skyhanni/sign/LorenzSignUtils.java
index 5b450a734..0b52b649c 100644
--- a/src/main/java/at/hannibal2/skyhanni/sign/LorenzSignUtils.java
+++ b/src/main/java/at/hannibal2/skyhanni/sign/LorenzSignUtils.java
@@ -1,20 +1,19 @@
 package at.hannibal2.skyhanni.sign;
 
+import java.lang.reflect.Field;
 import net.minecraft.client.gui.inventory.GuiEditSign;
 import net.minecraft.tileentity.TileEntitySign;
 
-import java.lang.reflect.Field;
-
 public class LorenzSignUtils {
 
     private static boolean once = false;
     private static Field field = null;
+
     //(field_146848_f) class net.minecraft.client.gui.inventory.GuiEditSign
 
     public static TileEntitySign getTileSign(GuiEditSign editSign) {
-
-//        Field field1 = ReflectionHelper.findField(editSign.getClass(), "editSign");
-//        ObfuscationReflectionHelper.getPrivateValue(editSign.getClass(), editSign, 0)
+        //        Field field1 = ReflectionHelper.findField(editSign.getClass(), "editSign");
+        //        ObfuscationReflectionHelper.getPrivateValue(editSign.getClass(), editSign, 0)
 
         if (field != null) {
             try {
@@ -31,29 +30,28 @@ public class LorenzSignUtils {
 
         try {
             Class<? extends GuiEditSign> aClass = editSign.getClass();
-//            System.out.println("");
-//            System.out.println("");
-//            System.out.println("");
+            //            System.out.println("");
+            //            System.out.println("");
+            //            System.out.println("");
             for (Field field : aClass.getDeclaredFields()) {
                 String name = field.getName();
                 Class<?> fieldDeclaringClass = field.getDeclaringClass();
-//                System.out.println("");
-//                System.out.println("(" + name + ") " + fieldDeclaringClass);
+                //                System.out.println("");
+                //                System.out.println("(" + name + ") " + fieldDeclaringClass);
 
                 field.setAccessible(true);
                 Object o = field.get(editSign);
                 if (o instanceof TileEntitySign) {
-//                    System.out.println("DONE!!!!!");
+                    //                    System.out.println("DONE!!!!!");
                     LorenzSignUtils.field = field;
                     return (TileEntitySign) o;
                 }
-
-//                System.out.println("");
+                //                System.out.println("");
             }
 
-//            System.out.println("");
-//            System.out.println("");
-//            System.out.println("");
+            //            System.out.println("");
+            //            System.out.println("");
+            //            System.out.println("");
             Field field = aClass.getDeclaredField("tileSign");
             field.setAccessible(true);
             return (TileEntitySign) field.get(editSign);
diff --git a/src/main/java/at/hannibal2/skyhanni/sign/SignSelectionList.java b/src/main/java/at/hannibal2/skyhanni/sign/SignSelectionList.java
index c9c963cee..e4a6e1030 100644
--- a/src/main/java/at/hannibal2/skyhanni/sign/SignSelectionList.java
+++ b/src/main/java/at/hannibal2/skyhanni/sign/SignSelectionList.java
@@ -1,5 +1,9 @@
 package at.hannibal2.skyhanni.sign;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.gui.GuiListExtended;
@@ -14,13 +18,8 @@ import net.minecraft.util.ResourceLocation;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
+public class SignSelectionList extends GuiListExtended {
 
-public class SignSelectionList extends GuiListExtended
-{
     public static final List<Entry> AUCTION_STARTING_BID_PRICES = new ArrayList<>();
     public static final List<Entry> AUCTION_BID_PRICES = new ArrayList<>();
     public static final List<Entry> AUCTION_QUERIES = new ArrayList<>();
@@ -32,40 +31,34 @@ public class SignSelectionList extends GuiListExtended
     private final List<SignSelectionList.Entry> list;
     private final String title;
 
-    public SignSelectionList(Minecraft mc, int width, int height, int top, int bottom, List<SignSelectionList.Entry> list, String title)
-    {
+    public SignSelectionList(Minecraft mc, int width, int height, int top, int bottom, List<SignSelectionList.Entry> list, String title) {
         super(mc, width, height, top, bottom, 16);
         this.list = list;
         this.title = title;
 
-        if (this.getSize() > 5)
-        {
+        if (this.getSize() > 5) {
             this.list.remove(0);
         }
         Collections.reverse(this.list);
     }
 
     @Override
-    protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY)
-    {
+    protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY) {
         this.selectedSlotIndex = slotIndex;
     }
 
     @Override
-    public IGuiListEntry getListEntry(int index)
-    {
+    public IGuiListEntry getListEntry(int index) {
         return this.list.stream().distinct().collect(Collectors.toList()).get(index);
     }
 
     @Override
-    protected int getSize()
-    {
+    protected int getSize() {
         return this.list.stream().distinct().collect(Collectors.toList()).size();
     }
 
     @Override
-    protected boolean isSelected(int index)
-    {
+    protected boolean isSelected(int index) {
         return index == this.selectedSlotIndex;
     }
 
@@ -76,22 +69,18 @@ public class SignSelectionList extends GuiListExtended
     protected void overlayBackground(int startY, int endY, int startAlpha, int endAlpha) {}
 
     @Override
-    public int getListWidth()
-    {
+    public int getListWidth() {
         return 100;
     }
 
     @Override
-    public int getSlotHeight()
-    {
+    public int getSlotHeight() {
         return 10;
     }
 
     @Override
-    public void drawScreen(int mouseX, int mouseY, float partialTicks)
-    {
-        if (this.field_178041_q)
-        {
+    public void drawScreen(int mouseX, int mouseY, float partialTicks) {
+        if (this.field_178041_q) {
             this.mouseX = mouseX;
             this.mouseY = mouseY;
             this.drawBackground();
@@ -101,10 +90,9 @@ public class SignSelectionList extends GuiListExtended
             Tessellator tessellator = Tessellator.getInstance();
             this.drawContainerBackground(tessellator);
             int k = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
-            int l = this.top + 4 - (int)this.amountScrolled;
+            int l = this.top + 4 - (int) this.amountScrolled;
 
-            if (this.hasListHeader)
-            {
+            if (this.hasListHeader) {
                 this.drawListHeader(k, l, tessellator);
             }
 
@@ -118,13 +106,11 @@ public class SignSelectionList extends GuiListExtended
         GlStateManager.enableDepth();
     }
 
-    public void add(String value)
-    {
+    public void add(String value) {
         this.list.add(new Entry(value));
     }
 
-    public static void clearAll()
-    {
+    public static void clearAll() {
         SignSelectionList.AUCTION_STARTING_BID_PRICES.clear();
         SignSelectionList.AUCTION_BID_PRICES.clear();
         SignSelectionList.AUCTION_QUERIES.clear();
@@ -134,14 +120,13 @@ public class SignSelectionList extends GuiListExtended
         SignSelectionList.BAZAAR_PRICE.clear();
     }
 
-    public static class Entry implements GuiListExtended.IGuiListEntry
-    {
+    public static class Entry implements GuiListExtended.IGuiListEntry {
+
         private final Minecraft mc;
         private final String value;
         private long lastClicked;
 
-        public Entry(String value)
-        {
+        public Entry(String value) {
             this.mc = Minecraft.getMinecraft();
             this.value = value;
         }
@@ -150,49 +135,45 @@ public class SignSelectionList extends GuiListExtended
         public void setSelected(int p_178011_1_, int p_178011_2_, int p_178011_3_) {}
 
         @Override
-        public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected)
-        {
+        public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected) {
             this.mc.fontRendererObj.drawString(this.value, x + 2, y + 2, 16777215);
         }
 
         @Override
-        public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY)
-        {
-//            TileEntitySign sign = ((GuiEditSign)this.mc.currentScreen).tileSign;
-//            TileEntitySign sign = ().tileSign;
-            TileEntitySign sign = LorenzSignUtils.getTileSign((GuiEditSign)this.mc.currentScreen);
+        public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
+            //            TileEntitySign sign = ((GuiEditSign)this.mc.currentScreen).tileSign;
+            //            TileEntitySign sign = ().tileSign;
+            TileEntitySign sign = LorenzSignUtils.getTileSign((GuiEditSign) this.mc.currentScreen);
             sign.markDirty();
 
-            if (Minecraft.getSystemTime() - this.lastClicked < 250L)
-            {
-//                if (SkyBlockcatiaSettings.INSTANCE.auctionBidConfirm && NumberUtils.isNumeric(this.value))
-//                {
-//                    int price = Integer.parseInt(this.value);
-//
-//                    if (price >= SkyBlockcatiaSettings.INSTANCE.auctionBidConfirmValue)
-//                    {
-//                        this.mc.displayGuiScreen(new GuiYesNo(this.mc.currentScreen, LangUtils.translate("message.bid_confirm_title"), LangUtils.translate("message.bid_confirm"), 201));
-//                    }
-//                    else
-//                    {
-//                        SignSelectionList.processSignData(sign);
-//                        this.mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
-//                        this.mc.displayGuiScreen(null);
-//                    }
-//                }
-//                else
-//                {
+            if (Minecraft.getSystemTime() - this.lastClicked < 250L) {
+                //                if (SkyBlockcatiaSettings.INSTANCE.auctionBidConfirm && NumberUtils.isNumeric(this.value))
+                //                {
+                //                    int price = Integer.parseInt(this.value);
+                //
+                //                    if (price >= SkyBlockcatiaSettings.INSTANCE.auctionBidConfirmValue)
+                //                    {
+                //                        this.mc.displayGuiScreen(new GuiYesNo(this.mc.currentScreen, LangUtils.translate("message.bid_confirm_title"), LangUtils.translate("message.bid_confirm"), 201));
+                //                    }
+                //                    else
+                //                    {
+                //                        SignSelectionList.processSignData(sign);
+                //                        this.mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
+                //                        this.mc.displayGuiScreen(null);
+                //                    }
+                //                }
+                //                else
+                //                {
                 SignSelectionList.processSignData(sign);
                 this.mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
                 this.mc.displayGuiScreen(null);
-//                }
+                //                }
             }
 
             sign.signText[0] = new ChatComponentText(this.value);
 
-            if (this.mc.currentScreen instanceof IEditSign)
-            {
-                ((IEditSign)this.mc.currentScreen).getTextInputUtil().moveCaretToEnd();
+            if (this.mc.currentScreen instanceof IEditSign) {
+                ((IEditSign) this.mc.currentScreen).getTextInputUtil().moveCaretToEnd();
             }
             this.lastClicked = Minecraft.getSystemTime();
             return false;
@@ -202,14 +183,11 @@ public class SignSelectionList extends GuiListExtended
         public void mouseReleased(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY) {}
 
         @Override
-        public boolean equals(Object obj)
-        {
-            if (!(obj instanceof Entry))
-            {
+        public boolean equals(Object obj) {
+            if (!(obj instanceof Entry)) {
                 return false;
             }
-            if (obj == this)
-            {
+            if (obj == this) {
                 return true;
             }
             Entry other = (Entry) obj;
@@ -217,25 +195,21 @@ public class SignSelectionList extends GuiListExtended
         }
 
         @Override
-        public int hashCode()
-        {
+        public int hashCode() {
             return new HashCodeBuilder().append(this.value).toHashCode();
         }
 
-        public String getValue()
-        {
+        public String getValue() {
             return this.value;
         }
     }
 
-    public static void processSignData(TileEntitySign sign)
-    {
+    public static void processSignData(TileEntitySign sign) {
         NetHandlerPlayClient nethandlerplayclient = Minecraft.getMinecraft().getNetHandler();
 
-        if (nethandlerplayclient != null)
-        {
+        if (nethandlerplayclient != null) {
             nethandlerplayclient.addToSendQueue(new C12PacketUpdateSign(sign.getPos(), sign.signText));
         }
         sign.setEditable(true);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/sign/SkyBlockEventHandler.java b/src/main/java/at/hannibal2/skyhanni/sign/SkyBlockEventHandler.java
index 6934e5820..f54043a8a 100644
--- a/src/main/java/at/hannibal2/skyhanni/sign/SkyBlockEventHandler.java
+++ b/src/main/java/at/hannibal2/skyhanni/sign/SkyBlockEventHandler.java
@@ -3,5 +3,6 @@ package at.hannibal2.skyhanni.sign;
 import at.hannibal2.skyhanni.utils.LorenzUtils;
 
 public class SkyBlockEventHandler {
+
     public static boolean isSkyBlock = LorenzUtils.INSTANCE.getInSkyblock();
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/sign/SkyBlockcatiaConfig.java b/src/main/java/at/hannibal2/skyhanni/sign/SkyBlockcatiaConfig.java
index 2bd80e8df..c72d7d98a 100644
--- a/src/main/java/at/hannibal2/skyhanni/sign/SkyBlockcatiaConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/sign/SkyBlockcatiaConfig.java
@@ -1,7 +1,7 @@
 package at.hannibal2.skyhanni.sign;
 
 public class SkyBlockcatiaConfig {
+
     public static boolean enableOverwriteSignEditing = true;
     public static boolean enableSignSelectionList = false;
 }
-
diff --git a/src/main/java/at/hannibal2/skyhanni/sign/TextInputUtil.java b/src/main/java/at/hannibal2/skyhanni/sign/TextInputUtil.java
index a66b31327..25867a57b 100644
--- a/src/main/java/at/hannibal2/skyhanni/sign/TextInputUtil.java
+++ b/src/main/java/at/hannibal2/skyhanni/sign/TextInputUtil.java
@@ -1,5 +1,7 @@
 package at.hannibal2.skyhanni.sign;
 
+import java.util.function.Consumer;
+import java.util.function.Supplier;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.util.ChatAllowedCharacters;
@@ -7,10 +9,8 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.MathHelper;
 import org.lwjgl.input.Keyboard;
 
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
 public class TextInputUtil {
+
     private final FontRenderer fontRenderer;
     private final Supplier<String> stringSupplier;
     private final Consumer<String> stringConsumer;
@@ -199,4 +199,4 @@ public class TextInputUtil {
         }
         return i;
     }
-}
\ No newline at end of file
+}