make arrays final

xGinko · Aug 6, 2024 · c4e2228 · c4e2228
1 parent f1d9d2b
commit c4e2228
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 32 deletions.
diff --git a/...src/main/java/me/xginko/aef/modules/illegals/items/enchantments/IncompatibleEnchants.java b/...src/main/java/me/xginko/aef/modules/illegals/items/enchantments/IncompatibleEnchants.java
@@ -38,22 +38,15 @@
 
 public class IncompatibleEnchants extends IllegalItemModule {
 
-    private static final Enchantment[] DAMAGE_ENCHANTS = {
-            SHARPNESS.getEnchant(),
-            SMITE.getEnchant(),
-            BANE_OF_ARTHROPODS.getEnchant()};
-
-    private static final Enchantment[] PROTECTION_ENCHANTS = {
-            PROTECTION.getEnchant(),
-            BLAST_PROTECTION.getEnchant(),
-            FIRE_PROTECTION.getEnchant(),
-            PROJECTILE_PROTECTION.getEnchant()};
-
     private final Set<Material> whitelistedTypes;
+    private final Enchantment[] damageEnchants, protectionEnchants;
     private final boolean useWhitelist, blacklistMode, checkStored;
 
     public IncompatibleEnchants() {
         super("illegals.enchantments.incompatible-enchants", AEFPermission.BYPASS_ILLEGAL_ENCHANT_INCOMPATIBLE);
+        this.damageEnchants = new Enchantment[]{SHARPNESS.getEnchant(), SMITE.getEnchant(), BANE_OF_ARTHROPODS.getEnchant()};
+        this.protectionEnchants = new Enchantment[]{PROTECTION.getEnchant(), BLAST_PROTECTION.getEnchant(),
+                FIRE_PROTECTION.getEnchant(), PROJECTILE_PROTECTION.getEnchant()};
         config.addComment(configPath + ".enable",
                 "Bypass permission: " + bypassPermission.string() + "\n" +
                         "Reverts or prevents usage of ItemStacks with Enchantments that\n" +
@@ -107,7 +100,7 @@ public ItemLegality legalityOf(ItemStack itemStack) {
                     return ItemLegality.ILLEGAL;
 
                 int dmgEnchCount = 0;
-                for (Enchantment damageEnchant : DAMAGE_ENCHANTS) {
+                for (Enchantment damageEnchant : damageEnchants) {
                     if (enchantments.contains(damageEnchant)) {
                         dmgEnchCount++;
                         if (dmgEnchCount > 1) {
@@ -117,7 +110,7 @@ public ItemLegality legalityOf(ItemStack itemStack) {
                 }
 
                 int protEnchCount = 0;
-                for (Enchantment protectEnchant : PROTECTION_ENCHANTS) {
+                for (Enchantment protectEnchant : protectionEnchants) {
                     if (enchantments.contains(protectEnchant)) {
                         protEnchCount++;
                         if (protEnchCount > 1) {
@@ -161,7 +154,7 @@ public void handleItem(ItemStack itemStack, ItemLegality legality) {
             itemStack.removeEnchantment(RIPTIDE.getEnchant());
 
         if (enchantments.contains(SHARPNESS.getEnchant())) { // Prefer keeping sharpness enchantment if present
-            for (Enchantment dmgEnchant : DAMAGE_ENCHANTS) {
+            for (Enchantment dmgEnchant : damageEnchants) {
                 if (dmgEnchant != SHARPNESS.getEnchant()) {
                     itemStack.removeEnchantment(dmgEnchant);
                 }
@@ -171,13 +164,13 @@ public void handleItem(ItemStack itemStack, ItemLegality legality) {
         }
 
         if (enchantments.contains(PROTECTION.getEnchant())) { // Prefer keeping protection enchantment if present
-            for (Enchantment protEnchant : PROTECTION_ENCHANTS) {
+            for (Enchantment protEnchant : protectionEnchants) {
                 if (protEnchant != PROTECTION.getEnchant()) {
                     itemStack.removeEnchantment(protEnchant);
                 }
             }
         } else if (enchantments.contains(BLAST_PROTECTION.getEnchant())) { // If protection isn't present, prefer blast protection
-            for (Enchantment protEnchant : PROTECTION_ENCHANTS) {
+            for (Enchantment protEnchant : protectionEnchants) {
                 if (protEnchant != BLAST_PROTECTION.getEnchant()) {
                     itemStack.removeEnchantment(protEnchant);
                 }

diff --git a/...src/main/java/me/xginko/aef/modules/illegals/items/enchantments/IncompatibleEnchants.java b/...src/main/java/me/xginko/aef/modules/illegals/items/enchantments/IncompatibleEnchants.java
@@ -38,22 +38,15 @@
 
 public class IncompatibleEnchants extends IllegalItemModule {
 
-    private static final Enchantment[] DAMAGE_ENCHANTS = {
-            SHARPNESS.getEnchant(),
-            SMITE.getEnchant(),
-            BANE_OF_ARTHROPODS.getEnchant()};
-
-    private static final Enchantment[] PROTECTION_ENCHANTS = {
-            PROTECTION.getEnchant(),
-            BLAST_PROTECTION.getEnchant(),
-            FIRE_PROTECTION.getEnchant(),
-            PROJECTILE_PROTECTION.getEnchant()};
-
     private final Set<Material> whitelistedTypes;
+    private final Enchantment[] damageEnchants, protectionEnchants;
     private final boolean useWhitelist, blacklistMode, checkStored;
 
     public IncompatibleEnchants() {
         super("illegals.enchantments.incompatible-enchants", AEFPermission.BYPASS_ILLEGAL_ENCHANT_INCOMPATIBLE);
+        this.damageEnchants = new Enchantment[]{SHARPNESS.getEnchant(), SMITE.getEnchant(), BANE_OF_ARTHROPODS.getEnchant()};
+        this.protectionEnchants = new Enchantment[]{PROTECTION.getEnchant(), BLAST_PROTECTION.getEnchant(),
+                FIRE_PROTECTION.getEnchant(), PROJECTILE_PROTECTION.getEnchant()};
         config.addComment(configPath + ".enable",
                 "Bypass permission: " + bypassPermission.string() + "\n" +
                 "Reverts or prevents usage of ItemStacks with Enchantments that\n" +
@@ -111,7 +104,7 @@ public ItemLegality legalityOf(ItemStack itemStack) {
                 }
 
                 int dmgEnchCount = 0;
-                for (Enchantment damageEnchant : DAMAGE_ENCHANTS) {
+                for (Enchantment damageEnchant : damageEnchants) {
                     if (enchantments.contains(damageEnchant)) {
                         dmgEnchCount++;
                         if (dmgEnchCount > 1) {
@@ -121,7 +114,7 @@ public ItemLegality legalityOf(ItemStack itemStack) {
                 }
 
                 int protEnchCount = 0;
-                for (Enchantment protectEnchant : PROTECTION_ENCHANTS) {
+                for (Enchantment protectEnchant : protectionEnchants) {
                     if (enchantments.contains(protectEnchant)) {
                         protEnchCount++;
                         if (protEnchCount > 1) {
@@ -170,7 +163,7 @@ public void handleItem(ItemStack itemStack, ItemLegality legality) {
         }
 
         if (enchantments.contains(SHARPNESS.getEnchant())) { // Prefer keeping sharpness enchantment if present
-            for (Enchantment dmgEnchant : DAMAGE_ENCHANTS) {
+            for (Enchantment dmgEnchant : damageEnchants) {
                 if (dmgEnchant != SHARPNESS.getEnchant()) {
                     itemStack.removeEnchantment(dmgEnchant);
                 }
@@ -180,13 +173,13 @@ public void handleItem(ItemStack itemStack, ItemLegality legality) {
         }
 
         if (enchantments.contains(PROTECTION.getEnchant())) { // Prefer keeping protection enchantment if present
-            for (Enchantment protEnchant : PROTECTION_ENCHANTS) {
+            for (Enchantment protEnchant : protectionEnchants) {
                 if (protEnchant != PROTECTION.getEnchant()) {
                     itemStack.removeEnchantment(protEnchant);
                 }
             }
         } else if (enchantments.contains(BLAST_PROTECTION.getEnchant())) { // If protection isn't present, prefer blast protection
-            for (Enchantment protEnchant : PROTECTION_ENCHANTS) {
+            for (Enchantment protEnchant : protectionEnchants) {
                 if (protEnchant != BLAST_PROTECTION.getEnchant()) {
                     itemStack.removeEnchantment(protEnchant);
                 }