From 9f6aac9db047ea19c5e4c3da4aec3c2fba672675 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Fri, 31 May 2024 12:42:54 -0400 Subject: [PATCH] Flybug + inertial canceling (#78) --- dependencies.gradle | 4 +- .../boots/ItemElectricBootsTraveller.java | 38 +++++++++++++++++-- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 6b45e60..1649fdb 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,10 +1,10 @@ // Add your dependencies here dependencies { - compileOnly 'com.github.GTNewHorizons:GT5-Unofficial:5.09.48.09:dev' + compileOnly 'com.github.GTNewHorizons:GT5-Unofficial:5.09.48.12:dev' api 'com.github.GTNewHorizons:Baubles:1.0.4:dev' api 'com.github.GTNewHorizons:ModularUI:1.2.0:dev' - api ('com.github.GTNewHorizons:ThaumicBoots:1.3.4:dev'){ + api ('com.github.GTNewHorizons:ThaumicBoots:1.3.5:dev'){ exclude group: 'com.github.GTNewHorizons', module: 'Electro-Magic-Tools' } diff --git a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java index 91ab489..51eab0d 100644 --- a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java @@ -125,6 +125,20 @@ public class ItemElectricBootsTraveller extends ItemArmor @Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { + if (getIntertialState(itemStack) && player.moveForward == 0 + && player.moveStrafing == 0 + && player.capabilities.isFlying) { + player.motionX *= 0.5; + player.motionZ *= 0.5; + } + boolean omniMode = false; + if (EMT.isBootsActive) { + omniMode = isOmniEnabled(itemStack); + if ((player.moveForward == 0F && player.moveStrafing == 0F && omniMode) + || (player.moveForward <= 0F && !omniMode)) { + return; + } + } if (player.moveForward != 0.0F || player.moveStrafing != 0.0F) { if (player.worldObj.isRemote && !player.isSneaking()) { if (!Thaumcraft.instance.entityEventHandler.prevStep.containsKey(player.getEntityId())) { @@ -145,7 +159,7 @@ public class ItemElectricBootsTraveller extends ItemArmor bonus *= speedMod; if (EMT.isBootsActive) { applyOmniState(player, bonus, itemStack); - } else { + } else if (player.moveForward > 0.0) { player.moveFlying(0.0F, player.moveForward, bonus); } } else if (Hover.getHover(player.getEntityId())) { @@ -166,11 +180,12 @@ public class ItemElectricBootsTraveller extends ItemArmor @Optional.Method(modid = "thaumicboots") public void applyOmniState(EntityPlayer player, float bonus, ItemStack itemStack) { - if (player.moveStrafing != 0.0 && itemStack.stackTagCompound.getBoolean("omni")) { - player.moveFlying(player.moveStrafing, 0.0F, bonus); - } else if (player.moveForward != 0.0) { + if (player.moveForward != 0.0) { player.moveFlying(0.0F, player.moveForward, bonus); } + if (player.moveStrafing != 0.0 && getOmniState(itemStack)) { + player.moveFlying(player.moveStrafing, 0.0F, bonus); + } } @SubscribeEvent @@ -311,4 +326,19 @@ public class ItemElectricBootsTraveller extends ItemArmor } return 1.0; } + + public boolean getOmniState(ItemStack stack) { + if (stack.stackTagCompound != null) { + return stack.stackTagCompound.getBoolean("omni"); + } + return false; + } + + public boolean getIntertialState(ItemStack stack) { + if (stack.stackTagCompound != null) { + return stack.stackTagCompound.getBoolean("inertiacanceling"); + } + return false; + } + }