further encapsulate state

Up-Mods · Apr 23, 2024 · 2310d5d · 2310d5d
1 parent dbc05ee
commit 2310d5d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 9 deletions.
diff --git a/Common/src/main/java/dev/cammiescorner/icarus/client/IcarusClient.java b/Common/src/main/java/dev/cammiescorner/icarus/client/IcarusClient.java
@@ -15,7 +15,7 @@ public class IcarusClient {
     private static final List<Predicate<LivingEntity>> renderPredicates = new ArrayList<>();
 
     public static void onPlayerTick(Player player) {
-        if (player.isFallFlying() && IcarusHelper.hasWings.test(player) && player.zza > 0) {
+        if (player.isFallFlying() && IcarusHelper.hasWings(player) && player.zza > 0) {
             var cfg = IcarusHelper.getConfigValues(player);
             var rotation = player.getLookAngle();
             var velocity = player.getDeltaMovement();
@@ -30,7 +30,7 @@ public static void onPlayerTick(Player player) {
 
     @ApiStatus.Internal
     public static ItemStack getWingsForRendering(LivingEntity entity) {
-        return IcarusHelper.getEquippedWings.apply(entity);
+        return IcarusHelper.getEquippedWings(entity);
     }
 
     @ApiStatus.Internal

diff --git a/Common/src/main/java/dev/cammiescorner/icarus/mixin/EntityMixin.java b/Common/src/main/java/dev/cammiescorner/icarus/mixin/EntityMixin.java
@@ -31,15 +31,15 @@ public abstract class EntityMixin {
     @ModifyExpressionValue(method = "turn", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Mth;clamp(FFF)F", ordinal = 0))
     private float icarus$updateLookDirection(float original) {
         if(((Object) this) instanceof LivingEntity living) {
-            return living.isFallFlying() && IcarusHelper.hasWings.test(living) ? Mth.wrapDegrees(this.getXRot()) : original;
+            return living.isFallFlying() && IcarusHelper.hasWings(living) ? Mth.wrapDegrees(this.getXRot()) : original;
         }
         return original;
     }
 
     @ModifyExpressionValue(method = "turn", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Mth;clamp(FFF)F", ordinal = 1))
     private float icarus$updateLookDirection0(float original) {
         if (((Object) this) instanceof LivingEntity living) {
-            return living.isFallFlying() && IcarusHelper.hasWings.test(living) ? Mth.wrapDegrees(this.xRotO) : original;
+            return living.isFallFlying() && IcarusHelper.hasWings(living) ? Mth.wrapDegrees(this.xRotO) : original;
         }
         return original;
     }

diff --git a/Common/src/main/java/dev/cammiescorner/icarus/mixin/client/CapeLayerMixin.java b/Common/src/main/java/dev/cammiescorner/icarus/mixin/client/CapeLayerMixin.java
@@ -14,7 +14,7 @@ public abstract class CapeLayerMixin {
 
     @WrapOperation(method = "render(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/player/AbstractClientPlayer;FFFFFF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/AbstractClientPlayer;isModelPartShown(Lnet/minecraft/world/entity/player/PlayerModelPart;)Z"))
     private boolean icarus$hideCape(AbstractClientPlayer instance, PlayerModelPart playerModelPart, Operation<Boolean> original) {
-        return original.call(instance, playerModelPart) && !IcarusHelper.hasWings.test(instance);
+        return original.call(instance, playerModelPart) && !IcarusHelper.hasWings(instance);
     }
 
 }
diff --git a/Common/src/main/java/dev/cammiescorner/icarus/mixin/client/MouseHandlerMixin.java b/Common/src/main/java/dev/cammiescorner/icarus/mixin/client/MouseHandlerMixin.java
@@ -18,7 +18,7 @@ public class MouseHandlerMixin {
 
     @ModifyArg(method = "turnPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;turn(DD)V"), index = 0)
     public double changeLookDirectionX(double x) {
-        if (minecraft.player != null && minecraft.player.isFallFlying() && IcarusHelper.hasWings.test(minecraft.player) && IcarusHelper.getConfigValues(minecraft.player).canLoopDeLoop() && (minecraft.player.getXRot() > 90 || minecraft.player.getXRot() < -90))
+        if (minecraft.player != null && minecraft.player.isFallFlying() && IcarusHelper.hasWings(minecraft.player) && IcarusHelper.getConfigValues(minecraft.player).canLoopDeLoop() && (minecraft.player.getXRot() > 90 || minecraft.player.getXRot() < -90))
             return -x;
 
         return x;

diff --git a/Common/src/main/java/dev/cammiescorner/icarus/util/IcarusHelper.java b/Common/src/main/java/dev/cammiescorner/icarus/util/IcarusHelper.java
@@ -13,6 +13,7 @@
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.function.BiPredicate;
@@ -21,9 +22,15 @@
 
 public class IcarusHelper {
 
+    @ApiStatus.Internal
     public static Predicate<LivingEntity> hasWings = entity -> false;
+
+    @ApiStatus.Internal
     public static Function<LivingEntity, ItemStack> getEquippedWings = entity -> ItemStack.EMPTY;
+    @ApiStatus.Internal
     public static BiPredicate<LivingEntity, ItemStack> equipFunc = (entity, stack) -> false;
+
+    @ApiStatus.Internal
     public static IcarusPlayerValues fallbackValues = new ServerPlayerFallbackValues();
 
     public static boolean onFallFlyingTick(LivingEntity entity, @Nullable ItemStack wings, boolean tick) {
@@ -73,6 +80,14 @@ public static boolean onFallFlyingTick(LivingEntity entity, @Nullable ItemStack
         return true;
     }
 
+    public static boolean hasWings(LivingEntity entity) {
+        return hasWings.test(entity);
+    }
+
+    public static ItemStack getEquippedWings(LivingEntity entity) {
+        return getEquippedWings.apply(entity);
+    }
+
     public static IcarusPlayerValues getConfigValues(LivingEntity entity) {
         return fallbackValues;
     }

diff --git a/NeoForge/src/main/java/dev/cammiescorner/icarus/neoforge/EventHandler.java b/NeoForge/src/main/java/dev/cammiescorner/icarus/neoforge/EventHandler.java
@@ -29,18 +29,18 @@ public static void onPlayerTick(TickEvent.PlayerTickEvent event) {
             if(attributeInstance != null) {
                 if (attributeInstance.hasModifier(WINGS_FLIGHT)) {
                     if(event.player.isFallFlying()) {
-                        if (!IcarusHelper.onFallFlyingTick(event.player, IcarusHelper.getEquippedWings.apply(event.player), true)) {
+                        if (!IcarusHelper.onFallFlyingTick(event.player, IcarusHelper.getEquippedWings(event.player), true)) {
                             attributeInstance.removeModifier(WINGS_FLIGHT);
                         }
                     }
                     else {
-                        if(!IcarusHelper.hasWings.test(event.player)) {
+                        if(!IcarusHelper.hasWings(event.player)) {
                             attributeInstance.removeModifier(WINGS_FLIGHT);
                         }
                     }
                 }
                 else {
-                    if (IcarusHelper.hasWings.test(event.player)) {
+                    if (IcarusHelper.hasWings(event.player)) {
                         attributeInstance.addTransientModifier(WINGS_FLIGHT);
                     }
                 }