Skip to content

Commit 1af6e62

Browse files
committed
Fix custom elytra flight
Fixes #152
1 parent 9c40919 commit 1af6e62

File tree

4 files changed

+22
-21
lines changed

4 files changed

+22
-21
lines changed

fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/IItemExtensionMixin.java

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package net.fabricmc.fabric.mixin.entity.event;
2+
3+
import net.fabricmc.fabric.api.entity.event.v1.EntityElytraEvents;
4+
import net.minecraft.world.entity.LivingEntity;
5+
import net.neoforged.neoforge.common.extensions.IItemStackExtension;
6+
import org.spongepowered.asm.mixin.Mixin;
7+
import org.spongepowered.asm.mixin.injection.At;
8+
import org.spongepowered.asm.mixin.injection.Inject;
9+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
10+
11+
@Mixin(IItemStackExtension.class)
12+
public interface IItemStackExtensionMixin {
13+
14+
@Inject(method = "canElytraFly", at = @At("HEAD"), cancellable = true)
15+
default void canElytraFly(LivingEntity entity, CallbackInfoReturnable<Boolean> cir) {
16+
if (EntityElytraEvents.CUSTOM.invoker().useCustomElytra(entity, false)) {
17+
cir.setReturnValue(true);
18+
}
19+
}
20+
}

fabric-entity-events-v1/src/main/resources/fabric-entity-events-v1.mixins.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"ServerPlayerEntityMixin",
1212
"elytra.LivingEntityMixin",
1313
"elytra.PlayerEntityMixin",
14-
"IItemExtensionMixin"
14+
"IItemStackExtensionMixin"
1515
],
1616
"injectors": {
1717
"defaultRequire": 1,

ffapi.gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
loom.platform=neoforge
22
fabric.loom.dontRemap=true
33

4-
implementationVersion=2.0.20
4+
implementationVersion=2.0.21
55

66
versionMc=1.21.1
77
versionForge=21.1.57

0 commit comments

Comments
 (0)