From 066e2249610bc484cc06f9ded404b752207738b6 Mon Sep 17 00:00:00 2001
From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Date: Mon, 16 Mar 2020 21:38:16 +0100
Subject: Refactored SubTag.java

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
---
 src/main/java/gregtech/api/enums/SubTag.java | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'src/main/java/gregtech/api/enums')

diff --git a/src/main/java/gregtech/api/enums/SubTag.java b/src/main/java/gregtech/api/enums/SubTag.java
index ccf50894dd..b586728949 100644
--- a/src/main/java/gregtech/api/enums/SubTag.java
+++ b/src/main/java/gregtech/api/enums/SubTag.java
@@ -21,7 +21,7 @@ import java.util.HashSet;
  * Some SubTags are used for other things than Materials too. It is useful when I need an easy way to declare Stuff in Items.
  */
 public final class SubTag implements ICondition<ISubTagContainer> {
-    public static final HashMap<String, SubTag> sSubTags = new HashMap<String, SubTag>();
+    public static final HashMap<String, SubTag> sSubTags = new HashMap<>();
     private static long sSubtagID = 0;
     public final long mSubtagID;
     public final String mName;
@@ -239,7 +239,7 @@ public final class SubTag implements ICondition<ISubTagContainer> {
      * Projectile Tag for Arrows
      */
     public static final SubTag PROJECTILE_ARROW = getNewSubTag("PROJECTILE_ARROW");
-    public final Collection<ISubTagContainer> mRelevantTaggedItems = new HashSet<ISubTagContainer>(1);
+    public final Collection<ISubTagContainer> mRelevantTaggedItems = new HashSet<>(1);
 
     private SubTag(String aName) {
         mSubtagID = sSubtagID++;
@@ -248,7 +248,9 @@ public final class SubTag implements ICondition<ISubTagContainer> {
     }
 
     public static SubTag getNewSubTag(String aName) {
-        for (SubTag tSubTag : sSubTags.values()) if (tSubTag.mName.equals(aName)) return tSubTag;
+        for (SubTag tSubTag : sSubTags.values())
+            if (tSubTag.mName.equals(aName))
+                return tSubTag;
         return new SubTag(aName);
     }
 
@@ -258,14 +260,18 @@ public final class SubTag implements ICondition<ISubTagContainer> {
     }
 
     public SubTag addContainerToList(ISubTagContainer... aContainers) {
-        if (aContainers != null) for (ISubTagContainer aContainer : aContainers)
-            if (aContainer != null && !mRelevantTaggedItems.contains(aContainer)) mRelevantTaggedItems.add(aContainer);
+        if (aContainers != null)
+            for (ISubTagContainer aContainer : aContainers)
+                if (aContainer != null && !mRelevantTaggedItems.contains(aContainer))
+                    mRelevantTaggedItems.add(aContainer);
         return this;
     }
 
     public SubTag addTo(ISubTagContainer... aContainers) {
         if (aContainers != null)
-            for (ISubTagContainer aContainer : aContainers) if (aContainer != null) aContainer.add(this);
+            for (ISubTagContainer aContainer : aContainers)
+                if (aContainer != null)
+                    aContainer.add(this);
         return this;
     }
 
-- 
cgit