Skip to content

Commit 028cfcd

Browse files
committed
makes more sense
1 parent a5b9698 commit 028cfcd

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Diff for: src/main/java/dev/sterner/mixin/ReboundEnchantmentMixin.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ public class ReboundEnchantmentMixin {
1919
private static void voidbound$onRightClick(ServerPlayer player, InteractionHand interactionHand, ItemStack stack, CallbackInfoReturnable<Boolean> cir, @Local(ordinal = 0) float baseDamage, @Local(ordinal = 1) float magicDamage) {
2020

2121
if (stack.getItem() instanceof IchoriumScytheItem) {
22-
ReboundEnchantmentMixinLogic.INSTANCE.logic(player, stack, baseDamage, magicDamage, 25);
23-
ReboundEnchantmentMixinLogic.INSTANCE.logic(player, stack, baseDamage, magicDamage, -25);
22+
ReboundEnchantmentMixinLogic.INSTANCE.logic(player, stack, baseDamage, magicDamage);
2423
}
2524
}
2625
}

Diff for: src/main/kotlin/dev/sterner/mixin_logic/ReboundEnchantmentMixinLogic.kt

+7-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ import net.minecraft.world.item.ItemStack
88

99
object ReboundEnchantmentMixinLogic {
1010

11-
fun logic(player: ServerPlayer, stack: ItemStack, baseDamage: Float, magicDamage: Float, yOffset: Int) {
11+
fun logic(player: ServerPlayer, stack: ItemStack, baseDamage: Float, magicDamage: Float) {
12+
shootScythe(player, stack, baseDamage, magicDamage, 25)
13+
shootScythe(player, stack, baseDamage, magicDamage, -25)
14+
}
15+
16+
private fun shootScythe(player: ServerPlayer, stack: ItemStack, baseDamage: Float, magicDamage: Float, yRotOffset: Int) {
1217
val entity = ScytheBoomerangEntity(
1318
player.level(),
1419
player.position().x,
@@ -22,7 +27,7 @@ object ReboundEnchantmentMixinLogic {
2227
(entity as IchoriumScytheGhost).setGhost(true)
2328

2429
entity.shootFromRotation(
25-
player, player.xRot, player.yRot + yOffset, 0.0f,
30+
player, player.xRot, player.yRot + yRotOffset, 0.0f,
2631
(1.5f + player.getAttributeValue(AttributeRegistry.SCYTHE_PROFICIENCY.get()) * 0.125f).toFloat(), 0f
2732
)
2833
player.level().addFreshEntity(entity)

0 commit comments

Comments
 (0)