Add missing reach extending modifiers

opekope2 · Jun 10, 2024 · d8af4f0 · d8af4f0
1 parent b4cbe63
commit d8af4f0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 0 deletions.
diff --git a/StaffMod/src/main/kotlin/opekope2/avm_staff/internal/staff_handler/BellBlockHandler.kt b/StaffMod/src/main/kotlin/opekope2/avm_staff/internal/staff_handler/BellBlockHandler.kt
@@ -40,6 +40,7 @@ import net.minecraft.util.TypedActionResult
 import net.minecraft.world.World
 import opekope2.avm_staff.api.item.renderer.IStaffItemRenderer
 import opekope2.avm_staff.api.staff.StaffHandler
+import opekope2.avm_staff.util.addDefault
 import opekope2.avm_staff.util.attackDamage
 import opekope2.avm_staff.util.attackSpeed
 import opekope2.avm_staff.util.push
@@ -113,6 +114,8 @@ class BellBlockHandler : StaffHandler() {
         private val ATTRIBUTE_MODIFIERS = AttributeModifiersComponent.builder()
             .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, attackDamage(8.0), AttributeModifierSlot.MAINHAND)
             .add(EntityAttributes.GENERIC_ATTACK_SPEED, attackSpeed(1.5), AttributeModifierSlot.MAINHAND)
+            .addDefault(EntityAttributes.PLAYER_ENTITY_INTERACTION_RANGE)
+            .addDefault(EntityAttributes.PLAYER_BLOCK_INTERACTION_RANGE)
             .build()
     }
 }
diff --git a/StaffMod/src/main/kotlin/opekope2/avm_staff/internal/staff_handler/BoneBlockHandler.kt b/StaffMod/src/main/kotlin/opekope2/avm_staff/internal/staff_handler/BoneBlockHandler.kt
@@ -33,6 +33,7 @@ import net.minecraft.world.World
 import net.minecraft.world.WorldEvents
 import net.minecraft.world.event.GameEvent
 import opekope2.avm_staff.api.staff.StaffHandler
+import opekope2.avm_staff.util.addDefault
 import opekope2.avm_staff.util.attackDamage
 import opekope2.avm_staff.util.attackSpeed
 
@@ -76,6 +77,8 @@ class BoneBlockHandler : StaffHandler() {
         private val ATTRIBUTE_MODIFIERS = AttributeModifiersComponent.builder()
             .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, attackDamage(5.0), AttributeModifierSlot.MAINHAND)
             .add(EntityAttributes.GENERIC_ATTACK_SPEED, attackSpeed(2.0), AttributeModifierSlot.MAINHAND)
+            .addDefault(EntityAttributes.PLAYER_ENTITY_INTERACTION_RANGE)
+            .addDefault(EntityAttributes.PLAYER_BLOCK_INTERACTION_RANGE)
             .build()
     }
 }
diff --git a/StaffMod/src/main/kotlin/opekope2/avm_staff/internal/staff_handler/FurnaceHandler.kt b/StaffMod/src/main/kotlin/opekope2/avm_staff/internal/staff_handler/FurnaceHandler.kt
@@ -212,6 +212,8 @@ class FurnaceHandler<TRecipe : AbstractCookingRecipe>(
         private val ATTRIBUTE_MODIFIERS = AttributeModifiersComponent.builder()
             .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, attackDamage(10.0), AttributeModifierSlot.MAINHAND)
             .add(EntityAttributes.GENERIC_ATTACK_SPEED, attackSpeed(1.25), AttributeModifierSlot.MAINHAND)
+            .addDefault(EntityAttributes.PLAYER_ENTITY_INTERACTION_RANGE)
+            .addDefault(EntityAttributes.PLAYER_BLOCK_INTERACTION_RANGE)
             .build()
     }
 }
diff --git a/StaffMod/src/main/kotlin/opekope2/avm_staff/internal/staff_handler/MagmaBlockHandler.kt b/StaffMod/src/main/kotlin/opekope2/avm_staff/internal/staff_handler/MagmaBlockHandler.kt
@@ -92,6 +92,8 @@ class MagmaBlockHandler : StaffHandler() {
         private val ATTRIBUTE_MODIFIERS = AttributeModifiersComponent.builder()
             .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, attackDamage(10.0), AttributeModifierSlot.MAINHAND)
             .add(EntityAttributes.GENERIC_ATTACK_SPEED, attackSpeed(1.25), AttributeModifierSlot.MAINHAND)
+            .addDefault(EntityAttributes.PLAYER_ENTITY_INTERACTION_RANGE)
+            .addDefault(EntityAttributes.PLAYER_BLOCK_INTERACTION_RANGE)
             .build()
     }
 }
diff --git a/StaffMod/src/main/kotlin/opekope2/avm_staff/internal/staff_handler/WoolHandler.kt b/StaffMod/src/main/kotlin/opekope2/avm_staff/internal/staff_handler/WoolHandler.kt
@@ -37,6 +37,7 @@ import net.minecraft.util.math.Direction
 import net.minecraft.world.World
 import opekope2.avm_staff.api.staff.StaffHandler
 import opekope2.avm_staff.mixin.IMinecraftClientMixin
+import opekope2.avm_staff.util.addDefault
 import opekope2.avm_staff.util.attackDamage
 import opekope2.avm_staff.util.attackSpeed
 import opekope2.avm_staff.util.mutableItemStackInStaff
@@ -84,6 +85,8 @@ class WoolHandler(private val woolBlockItem: BlockItem, private val carpetBlockI
         private val ATTRIBUTE_MODIFIERS = AttributeModifiersComponent.builder()
             .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, attackDamage(2.0), AttributeModifierSlot.MAINHAND)
             .add(EntityAttributes.GENERIC_ATTACK_SPEED, attackSpeed(2.0), AttributeModifierSlot.MAINHAND)
+            .addDefault(EntityAttributes.PLAYER_ENTITY_INTERACTION_RANGE)
+            .addDefault(EntityAttributes.PLAYER_BLOCK_INTERACTION_RANGE)
             .build()
     }
 }