From 337b608ee8fab396184cac46a7b82109cd604a6c Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Fri, 5 Nov 2021 15:13:11 +0100
Subject: [PATCH] Code cleanup for FlyFallingLib Workaround (#231)

---
 .../mixin/common/LivingEntityMixin.java       | 52 ++++++-------------
 1 file changed, 17 insertions(+), 35 deletions(-)

diff --git a/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java b/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java
index 403307a5..ae9f8843 100644
--- a/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java
+++ b/src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java
@@ -124,6 +124,20 @@ public abstract class LivingEntityMixin extends Entity {
 		//run be_updateFallFlying instead
 		if (!BetterEnd.RUNS_FALL_FLYING_LIB) return;
 
+		if (be_updateFallFlyingCommon()) {
+			vanillaAfterUpdateFallFlying();
+			info.cancel();
+		}
+	}
+
+	@Inject(method = "updateFallFlying", at = @At("HEAD"), cancellable = true)
+	private void be_updateFallFlying(CallbackInfo info) {
+		//run be_updateFallFlying_originFix instead?
+		if (BetterEnd.RUNS_FALL_FLYING_LIB) return;
+		be_updateFallFlyingCommon();
+	}
+
+	private boolean be_updateFallFlyingCommon() {
 		ItemStack itemStack = getItemBySlot(EquipmentSlot.CHEST);
 		if (!level.isClientSide && itemStack.getItem() instanceof FallFlyingItem) {
 			boolean isFlying = getSharedFlag(7);
@@ -146,12 +160,9 @@ public abstract class LivingEntityMixin extends Entity {
 				isFlying = false;
 			}
 			setSharedFlag(7, isFlying);
-			if (isFlying) {
-				vanillaAfterUpdateFallFlying();
-				info.cancel();
-			}
+			return isFlying;
 		}
-
+		return false;
 	}
 
 	@Shadow protected abstract void removeFrost();
@@ -198,37 +209,8 @@ public abstract class LivingEntityMixin extends Entity {
 		}
 	}
 
-	@Inject(method = "updateFallFlying", at = @At("HEAD"), cancellable = true)
-	private void be_updateFallFlying(CallbackInfo info) {
-		//run be_updateFallFlying_originFix instead?
-		if (BetterEnd.RUNS_FALL_FLYING_LIB) return;
 
-		ItemStack itemStack = getItemBySlot(EquipmentSlot.CHEST);
-		if (!level.isClientSide && itemStack.getItem() instanceof FallFlyingItem) {
-			boolean isFlying = getSharedFlag(7);
-			if (isFlying && !onGround && !isPassenger() && !hasEffect(MobEffects.LEVITATION)) {
-				if (ElytraItem.isFlyEnabled(itemStack)) {
-					if ((fallFlyTicks + 1) % 20 == 0) {
-						itemStack.hurtAndBreak(
-							1,
-							LivingEntity.class.cast(this),
-							livingEntity -> livingEntity.broadcastBreakEvent(EquipmentSlot.CHEST)
-						);
-					}
-					isFlying = true;
-				}
-				else {
-					isFlying = false;
-				}
-			}
-			else {
-				isFlying = false;
-			}
-			setSharedFlag(7, isFlying);
-			info.cancel();
-		}
-	}
-	
+
 	@Inject(method = "travel", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;isFallFlying()Z", shift = Shift.AFTER), cancellable = true)
 	public void be_travel(Vec3 vec3, CallbackInfo info) {
 		ItemStack itemStack = getItemBySlot(EquipmentSlot.CHEST);