Fix armor nto having armor values.

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsArmor.java

@@ -127,7 +127,7 @@ public static ArmorSet create(String name, Supplier<ArmorMaterial> armorMaterial
 					register(name + "_helmet", properties -> new GenerationsArmorItem(armorMaterial.get(), ArmorItem.Type.HELMET, properties)),
 					register(name + "_chestplate", properties -> new GenerationsArmorItem(armorMaterial.get(), ArmorItem.Type.CHESTPLATE, properties)),
 					register(name + "_leggings", properties -> new GenerationsArmorItem(armorMaterial.get(), ArmorItem.Type.LEGGINGS, properties)),
-					register(name + "_boots", properties -> new GenerationsArmorItem(armorMaterial.get(), ArmorItem.Type.BOOTS, properties).addArmorEffects(armorEffects)),
+					register(name + "_boots", properties -> new GenerationsArmorItem(armorMaterial.get(), ArmorItem.Type.BOOTS, properties, armorEffects)),
 					armorMaterial
 			);
 		}

common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/armor/GenerationsArmorItem.java

@@ -3,40 +3,38 @@
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
 import dev.architectury.extensions.ItemExtension;
+import net.minecraft.Util;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ArmorItem;
-import net.minecraft.world.item.ArmorMaterial;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.*;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 public class GenerationsArmorItem extends ArmorItem implements ItemExtension {
     public final Set<ArmorTickEffect> armorEffects = new HashSet<>();
     public final Set<CustomAttributeModifier> customAttributeModifiers = new HashSet<>();
 
-    public GenerationsArmorItem(ArmorMaterial armorMaterial, Type equipmentSlot, Properties properties) {
+    public GenerationsArmorItem(ArmorMaterial armorMaterial, Type equipmentSlot, Properties properties, ArmorEffect... armorEffects) {
         super(armorMaterial, equipmentSlot, properties);
-    }
 
-    public GenerationsArmorItem addArmorEffects(ArmorEffect... armorEffects) {
         for (ArmorEffect armorEffect : armorEffects) {
             if (armorEffect instanceof ArmorTickEffect effect) {
                 this.armorEffects.add(effect);
             } else if (armorEffect instanceof CustomAttributeModifier effect) {
                 this.customAttributeModifiers.add(effect);
             }
         }
-        return this;
     }
 
     //Method for Forge
@@ -46,6 +44,8 @@ public Multimap<Attribute, AttributeModifier> getAttributeModifiers(EquipmentSlo
             customAttributeModifier.getAttributeModifiers(builder, equipmentSlot, itemStack, this);
         }
 
+        builder.putAll(this.getDefaultAttributeModifiers(equipmentSlot));
+
         return builder.build();
     }
 

common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/armor/GenerationsArmorMaterials.java

@@ -4,12 +4,14 @@
 import com.google.common.base.Suppliers;
 import generations.gg.generations.core.generationscore.common.GenerationsCore;
 import generations.gg.generations.core.generationscore.common.world.item.GenerationsItems;
+import net.minecraft.Util;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.item.*;
 import net.minecraft.world.item.crafting.Ingredient;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.EnumMap;
 import java.util.function.Supplier;
 
 public enum GenerationsArmorMaterials implements ArmorMaterial {
@@ -39,7 +41,7 @@ public enum GenerationsArmorMaterials implements ArmorMaterial {
 
 	private final String name;
     private final int durabilityMultiplier;
-    private final int[] slotProtections;
+    private final EnumMap<ArmorItem.Type, Integer> slotProtections;
     private final int enchantmentValue;
     private final SoundEvent sound;
     private final float toughness;
@@ -49,7 +51,12 @@ public enum GenerationsArmorMaterials implements ArmorMaterial {
     GenerationsArmorMaterials(String name, int durabilityMultiplier, int[] slotProtections, int enchantmentValue, Supplier<Item> repairIngredient, float toughness, float knockbackResistance) {
         this.name = GenerationsCore.MOD_ID + ":" + name;
         this.durabilityMultiplier = durabilityMultiplier;
-        this.slotProtections = slotProtections;
+        this.slotProtections = Util.make(new EnumMap<ArmorItem.Type, Integer>(ArmorItem.Type.class), map -> {
+            map.put(ArmorItem.Type.BOOTS, slotProtections[0]);
+            map.put(ArmorItem.Type.LEGGINGS, slotProtections[1]);
+            map.put(ArmorItem.Type.CHESTPLATE, slotProtections[2]);
+            map.put(ArmorItem.Type.HELMET, slotProtections[3]);
+        });
         this.enchantmentValue = enchantmentValue;
         this.sound = SoundEvents.ARMOR_EQUIP_IRON;
         this.toughness = toughness;
@@ -68,7 +75,7 @@ public int getDurabilityForType(ArmorItem.@NotNull Type type) {
 
     @Override
     public int getDefenseForType(ArmorItem.Type type) {
-        return this.slotProtections[type.getSlot().getIndex()];
+        return this.slotProtections.get(type);
     }
 
     public int getEnchantmentValue() {