Fixed evo boots not giving 50% speed boost. Also tossed a few values on other boots.

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/compat/jei/IRksCategoryExtension.java

@@ -55,6 +55,7 @@ default int getHeight(RecipeHolder<T> recipeHolder) {
             forRemoval = true
     )
     default void setRecipe(IRecipeLayoutBuilder builder, ICraftingGridHelper craftingGridHelper, IFocusGroup focuses) {
+
     }
 
     /** @deprecated */

common/src/main/java/generations/gg/generations/core/generationscore/common/compat/jei/RksRecipeExtension.kt

@@ -24,8 +24,11 @@ class RksRecipeExtension<T : RksRecipe> : IRksCategoryExtension<T> {
 
         val width = getWidth(recipeHolder)
         val height = getHeight(recipeHolder)
-        craftingGridHelper.createAndSetOutputs(builder, List.of(resultItem))
-        craftingGridHelper.createAndSetIngredients(builder, recipe.ingredients, width, height)
+        craftingGridHelper.createAndSetOutputs(builder, listOf(resultItem))
+
+        val inputs = recipe.getRksIngredients().map { it.matchingStacks() }.toList()
+
+        craftingGridHelper.createAndSetInputs(builder, inputs, width, height)
     }
 
     override fun getWidth(recipeHolder: RecipeHolder<T>): Int {

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

@@ -1,6 +1,7 @@
 package generations.gg.generations.core.generationscore.common.world.item
 
 import generations.gg.generations.core.generationscore.common.GenerationsCore
+import generations.gg.generations.core.generationscore.common.generationsResource
 import generations.gg.generations.core.generationscore.common.tab
 import generations.gg.generations.core.generationscore.common.util.ItemPlatformRegistry
 import generations.gg.generations.core.generationscore.common.world.item.armor.ArmorEffect
@@ -11,8 +12,13 @@ import generations.gg.generations.core.generationscore.common.world.item.armor.e
 import generations.gg.generations.core.generationscore.common.world.item.armor.effects.SpeedModifier
 import net.minecraft.core.Holder
 import net.minecraft.resources.ResourceKey
+import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.effect.MobEffect
 import net.minecraft.world.effect.MobEffects
+import net.minecraft.world.entity.EquipmentSlotGroup
+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.item.*
 import net.minecraft.world.item.enchantment.Enchantment
 import net.minecraft.world.item.enchantment.Enchantments
@@ -29,71 +35,71 @@ object GenerationsArmor: ItemPlatformRegistry() {
     ): Holder<Item> = create(name, { function.invoke(of()).tab(tab) })
 
     val AETHER: ArmorSet = ArmorSet.create("aether", GenerationsArmorMaterials.AETHER) {
-        speed(0.5)
+        speedAttribute(EquipmentSlotGroup.FEET, 0.5)
     }
 
     val AQUA: ArmorSet = ArmorSet.create("aqua", GenerationsArmorMaterials.AQUA)
     val FLARE: ArmorSet = ArmorSet.create("flare", GenerationsArmorMaterials.FLARE)
     val GALACTIC: ArmorSet = ArmorSet.create("galactic", GenerationsArmorMaterials.GALACTIC) {
-        speed(0.5)
+        speedAttribute(EquipmentSlotGroup.FEET, 0.5)
     }
     val ULTRITE: ArmorSet = ArmorSet.create("ultrite", GenerationsArmorMaterials.ULTRITE)
     val MAGMA: ArmorSet = ArmorSet.create("magma", GenerationsArmorMaterials.MAGMA)
     val NEO_PLASMA: ArmorSet = ArmorSet.create("neo_plasma", GenerationsArmorMaterials.NEO_PLASMA)
     val PLASMA: ArmorSet = ArmorSet.create("plasma", GenerationsArmorMaterials.PLASMA)
     val ROCKET: ArmorSet = ArmorSet.create("rocket", GenerationsArmorMaterials.ROCKET)
     val SKULL: ArmorSet = ArmorSet.create("skull", GenerationsArmorMaterials.SKULL) {
-        speed(0.5)
+        speedAttribute(EquipmentSlotGroup.FEET, 0.5)
     }
     val ULTRA: ArmorSet = ArmorSet.create("ultra", GenerationsArmorMaterials.ULTRA) {
         potion(MobEffects.MOVEMENT_SPEED, 1)
-        speed(0.25)
+        speedAttribute(EquipmentSlotGroup.FEET, 0.25)
     }
     val CRYSTALLIZED: ArmorSet = ArmorSet.create("crystallized", GenerationsArmorMaterials.CRYSTAL) {
         potion(MobEffects.MOVEMENT_SPEED, 1)
-        speed(0.1)
+        speedAttribute(EquipmentSlotGroup.FEET, 0.1)
     }
     val DAWN_STONE: ArmorSet = ArmorSet.create("dawn_stone", GenerationsArmorMaterials.DAWN_STONE) {
         potion(MobEffects.JUMP, 3)
-        speed(0.5)
+        speedAttribute(EquipmentSlotGroup.FEET, 0.5)
     }
     val DUSK_STONE: ArmorSet = ArmorSet.create("dusk_stone", GenerationsArmorMaterials.DUSK_STONE) {
         potion(MobEffects.SATURATION, 4)
-        speed(0.5)
+        speedAttribute(EquipmentSlotGroup.FEET, 0.5)
     }
     val FIRE_STONE: ArmorSet = ArmorSet.create("fire_stone", GenerationsArmorMaterials.FIRE_STONE) {
         enchantment(Enchantments.FIRE_PROTECTION, 2)
         potion(MobEffects.FIRE_RESISTANCE, 1)
-        speed(0.5)
+        speedAttribute(EquipmentSlotGroup.FEET, 0.5)
     }
 
     val LEAF_STONE: ArmorSet = ArmorSet.create("leaf_stone", GenerationsArmorMaterials.LEAF_STONE) {
         enchantment(Enchantments.FEATHER_FALLING, 3)
         enchantment(Enchantments.THORNS, 3)
-        speed(0.5)
+        speedAttribute(EquipmentSlotGroup.FEET, 0.5)
     }
     val ICE_STONE: ArmorSet = ArmorSet.create("ice_stone", GenerationsArmorMaterials.ICE_STONE) {
         enchantment(Enchantments.FROST_WALKER, 2)
-        speed(0.5)
+        speedAttribute(EquipmentSlotGroup.FEET, 0.5)
     }
     val MOON_STONE: ArmorSet = ArmorSet.create("moon_stone", GenerationsArmorMaterials.MOON_STONE) {
         enchantment(Enchantments.PROTECTION, 4)
         enchantment(Enchantments.PROJECTILE_PROTECTION, 4)
-        speed(0.5)
+        speedAttribute(EquipmentSlotGroup.FEET, 0.5)
     }
     val SUN_STONE: ArmorSet = ArmorSet.create("sun_stone", GenerationsArmorMaterials.SUN_STONE) {
         enchantment(Enchantments.PROTECTION, 4)
         enchantment(Enchantments.PROJECTILE_PROTECTION, 4)
-        speed(0.5)
+        speedAttribute(EquipmentSlotGroup.FEET, 0.5)
     }
     val THUNDER_STONE: ArmorSet = ArmorSet.create("thunder_stone", GenerationsArmorMaterials.THUNDER_STONE) {
         potion(MobEffects.DIG_SPEED, 1)
-        speed(0.5)
+        speedAttribute(EquipmentSlotGroup.FEET, 0.5)
     }
     val WATER_STONE: ArmorSet = ArmorSet.create("water_stone", GenerationsArmorMaterials.WATER_STONE) {
         potion(MobEffects.WATER_BREATHING, 1)
         enchantment(Enchantments.AQUA_AFFINITY, 2)
-        speed(0.5)
+        speedAttribute(EquipmentSlotGroup.FEET, 0.5)
     }
 
     fun of(): Item.Properties {
@@ -124,6 +130,7 @@ object GenerationsArmor: ItemPlatformRegistry() {
 
         class Builder(private val name: String, private val armormaterial: Holder<ArmorMaterial>) {
             private val effects: MutableList<ArmorEffect> = ArrayList()
+            private val data: MutableMap<EquipmentSlotGroup, MutableList<Pair<Holder<Attribute>, AttributeModifier>>> = mutableMapOf()
 
             fun enchantment(enchantment: ResourceKey<Enchantment>, level: Int): Builder {
                 effects.add(EnchantmentArmorEffect(enchantment, level))
@@ -140,8 +147,17 @@ object GenerationsArmor: ItemPlatformRegistry() {
                 return this
             }
 
+            fun attributeModifier(slot: EquipmentSlotGroup, holder: Holder<Attribute>, id: ResourceLocation, amount: Double, operation: AttributeModifier.Operation): Builder {
+                data.computeIfAbsent(slot) { mutableListOf() } += holder to AttributeModifier(id, amount, operation)
+                return this
+            }
+
             fun build(): ArmorSet {
-                return create(name, armormaterial, *effects.toTypedArray())
+                return create(name, armormaterial, data, *effects.toTypedArray())
+            }
+
+            fun speedAttribute(slot: EquipmentSlotGroup, amount: Double) {
+                attributeModifier(slot, Attributes.MOVEMENT_SPEED, "50_speed".generationsResource(), amount, AttributeModifier.Operation.ADD_MULTIPLIED_BASE)
             }
         }
 
@@ -158,47 +174,62 @@ object GenerationsArmor: ItemPlatformRegistry() {
                 return Builder(name, armorMaterial)
             }
 
+
+
             fun create(
                 name: String,
                 armorMaterial: Holder<ArmorMaterial>,
+                attributeModifiers: Map<EquipmentSlotGroup, List<Pair<Holder<Attribute>, AttributeModifier>>> = mutableMapOf(),
                 vararg armorEffects: ArmorEffect
             ): ArmorSet {
-
                 return ArmorSet(
                     register(
                         name + "_helmet"
                     ) { properties: Item.Properties ->
+                        val list = attributeModifiers.getOrDefault(EquipmentSlotGroup.HEAD, listOf())
+
                         GenerationsArmorItem(
                             armorMaterial,
                             ArmorItem.Type.HELMET,
-                            properties
+
+                            properties,
+                            list
                         )
                     },
                     register(
                         name + "_chestplate"
                     ) { properties: Item.Properties ->
+                        val list = attributeModifiers.getOrDefault(EquipmentSlotGroup.CHEST, listOf())
+
                         GenerationsArmorItem(
                             armorMaterial,
                             ArmorItem.Type.CHESTPLATE,
-                            properties
+                            properties,
+                            list
                         )
                     },
                     register(
                         name + "_leggings"
                     ) { properties: Item.Properties ->
+                        val list = attributeModifiers.getOrDefault(EquipmentSlotGroup.LEGS, listOf())
+
                         GenerationsArmorItem(
                             armorMaterial,
                             ArmorItem.Type.LEGGINGS,
-                            properties
+                            properties,
+                            list
                         )
                     },
                     register(
                         name + "_boots"
                     ) { properties: Item.Properties ->
+                        val list = attributeModifiers.getOrDefault(EquipmentSlotGroup.FEET, listOf())
+
                         GenerationsArmorItem(
                             armorMaterial,
                             ArmorItem.Type.BOOTS,
                             properties,
+                            list,
                             *armorEffects
                         )
                     },

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

@@ -1,26 +1,68 @@
 package generations.gg.generations.core.generationscore.common.world.item.armor
 
+import com.google.common.base.Supplier
+import com.google.common.base.Suppliers
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.instanceOrNull
 import net.minecraft.core.Holder
+import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.Entity
+import net.minecraft.world.entity.EquipmentSlotGroup
 import net.minecraft.world.entity.LivingEntity
+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.item.ArmorItem
 import net.minecraft.world.item.ArmorMaterial
 import net.minecraft.world.item.ItemStack
+import net.minecraft.world.item.component.ItemAttributeModifiers
 import net.minecraft.world.level.Level
 import java.util.function.Consumer
 
 class GenerationsArmorItem(
     armorMaterial: Holder<ArmorMaterial>,
     equipmentSlot: Type,
     properties: Properties,
-    vararg armorEffects: ArmorEffect?
+    additionalModfier: List<Pair<Holder<Attribute>, AttributeModifier>>,
+    vararg armorEffects: ArmorEffect?,
 ) :
     ArmorItem(armorMaterial, equipmentSlot, properties) {
+    private var attributeModifiers: Supplier<ItemAttributeModifiers> = Suppliers.memoize<ItemAttributeModifiers>(Supplier {
+        val i = (material.value() as ArmorMaterial).getDefense(type)
+        val f = (material.value() as ArmorMaterial).toughness()
+        val builder = ItemAttributeModifiers.builder()
+        val equipmentSlotGroup = EquipmentSlotGroup.bySlot(type.getSlot())
+        val resourceLocation = ResourceLocation.withDefaultNamespace("armor." + type.getName())
+        builder.add(
+            Attributes.ARMOR,
+            AttributeModifier(resourceLocation, i.toDouble(), AttributeModifier.Operation.ADD_VALUE),
+            equipmentSlotGroup
+        )
+        builder.add(
+            Attributes.ARMOR_TOUGHNESS,
+            AttributeModifier(resourceLocation, f.toDouble(), AttributeModifier.Operation.ADD_VALUE),
+            equipmentSlotGroup
+        )
+        val g = (material.value() as ArmorMaterial).knockbackResistance()
+        if (g > 0.0f) {
+            builder.add(
+                Attributes.KNOCKBACK_RESISTANCE,
+                AttributeModifier(resourceLocation, g.toDouble(), AttributeModifier.Operation.ADD_VALUE),
+                equipmentSlotGroup
+            )
+        }
+
+        additionalModfier.forEach {
+
+            builder.add(it.first, it.second, EquipmentSlotGroup.bySlot(type.slot))}
+
+        builder.build()
+    })
+
     val armorEffects: MutableSet<ArmorTickEffect> = HashSet()
     val customAttributeModifiers: MutableSet<CustomAttributeModifier> = HashSet()
 
     init {
+
         for (armorEffect in armorEffects) {
             if (armorEffect is ArmorTickEffect) {
                 this.armorEffects.add(armorEffect)
@@ -70,4 +112,8 @@ class GenerationsArmorItem(
             )
         })
     }
+
+    override fun getDefaultAttributeModifiers(): ItemAttributeModifiers? {
+        return attributeModifiers.get();
+    }
 }