From 7b9a9505b91a83a92f41505da69529cc2524b3e4 Mon Sep 17 00:00:00 2001
From: Andreas Troelsen <garbagemule@gmail.com>
Date: Sat, 7 Aug 2021 12:29:44 +0200
Subject: [PATCH] Reformat code in `things` package.

This is mostly just line breaks at the top and bottom of classes and
interfaces, but also marks some fields `final`.
---
 .../com/garbagemule/MobArena/things/BootsThing.java  |  2 ++
 .../garbagemule/MobArena/things/ChestplateThing.java |  2 ++
 .../garbagemule/MobArena/things/CommandThing.java    |  2 ++
 .../MobArena/things/CommandThingParser.java          | 12 ++++++++++--
 .../com/garbagemule/MobArena/things/Equippable.java  |  4 ++++
 .../garbagemule/MobArena/things/ExperienceThing.java |  2 ++
 .../com/garbagemule/MobArena/things/HelmetThing.java |  2 ++
 .../MobArena/things/InvalidThingInputString.java     |  4 +++-
 .../garbagemule/MobArena/things/ItemStackParser.java |  2 ++
 .../garbagemule/MobArena/things/ItemStackThing.java  |  4 +++-
 .../MobArena/things/ItemStackThingParser.java        |  4 +++-
 .../garbagemule/MobArena/things/LeggingsThing.java   |  2 ++
 .../com/garbagemule/MobArena/things/MoneyThing.java  |  6 ++++--
 .../MobArena/things/MoneyThingParser.java            |  4 +++-
 .../garbagemule/MobArena/things/OffHandThing.java    |  2 ++
 .../garbagemule/MobArena/things/PermissionThing.java |  2 ++
 .../MobArena/things/PermissionThingParser.java       |  4 +++-
 .../MobArena/things/PotionEffectThing.java           |  2 ++
 .../MobArena/things/PotionEffectThingParser.java     |  2 ++
 .../java/com/garbagemule/MobArena/things/Thing.java  |  2 ++
 .../garbagemule/MobArena/things/ThingManager.java    |  6 ++++--
 .../com/garbagemule/MobArena/things/ThingParser.java |  2 ++
 22 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/garbagemule/MobArena/things/BootsThing.java b/src/main/java/com/garbagemule/MobArena/things/BootsThing.java
index 5c555a7..cfc606d 100644
--- a/src/main/java/com/garbagemule/MobArena/things/BootsThing.java
+++ b/src/main/java/com/garbagemule/MobArena/things/BootsThing.java
@@ -4,6 +4,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 public class BootsThing extends ItemStackThing {
+
     public BootsThing(ItemStack stack) {
         super(stack);
     }
@@ -24,4 +25,5 @@ public class BootsThing extends ItemStackThing {
     public boolean heldBy(Player player) {
         return super.getItemStack().equals(player.getInventory().getBoots());
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/ChestplateThing.java b/src/main/java/com/garbagemule/MobArena/things/ChestplateThing.java
index ea2ef0e..9372d68 100644
--- a/src/main/java/com/garbagemule/MobArena/things/ChestplateThing.java
+++ b/src/main/java/com/garbagemule/MobArena/things/ChestplateThing.java
@@ -4,6 +4,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 public class ChestplateThing extends ItemStackThing {
+
     public ChestplateThing(ItemStack stack) {
         super(stack);
     }
@@ -24,4 +25,5 @@ public class ChestplateThing extends ItemStackThing {
     public boolean heldBy(Player player) {
         return super.getItemStack().equals(player.getInventory().getChestplate());
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/CommandThing.java b/src/main/java/com/garbagemule/MobArena/things/CommandThing.java
index f30e25c..3361e73 100644
--- a/src/main/java/com/garbagemule/MobArena/things/CommandThing.java
+++ b/src/main/java/com/garbagemule/MobArena/things/CommandThing.java
@@ -6,6 +6,7 @@ import org.bukkit.entity.Player;
 import java.util.Objects;
 
 public class CommandThing implements Thing {
+
     private final String command;
     private final String title;
 
@@ -65,4 +66,5 @@ public class CommandThing implements Thing {
         }
         return command;
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/CommandThingParser.java b/src/main/java/com/garbagemule/MobArena/things/CommandThingParser.java
index 7e8af61..948d0b4 100644
--- a/src/main/java/com/garbagemule/MobArena/things/CommandThingParser.java
+++ b/src/main/java/com/garbagemule/MobArena/things/CommandThingParser.java
@@ -1,6 +1,7 @@
 package com.garbagemule.MobArena.things;
 
 class CommandThingParser implements ThingParser {
+
     private static final String PREFIX_LONG = "command";
     private static final String PREFIX_SHORT = "cmd";
 
@@ -54,8 +55,14 @@ class CommandThingParser implements ThingParser {
         int stack = 1;
         for (int i = 1; i < trimmed.length() - 1; i++) {
             switch (trimmed.charAt(i)) {
-                case '(': stack++; break;
-                case ')': stack--; break;
+                case '(': {
+                    stack++;
+                    break;
+                }
+                case ')': {
+                    stack--;
+                    break;
+                }
             }
             if (stack == 0) {
                 return i;
@@ -63,4 +70,5 @@ class CommandThingParser implements ThingParser {
         }
         return -1;
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/Equippable.java b/src/main/java/com/garbagemule/MobArena/things/Equippable.java
index b25659b..ea5e445 100644
--- a/src/main/java/com/garbagemule/MobArena/things/Equippable.java
+++ b/src/main/java/com/garbagemule/MobArena/things/Equippable.java
@@ -3,9 +3,12 @@ package com.garbagemule.MobArena.things;
 import org.bukkit.inventory.ItemStack;
 
 class Equippable {
+
     @FunctionalInterface
     interface Wrapper {
+
         ItemStackThing wrap(ItemStack stack);
+
     }
 
     static Wrapper getWrapperByPrefix(String prefix) {
@@ -45,4 +48,5 @@ class Equippable {
         }
         return null;
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/ExperienceThing.java b/src/main/java/com/garbagemule/MobArena/things/ExperienceThing.java
index 5e7979d..9fc0cf6 100644
--- a/src/main/java/com/garbagemule/MobArena/things/ExperienceThing.java
+++ b/src/main/java/com/garbagemule/MobArena/things/ExperienceThing.java
@@ -3,6 +3,7 @@ package com.garbagemule.MobArena.things;
 import org.bukkit.entity.Player;
 
 public class ExperienceThing implements Thing {
+
     private final int experience;
 
     public ExperienceThing(int experience) {
@@ -44,4 +45,5 @@ public class ExperienceThing implements Thing {
     public boolean heldBy(Player player) {
         return player.getTotalExperience() > experience;
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/HelmetThing.java b/src/main/java/com/garbagemule/MobArena/things/HelmetThing.java
index 2a8628a..a44cb85 100644
--- a/src/main/java/com/garbagemule/MobArena/things/HelmetThing.java
+++ b/src/main/java/com/garbagemule/MobArena/things/HelmetThing.java
@@ -4,6 +4,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 public class HelmetThing extends ItemStackThing {
+
     public HelmetThing(ItemStack stack) {
         super(stack);
     }
@@ -24,4 +25,5 @@ public class HelmetThing extends ItemStackThing {
     public boolean heldBy(Player player) {
         return super.getItemStack().equals(player.getInventory().getHelmet());
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/InvalidThingInputString.java b/src/main/java/com/garbagemule/MobArena/things/InvalidThingInputString.java
index d0d83f2..2462033 100644
--- a/src/main/java/com/garbagemule/MobArena/things/InvalidThingInputString.java
+++ b/src/main/java/com/garbagemule/MobArena/things/InvalidThingInputString.java
@@ -1,7 +1,8 @@
 package com.garbagemule.MobArena.things;
 
 public class InvalidThingInputString extends RuntimeException {
-    private String input;
+
+    private final String input;
 
     InvalidThingInputString(String input) {
         super("Invalid input: " + input);
@@ -11,4 +12,5 @@ public class InvalidThingInputString extends RuntimeException {
     public String getInput() {
         return input;
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/ItemStackParser.java b/src/main/java/com/garbagemule/MobArena/things/ItemStackParser.java
index 3bcf22a..46f3b22 100644
--- a/src/main/java/com/garbagemule/MobArena/things/ItemStackParser.java
+++ b/src/main/java/com/garbagemule/MobArena/things/ItemStackParser.java
@@ -8,6 +8,7 @@ import org.bukkit.inventory.ItemStack;
  */
 @FunctionalInterface
 public interface ItemStackParser {
+
     /**
      * Parse the given string, returning an {@link ItemStack} instance on
      * success, otherwise null.
@@ -16,4 +17,5 @@ public interface ItemStackParser {
      * @return an instance of {@link ItemStack}, or null
      */
     ItemStack parse(String s);
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/ItemStackThing.java b/src/main/java/com/garbagemule/MobArena/things/ItemStackThing.java
index 5c34739..579bce9 100644
--- a/src/main/java/com/garbagemule/MobArena/things/ItemStackThing.java
+++ b/src/main/java/com/garbagemule/MobArena/things/ItemStackThing.java
@@ -5,7 +5,8 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
 public class ItemStackThing implements Thing {
-    private ItemStack stack;
+
+    private final ItemStack stack;
 
     public ItemStackThing(ItemStack stack) {
         this.stack = stack;
@@ -50,4 +51,5 @@ public class ItemStackThing implements Thing {
             .replace("_", " ")
             .toLowerCase();
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/ItemStackThingParser.java b/src/main/java/com/garbagemule/MobArena/things/ItemStackThingParser.java
index f63a85e..358007c 100644
--- a/src/main/java/com/garbagemule/MobArena/things/ItemStackThingParser.java
+++ b/src/main/java/com/garbagemule/MobArena/things/ItemStackThingParser.java
@@ -9,7 +9,8 @@ import java.util.List;
 import java.util.Objects;
 
 class ItemStackThingParser implements ThingParser {
-    private List<ItemStackParser> parsers;
+
+    private final List<ItemStackParser> parsers;
 
     ItemStackThingParser() {
         this.parsers = new ArrayList<>();
@@ -75,4 +76,5 @@ class ItemStackThingParser implements ThingParser {
             .findFirst()
             .orElseGet(() -> ItemParser.parseItem(s, false));
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/LeggingsThing.java b/src/main/java/com/garbagemule/MobArena/things/LeggingsThing.java
index 50e5b8b..3a0334b 100644
--- a/src/main/java/com/garbagemule/MobArena/things/LeggingsThing.java
+++ b/src/main/java/com/garbagemule/MobArena/things/LeggingsThing.java
@@ -4,6 +4,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 public class LeggingsThing extends ItemStackThing {
+
     public LeggingsThing(ItemStack stack) {
         super(stack);
     }
@@ -24,4 +25,5 @@ public class LeggingsThing extends ItemStackThing {
     public boolean heldBy(Player player) {
         return super.getItemStack().equals(player.getInventory().getLeggings());
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/MoneyThing.java b/src/main/java/com/garbagemule/MobArena/things/MoneyThing.java
index 13c2b51..959ebdc 100644
--- a/src/main/java/com/garbagemule/MobArena/things/MoneyThing.java
+++ b/src/main/java/com/garbagemule/MobArena/things/MoneyThing.java
@@ -6,8 +6,9 @@ import net.milkbowl.vault.economy.EconomyResponse.ResponseType;
 import org.bukkit.entity.Player;
 
 public class MoneyThing implements Thing {
-    private Economy economy;
-    private double amount;
+
+    private final Economy economy;
+    private final double amount;
 
     public MoneyThing(Economy economy, double amount) {
         this.economy = economy;
@@ -47,4 +48,5 @@ public class MoneyThing implements Thing {
         }
         return economy.format(amount);
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/MoneyThingParser.java b/src/main/java/com/garbagemule/MobArena/things/MoneyThingParser.java
index d0e8f00..2f3a0b8 100644
--- a/src/main/java/com/garbagemule/MobArena/things/MoneyThingParser.java
+++ b/src/main/java/com/garbagemule/MobArena/things/MoneyThingParser.java
@@ -4,10 +4,11 @@ import com.garbagemule.MobArena.MobArena;
 import net.milkbowl.vault.economy.Economy;
 
 class MoneyThingParser implements ThingParser {
+
     private static final String PREFIX_LONG = "money:";
     private static final String PREFIX_SHORT = "$";
 
-    private MobArena plugin;
+    private final MobArena plugin;
 
     MoneyThingParser(MobArena plugin) {
         this.plugin = plugin;
@@ -35,4 +36,5 @@ class MoneyThingParser implements ThingParser {
         }
         return null;
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/OffHandThing.java b/src/main/java/com/garbagemule/MobArena/things/OffHandThing.java
index 9a4f2b8..4bad0d0 100644
--- a/src/main/java/com/garbagemule/MobArena/things/OffHandThing.java
+++ b/src/main/java/com/garbagemule/MobArena/things/OffHandThing.java
@@ -4,6 +4,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 public class OffHandThing extends ItemStackThing {
+
     public OffHandThing(ItemStack stack) {
         super(stack);
     }
@@ -24,4 +25,5 @@ public class OffHandThing extends ItemStackThing {
     public boolean heldBy(Player player) {
         return super.getItemStack().equals(player.getInventory().getItemInOffHand());
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/PermissionThing.java b/src/main/java/com/garbagemule/MobArena/things/PermissionThing.java
index 3f04ed4..74f3ebf 100644
--- a/src/main/java/com/garbagemule/MobArena/things/PermissionThing.java
+++ b/src/main/java/com/garbagemule/MobArena/things/PermissionThing.java
@@ -6,6 +6,7 @@ import org.bukkit.permissions.PermissionAttachment;
 import org.bukkit.permissions.PermissionAttachmentInfo;
 
 public class PermissionThing implements Thing {
+
     private final String perm;
     private final boolean value;
     private final MobArena plugin;
@@ -60,4 +61,5 @@ public class PermissionThing implements Thing {
         }
         return "-" + perm;
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/PermissionThingParser.java b/src/main/java/com/garbagemule/MobArena/things/PermissionThingParser.java
index d1435c1..72dcf36 100644
--- a/src/main/java/com/garbagemule/MobArena/things/PermissionThingParser.java
+++ b/src/main/java/com/garbagemule/MobArena/things/PermissionThingParser.java
@@ -3,9 +3,10 @@ package com.garbagemule.MobArena.things;
 import com.garbagemule.MobArena.MobArena;
 
 class PermissionThingParser implements ThingParser {
+
     private static final String PREFIX = "perm:";
 
-    private MobArena plugin;
+    private final MobArena plugin;
 
     PermissionThingParser(MobArena plugin) {
         this.plugin = plugin;
@@ -30,4 +31,5 @@ class PermissionThingParser implements ThingParser {
         }
         return null;
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/PotionEffectThing.java b/src/main/java/com/garbagemule/MobArena/things/PotionEffectThing.java
index 23ea968..aa3d317 100644
--- a/src/main/java/com/garbagemule/MobArena/things/PotionEffectThing.java
+++ b/src/main/java/com/garbagemule/MobArena/things/PotionEffectThing.java
@@ -4,6 +4,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffect;
 
 class PotionEffectThing implements Thing {
+
     private final PotionEffect effect;
 
     PotionEffectThing(PotionEffect effect) {
@@ -25,4 +26,5 @@ class PotionEffectThing implements Thing {
     public boolean heldBy(Player player) {
         return player.hasPotionEffect(effect.getType());
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/PotionEffectThingParser.java b/src/main/java/com/garbagemule/MobArena/things/PotionEffectThingParser.java
index 2d77396..7ff679b 100644
--- a/src/main/java/com/garbagemule/MobArena/things/PotionEffectThingParser.java
+++ b/src/main/java/com/garbagemule/MobArena/things/PotionEffectThingParser.java
@@ -4,6 +4,7 @@ import com.garbagemule.MobArena.util.PotionEffectParser;
 import org.bukkit.potion.PotionEffect;
 
 class PotionEffectThingParser implements ThingParser {
+
     private static final String PREFIX = "effect:";
 
     @Override
@@ -25,4 +26,5 @@ class PotionEffectThingParser implements ThingParser {
         }
         return null;
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/Thing.java b/src/main/java/com/garbagemule/MobArena/things/Thing.java
index 3b73bb7..d7d0892 100644
--- a/src/main/java/com/garbagemule/MobArena/things/Thing.java
+++ b/src/main/java/com/garbagemule/MobArena/things/Thing.java
@@ -14,6 +14,7 @@ import org.bukkit.entity.Player;
  * thing (which is the same as failing).
  */
 public interface Thing {
+
     /**
      * Give this thing to the given player.
      *
@@ -37,4 +38,5 @@ public interface Thing {
      * @return true, if the player has this thing, false otherwise
      */
     boolean heldBy(Player player);
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/ThingManager.java b/src/main/java/com/garbagemule/MobArena/things/ThingManager.java
index f236833..994fdee 100644
--- a/src/main/java/com/garbagemule/MobArena/things/ThingManager.java
+++ b/src/main/java/com/garbagemule/MobArena/things/ThingManager.java
@@ -6,8 +6,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ThingManager implements ThingParser {
-    private List<ThingParser> parsers;
-    private ItemStackThingParser items;
+
+    private final List<ThingParser> parsers;
+    private final ItemStackThingParser items;
 
     public ThingManager(MobArena plugin, ItemStackThingParser parser) {
         parsers = new ArrayList<>();
@@ -88,4 +89,5 @@ public class ThingManager implements ThingParser {
         }
         return items.parse(s);
     }
+
 }
diff --git a/src/main/java/com/garbagemule/MobArena/things/ThingParser.java b/src/main/java/com/garbagemule/MobArena/things/ThingParser.java
index 6c20da1..7ec7545 100644
--- a/src/main/java/com/garbagemule/MobArena/things/ThingParser.java
+++ b/src/main/java/com/garbagemule/MobArena/things/ThingParser.java
@@ -5,6 +5,7 @@ package com.garbagemule.MobArena.things;
  * {@link Thing} or null.
  */
 public interface ThingParser {
+
     /**
      * Parse the given string, returning a {@link Thing} instance on success,
      * otherwise null.
@@ -13,4 +14,5 @@ public interface ThingParser {
      * @return an instance of {@link Thing}, or null
      */
     Thing parse(String s);
+
 }