From 554a08a515776bae1904cef35a69a136de181760 Mon Sep 17 00:00:00 2001 From: Jordan Rey Date: Wed, 15 Jul 2026 06:31:04 +0200 Subject: [PATCH] fix: infinite speed and altitude using glider with elytra (#240) --- dependencies.gradle | 1 + src/main/java/crazypants/enderio/EnderIO.java | 1 + .../enderio/etfuturum/EtFuturumCompat.java | 22 +++++++++++++++++++ .../crazypants/enderio/item/KeyTracker.java | 6 +++-- .../item/darksteel/DarkSteelController.java | 13 +++++++++-- 5 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 src/main/java/crazypants/enderio/etfuturum/EtFuturumCompat.java diff --git a/dependencies.gradle b/dependencies.gradle index 63e8699f..d0046ac0 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -11,6 +11,7 @@ dependencies { api("com.github.GTNewHorizons:TinkersConstruct:1.14.93-GTNH:dev") devOnlyNonPublishable('com.github.GTNewHorizons:waila:1.19.30:dev') {transitive = false} + compileOnly('ganymedes01.etfuturum:Et-Futurum-Requiem:2.6.48-GTNH:dev') {transitive = false} runtimeOnlyNonPublishable('com.github.GTNewHorizons:WAILAPlugins:0.7.2:dev') {transitive = false} compileOnly("com.github.GTNewHorizons:Backhand:1.8.11:dev") { transitive = false } compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-997-GTNH:api') {transitive = false} diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index c3a8ce2d..fa5c08dd 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -214,6 +214,7 @@ public class EnderIO { public static final boolean hasLwjgl3 = Loader.isModLoaded("lwjgl3ify"); public static final boolean hasGT5 = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi"); public static final boolean hasHP = Loader.isModLoaded("hodgepodge"); + public static final boolean hasEtFuturum = Loader.isModLoaded("etfuturum"); public static final boolean hasWailaPlugins = Loader.isModLoaded("wailaplugins"); public static final boolean hasAutomagy = Loader.isModLoaded("Automagy"); diff --git a/src/main/java/crazypants/enderio/etfuturum/EtFuturumCompat.java b/src/main/java/crazypants/enderio/etfuturum/EtFuturumCompat.java new file mode 100644 index 00000000..54d9ae87 --- /dev/null +++ b/src/main/java/crazypants/enderio/etfuturum/EtFuturumCompat.java @@ -0,0 +1,22 @@ +package crazypants.enderio.etfuturum; + +import net.minecraft.entity.player.EntityPlayer; + +import crazypants.enderio.EnderIO; +import ganymedes01.etfuturum.elytra.IElytraPlayer; + +public final class EtFuturumCompat { + + private EtFuturumCompat() {} + + public static boolean isElytraFlying(EntityPlayer player) { + return EnderIO.hasEtFuturum && player instanceof IElytraPlayer + && ((IElytraPlayer) player).etfu$isElytraFlying(); + } + + public static void stopElytraFlying(EntityPlayer player) { + if (EnderIO.hasEtFuturum && player instanceof IElytraPlayer) { + ((IElytraPlayer) player).etfu$setElytraFlying(false); + } + } +} diff --git a/src/main/java/crazypants/enderio/item/KeyTracker.java b/src/main/java/crazypants/enderio/item/KeyTracker.java index 04446bd3..5e6570f4 100644 --- a/src/main/java/crazypants/enderio/item/KeyTracker.java +++ b/src/main/java/crazypants/enderio/item/KeyTracker.java @@ -328,8 +328,10 @@ public class KeyTracker { } private void handleGlide() { - if (glideKey.isPressed() - && DarkSteelController.instance.isGliderUpgradeEquipped(Minecraft.getMinecraft().thePlayer)) { + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + if (glideKey.isPressed() && DarkSteelController.instance.isGliderUpgradeEquipped(player) + && (DarkSteelController.instance.isGlideActive(player) + || DarkSteelController.instance.canActivateGlide(player))) { toggleDarkSteelController(Type.GLIDE, "darksteel.upgrade.glider"); } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index 16796412..1984eb55 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -41,6 +41,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; +import crazypants.enderio.etfuturum.EtFuturumCompat; import crazypants.enderio.item.darksteel.PacketUpgradeState.Type; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.GliderUpgrade; @@ -146,6 +147,8 @@ public class DarkSteelController { } public void setActive(EntityPlayer player, Type type, boolean isActive) { + if (type == Type.GLIDE && isActive && !canActivateGlide(player)) return; + EnumSet set = getActiveSet(player); if (isActive) { set.add(type); @@ -158,6 +161,10 @@ public class DarkSteelController { return isActive(player, Type.GLIDE); } + public boolean canActivateGlide(EntityPlayer player) { + return !EtFuturumCompat.isElytraFlying(player); + } + public boolean isSpeedActive(EntityPlayer player) { return isActive(player, Type.SPEED); } @@ -246,8 +253,10 @@ public class DarkSteelController { } private void updateGlide(EntityPlayer player) { - if (!isGlideActive(player) || !isGliderUpgradeEquipped(player)) { - return; + if (!isGlideActive(player) || !isGliderUpgradeEquipped(player)) return; + + if (EtFuturumCompat.isElytraFlying(player)) { + EtFuturumCompat.stopElytraFlying(player); } if (!player.onGround && player.motionY < 0 && !player.isSneaking() && !player.isInWater()) {