From 72711501d784f66f02362d07f2c463e617181750 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 14 Dec 2019 01:02:15 -0600 Subject: [PATCH] Remove handed-bias from mana bursts to match vanilla bows, fixes #2983 --- .../java/vazkii/botania/common/entity/EntityManaBurst.java | 6 +----- src/main/java/vazkii/botania/common/item/ItemManaGun.java | 2 +- .../item/equipment/tool/terrasteel/ItemTerraSword.java | 5 +---- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index c46dcccdc..dac330689 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -148,16 +148,12 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { setBurstMotion(mx, my, mz); } - public EntityManaBurst(PlayerEntity player, Hand hand) { + public EntityManaBurst(PlayerEntity player) { super(TYPE, player, player.world); setBurstSourceCoords(new BlockPos(0, -1, 0)); setRotation(player.rotationYaw + 180, -player.rotationPitch); - double dX = (hand == Hand.OFF_HAND ? -1 : 1) * MathHelper.cos((rotationYaw + 180) / 180.0F * (float) Math.PI) * 0.16F; - double dZ = (hand == Hand.OFF_HAND ? -1 : 1) * MathHelper.sin((rotationYaw + 180) / 180.0F * (float) Math.PI) * 0.16F; - - setPosition(posX - dX, posY, posZ - dZ); float f = 0.4F; double mx = MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f / 2D; double mz = -(MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI) * f) / 2D; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 6918eacc5..06ebd728a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -150,7 +150,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { } private EntityManaBurst getBurst(PlayerEntity player, ItemStack stack, boolean request, Hand hand) { - EntityManaBurst burst = new EntityManaBurst(player, hand); + EntityManaBurst burst = new EntityManaBurst(player); BurstProperties props = getBurstProps(player, stack, request, hand); burst.setSourceLens(getLens(stack)); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java index 632508750..29b17eefe 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java @@ -15,7 +15,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.ThrowableEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import net.minecraft.util.Hand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.RayTraceResult; @@ -28,7 +27,6 @@ import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILensEffect; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; @@ -36,7 +34,6 @@ import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.network.PacketLeftClick; import java.util.List; -import java.util.UUID; public class ItemTerraSword extends ItemManasteelSword implements ILensEffect { @@ -78,7 +75,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect { } public EntityManaBurst getBurst(PlayerEntity player, ItemStack stack) { - EntityManaBurst burst = new EntityManaBurst(player, Hand.MAIN_HAND); + EntityManaBurst burst = new EntityManaBurst(player); float motionModifier = 7F;