Refactored OrePrefixes.java

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>

1 files changed, 19 insertions, 13 deletions

diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index 05f5fbd28c..6c93651a2e 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -1,5 +1,6 @@
 package gregtech.api.enums;

 

+import com.google.common.base.Objects;

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.TC_Aspects.TC_AspectStack;

 import gregtech.api.interfaces.ICondition;

@@ -18,8 +19,6 @@ import java.util.*;
 

 import static gregtech.api.enums.GT_Values.*;

 

-import com.google.common.base.Objects;

-

 public enum OrePrefixes {

     @Deprecated pulp("Pulps", "", "", false, false, false, false, false, false, false, false, false, false, B[0] | B[1] | B[2] | B[3], -1, 64, -1),

     @Deprecated leaves("Leaves", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1),

@@ -354,14 +353,20 @@ public enum OrePrefixes {
         nugget.addFamiliarPrefix(ingot);

 

         for (OrePrefixes tPrefix1 : values())

-            if (tPrefix1.name().startsWith("ore")) for (OrePrefixes tPrefix2 : values())

-                if (tPrefix2.name().startsWith("ore")) tPrefix1.addFamiliarPrefix(tPrefix2);

+            if (tPrefix1.name().startsWith("ore"))

+                for (OrePrefixes tPrefix2 : values())

+                    if (tPrefix2.name().startsWith("ore"))

+                        tPrefix1.addFamiliarPrefix(tPrefix2);

         for (OrePrefixes tPrefix1 : values())

-            if (tPrefix1.name().startsWith("pipe")) for (OrePrefixes tPrefix2 : values())

-                if (tPrefix2.name().startsWith("pipe")) tPrefix1.addFamiliarPrefix(tPrefix2);

+            if (tPrefix1.name().startsWith("pipe"))

+                for (OrePrefixes tPrefix2 : values())

+                    if (tPrefix2.name().startsWith("pipe"))

+                        tPrefix1.addFamiliarPrefix(tPrefix2);

         for (OrePrefixes tPrefix1 : values())

-            if (tPrefix1.name().startsWith("wireGt")) for (OrePrefixes tPrefix2 : values())

-                if (tPrefix2.name().startsWith("wireGt")) tPrefix1.addFamiliarPrefix(tPrefix2);

+            if (tPrefix1.name().startsWith("wireGt"))

+                for (OrePrefixes tPrefix2 : values())

+                    if (tPrefix2.name().startsWith("wireGt"))

+                        tPrefix1.addFamiliarPrefix(tPrefix2);

         for (OrePrefixes tPrefix1 : values())

             if (tPrefix1.name().startsWith("cableGt")) for (OrePrefixes tPrefix2 : values())

                 if (tPrefix2.name().startsWith("cableGt")) tPrefix1.addFamiliarPrefix(tPrefix2);

@@ -569,7 +574,8 @@ public enum OrePrefixes {
      * Yes this Value can be changed to add Bits for the MetaGenerated-Item-Check.

      */

     public int mMaterialGenerationBits = 0;

-    private OrePrefixes(String aRegularLocalName, String aLocalizedMaterialPre, String aLocalizedMaterialPost, boolean aIsUnificatable, boolean aIsMaterialBased, boolean aIsSelfReferencing, boolean aIsContainer, boolean aDontUnificateActively, boolean aIsUsedForBlocks, boolean aAllowNormalRecycling, boolean aGenerateDefaultItem, boolean aIsEnchantable, boolean aIsUsedForOreProcessing, int aMaterialGenerationBits, long aMaterialAmount, int aDefaultStackSize, int aTextureindex) {

+

+    OrePrefixes(String aRegularLocalName, String aLocalizedMaterialPre, String aLocalizedMaterialPost, boolean aIsUnificatable, boolean aIsMaterialBased, boolean aIsSelfReferencing, boolean aIsContainer, boolean aDontUnificateActively, boolean aIsUsedForBlocks, boolean aAllowNormalRecycling, boolean aGenerateDefaultItem, boolean aIsEnchantable, boolean aIsUsedForOreProcessing, int aMaterialGenerationBits, long aMaterialAmount, int aDefaultStackSize, int aTextureindex) {

         mIsUnificatable = aIsUnificatable;

         mIsMaterialBased = aIsMaterialBased;

         mIsSelfReferencing = aIsSelfReferencing;

@@ -802,8 +808,8 @@ public enum OrePrefixes {
         }

     }

 

-    public void enableComponent(Materials aMaterial) {

-        if (this.mDisabledItems.contains(aMaterial)) this.mDisabledItems.remove(aMaterial);

+    public static boolean isInstanceOf(String aName, OrePrefixes aPrefix) {

+        return aName != null && aName.startsWith(aPrefix.toString());

     }

 

     public void disableComponent(Materials aMaterial) {

@@ -861,8 +867,8 @@ public enum OrePrefixes {
         return Materials.getRealMaterial(aOre.replaceFirst(aPrefix.toString(), ""));

     }

 

-    public static boolean isInstanceOf(String aName, OrePrefixes aPrefix) {

-        return aName == null ? false : aName.startsWith(aPrefix.toString());

+    public void enableComponent(Materials aMaterial) {

+        this.mDisabledItems.remove(aMaterial);

     }

 

     public boolean add(ItemStack aStack) {