more fixing attempts

Leclowndu93150 · Jul 20, 2024 · 49195d3 · 49195d3
1 parent f749c89
commit 49195d3
Showing 1 changed file with 21 additions and 4 deletions.
diff --git a/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingEvents.java b/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingEvents.java
@@ -12,12 +12,16 @@
 import com.leclowndu93150.modular_angelring.utils.FlightSpeedPercentage;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.SubscribeEvent;
@@ -26,6 +30,7 @@
 import net.neoforged.neoforge.event.entity.player.PlayerEvent;
 import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
 import net.neoforged.neoforge.event.tick.PlayerTickEvent;
+import net.neoforged.neoforge.event.tick.ServerTickEvent;
 import net.neoforged.neoforge.network.PacketDistributor;
 import top.theillusivec4.curios.api.CuriosApi;
 import top.theillusivec4.curios.api.SlotResult;
@@ -74,13 +79,25 @@ public static void stopDrift(PlayerTickEvent.Pre event) {
 
     @SubscribeEvent
     public static void onPlayerTick(PlayerTickEvent.Pre event) {
-        updateWingFlap(event.getEntity());
+        updateWingFlap(event.getEntity().level());
         AngelRingItem.tickPlayer(event.getEntity());
     }
 
-    private static void updateWingFlap(Player entity) {
-        if (entity.getAbilities().flying) {
-            entity.getPersistentData().putDouble("wing_angle", 1 * MAX_ANGLE * Math.sin(2*Math.PI * FLAP_FREQUENCY * (System.currentTimeMillis()/1000.)));
+    @SubscribeEvent
+    public static void onServerTick(ServerTickEvent.Pre event) {
+
+    }
+
+    private static void updateWingFlap(Level baseLevel) {
+        if (baseLevel instanceof ClientLevel clientLevel) {
+            for (Entity entity : clientLevel.entitiesForRendering()) {
+                if (entity instanceof Player player) {
+                    if (player.getAbilities().flying) {
+                        double pValue = 1 * MAX_ANGLE * Math.sin(2 * Math.PI * FLAP_FREQUENCY * (System.currentTimeMillis() / 1000.));
+                        player.getPersistentData().putDouble("wing_angle", pValue);
+                    }
+                }
+            }
         }
     }