ArmorMaterial code cleanup, and new register method in ArmorSet

Signed-off-by: Noaaan <[email protected]>

Author: Noaaan

src/main/java/nourl/mythicmetals/armor/ArmorSet.java

@@ -6,6 +6,7 @@
 import net.minecraft.item.ArmorMaterial;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 import nourl.mythicmetals.MythicMetals;
 import nourl.mythicmetals.utils.RegistryHelper;
@@ -48,6 +49,13 @@ public void register(String name) {
         Registry.register(Registry.ITEM, RegistryHelper.id(name + "_boots"), boots);
     }
 
+    public void register(String modid, String name) {
+        Registry.register(Registry.ITEM, new Identifier(modid, name + "_helmet"), helmet);
+        Registry.register(Registry.ITEM, new Identifier(modid, name + "_chestplate"), chestplate);
+        Registry.register(Registry.ITEM, new Identifier(modid, name + "_leggings"), leggings);
+        Registry.register(Registry.ITEM, new Identifier(modid, name + "_boots"), boots);
+    }
+
     protected ArmorItem makeItem(ArmorMaterial material, EquipmentSlot slot, Item.Settings settings) {
         return new ArmorItem(material, slot, settings);
     }

src/main/java/nourl/mythicmetals/armor/MythicArmorMaterials.java

@@ -14,7 +14,7 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-@SuppressWarnings("ALL")
+@SuppressWarnings("CodeBlock2Expr")
 public enum MythicArmorMaterials implements ArmorMaterial {
     ADAMANTITE("adamantite", 30, new int[]{3, 6, 8, 3}, 16, SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE, 2.0F, 0.0F, () -> {
         return Ingredient.ofItems(MythicItems.Ingots.ADAMANTITE_INGOT);
@@ -97,7 +97,7 @@ public enum MythicArmorMaterials implements ArmorMaterial {
     private final float knockbackResistance;
     private final Supplier<Ingredient> repairIngredientSupplier;
 
-    private MythicArmorMaterials(String name, int durabilityMultiplier, int[] protectionAmounts, int enchantability, SoundEvent equipSound, float toughness, float knockbackResistance, Supplier<Ingredient> repairIngredientSupplier) {
+    MythicArmorMaterials(String name, int durabilityMultiplier, int[] protectionAmounts, int enchantability, SoundEvent equipSound, float toughness, float knockbackResistance, Supplier<Ingredient> repairIngredientSupplier) {
         this.name = name;
         this.durabilityMultiplier = durabilityMultiplier;
         this.protectionAmounts = protectionAmounts;
@@ -125,7 +125,7 @@ public SoundEvent getEquipSound() {
     }
 
     public Ingredient getRepairIngredient() {
-        return (Ingredient) this.repairIngredientSupplier.get();
+        return this.repairIngredientSupplier.get();
     }
 
     public String getName() {
@@ -140,8 +140,7 @@ public float getKnockbackResistance() {
         return this.knockbackResistance;
     }
 
-    public static final List KNOCKBACKABLE_ARMOR_MATERIALS = Arrays.asList(new ArmorMaterial[]{
-            ORICHALCUM, OSMIUM, METALLURGIUM
-    });
+    @SuppressWarnings("rawtypes")
+    public static final List KNOCKBACKABLE_ARMOR_MATERIALS = Arrays.asList(ORICHALCUM, OSMIUM, METALLURGIUM);
 
 }