From 5e478f5ff70413e2a7176ba5a51b49ad7af0be23 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 8 Nov 2019 22:00:55 -0600 Subject: [PATCH] Fix elementium tool repair material being wrong, and fix tornado rod yeeting too hard, closes #3004 --- src/main/java/vazkii/botania/api/BotaniaAPI.java | 2 +- .../vazkii/botania/common/item/rod/ItemTornadoRod.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 4bf4a4d46..9dec17527 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -161,7 +161,7 @@ public final class BotaniaAPI { @Override public Ingredient getRepairMaterial() { - Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation("botania", "manasteel_ingot")); + Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation("botania", "elementium_ingot")); return Ingredient.fromItems(item); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 6d8866faa..48ca55182 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -22,6 +22,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; @@ -71,9 +72,9 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } else if(isFlying(stack)) { if(holding) { player.fallDistance = 0F; - double dy = player.getMotion().getY() - + (IManaProficiencyArmor.Helper.hasProficiency(player, stack) ? 1.6 : 1.25); - player.setMotion(player.getMotion().add(0, dy, 0)); + double my = IManaProficiencyArmor.Helper.hasProficiency(player, stack) ? 1.6 : 1.25; + Vec3d oldMot = player.getMotion(); + player.setMotion(new Vec3d(oldMot.getX(), my, oldMot.getZ())); player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.airRod, SoundCategory.PLAYERS, 0.1F, 0.25F); for(int i = 0; i < 5; i++) {