From f9c12b06db8804d06a24b80dbc62a7deca556338 Mon Sep 17 00:00:00 2001 From: Keal Jones Date: Sat, 1 Mar 2025 10:04:07 -0700 Subject: [PATCH 1/2] Upgrade to 1.21.4 --- fabric/build.gradle | 2 +- fabric/gradle.properties | 10 +++++----- .../me/lunaluna/fabric/elytrarecast/ElytraHelper.java | 9 ++++----- .../fabric/elytrarecast/mixin/PlayerMixin.java | 8 ++++---- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/fabric/build.gradle b/fabric/build.gradle index 92450de..6954717 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.7.2' + id 'fabric-loom' version '1.9.2' } group 'me.lunaluna.elytra-recast' diff --git a/fabric/gradle.properties b/fabric/gradle.properties index 355eaa7..171bf64 100644 --- a/fabric/gradle.properties +++ b/fabric/gradle.properties @@ -1,9 +1,9 @@ # Fabric - minecraft_version=1.21 - yarn_mappings=1.21+build.7 - loader_version=0.15.11 + minecraft_version=1.21.4 + yarn_mappings=1.21.4+build.8 + loader_version=0.16.10 # Dependencies - mod_menu_version=11.0.1 - cloth_config_version=15.0.127 + mod_menu_version=13.0.2 + cloth_config_version=17.0.144 # Libraries gson_version=2.9.0 diff --git a/fabric/src/main/java/me/lunaluna/fabric/elytrarecast/ElytraHelper.java b/fabric/src/main/java/me/lunaluna/fabric/elytrarecast/ElytraHelper.java index 35ef28c..cef1157 100644 --- a/fabric/src/main/java/me/lunaluna/fabric/elytrarecast/ElytraHelper.java +++ b/fabric/src/main/java/me/lunaluna/fabric/elytrarecast/ElytraHelper.java @@ -3,7 +3,6 @@ import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.effect.StatusEffects; -import net.minecraft.item.ElytraItem; import net.minecraft.item.Items; import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket; @@ -20,9 +19,9 @@ public static boolean castElytra(ClientPlayerEntity player) { } public static boolean checkElytra(ClientPlayerEntity player) { - if (player.input.jumping && !player.getAbilities().flying && !player.hasVehicle() && !player.isClimbing()) { + if (player.input.playerInput.jump() && !player.getAbilities().flying && !player.hasVehicle() && !player.isClimbing()) { var itemStack = player.getEquippedStack(EquipmentSlot.CHEST); - return itemStack.isOf(Items.ELYTRA) && ElytraItem.isUsable(itemStack); + return itemStack.isOf(Items.ELYTRA); } else return false; } @@ -30,8 +29,8 @@ public static boolean checkElytra(ClientPlayerEntity player) { public static boolean checkFallFlyingIgnoreGround(ClientPlayerEntity player) { if (!player.isTouchingWater() && !player.hasStatusEffect(StatusEffects.LEVITATION)) { var itemStack = player.getEquippedStack(EquipmentSlot.CHEST); - if (itemStack.isOf(Items.ELYTRA) && ElytraItem.isUsable(itemStack)) { - player.startFallFlying(); + if (itemStack.isOf(Items.ELYTRA)) { + player.startGliding(); return true; } else return false; diff --git a/fabric/src/main/java/me/lunaluna/fabric/elytrarecast/mixin/PlayerMixin.java b/fabric/src/main/java/me/lunaluna/fabric/elytrarecast/mixin/PlayerMixin.java index c6bffde..f7d9da2 100644 --- a/fabric/src/main/java/me/lunaluna/fabric/elytrarecast/mixin/PlayerMixin.java +++ b/fabric/src/main/java/me/lunaluna/fabric/elytrarecast/mixin/PlayerMixin.java @@ -29,16 +29,16 @@ private ClientPlayerEntity player() { private boolean awaitingElytra = false; @SuppressWarnings("ConstantConditions") - @Inject(method = "tickFallFlying", at = @At("TAIL")) + @Inject(method = "tickMovement", at = @At("TAIL")) public void recastIfLanded(CallbackInfo ci) { if (player() == null || !((Object) this instanceof ClientPlayerEntity)) return; - boolean elytra = isFallFlying(); + boolean elytra = isGliding(); if (awaitingElytra) { if (elytra) awaitingElytra = false; } else if (!elytra && previousElytra) { - MinecraftClient.getInstance().getSoundManager().stopSounds(SoundEvents.ITEM_ELYTRA_FLYING.getId(), + MinecraftClient.getInstance().getSoundManager().stopSounds(SoundEvents.ITEM_ELYTRA_FLYING.id(), SoundCategory.PLAYERS); ElytraHelper.castElytra(player()); awaitingElytra = ElytraHelper.checkElytra(player()); @@ -47,5 +47,5 @@ public void recastIfLanded(CallbackInfo ci) { } @Shadow - public abstract boolean isFallFlying(); + public abstract boolean isGliding(); } diff --git a/gradle.properties b/gradle.properties index 87ad9dd..89b23b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Gradle Memory org.gradle.jvmargs=-Xmx1G # Mod Properties - mod_version=2.5.1 + mod_version=2.5.3 maven_group=me.lunaluna archives_base_name=elytra-recast diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a441313..94113f2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From f25276ad3412e3b4c08513eb4aa9af6b19cf2de3 Mon Sep 17 00:00:00 2001 From: Keal Jones Date: Sat, 1 Mar 2025 10:19:15 -0700 Subject: [PATCH 2/2] change mod version number --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 89b23b9..b4abf39 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Gradle Memory org.gradle.jvmargs=-Xmx1G # Mod Properties - mod_version=2.5.3 + mod_version=2.6.0 maven_group=me.lunaluna archives_base_name=elytra-recast