fix client error

Leclowndu93150 · Jul 20, 2024 · af5c1a2 · af5c1a2
1 parent 49195d3
commit af5c1a2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingClientEvents.java b/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingClientEvents.java
@@ -9,22 +9,28 @@
 import com.leclowndu93150.modular_angelring.registry.KeyBindRegistry;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.network.chat.Component;
 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.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.client.event.InputEvent;
+import net.neoforged.neoforge.event.tick.PlayerTickEvent;
 import net.neoforged.neoforge.network.PacketDistributor;
 import top.theillusivec4.curios.api.CuriosApi;
 import top.theillusivec4.curios.api.SlotResult;
 
 import java.util.Optional;
 
+import static com.leclowndu93150.modular_angelring.render.AngelRingRenderer.FLAP_FREQUENCY;
+import static com.leclowndu93150.modular_angelring.render.AngelRingRenderer.MAX_ANGLE;
+
 @EventBusSubscriber(modid = AngelRingMain.MODID, value = Dist.CLIENT)
 public class AngelRingClientEvents {
     @SubscribeEvent
@@ -63,4 +69,18 @@ public static void onKey(InputEvent.Key event) {
         }
 
     }
+
+    @SubscribeEvent
+    public static void onClientTick(PlayerTickEvent.Pre event) {
+            if (event.getEntity().level() 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);
+                        }
+                    }
+                }
+            }
+    }
 }
diff --git a/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingEvents.java b/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingEvents.java
@@ -79,26 +79,7 @@ public static void stopDrift(PlayerTickEvent.Pre event) {
 
     @SubscribeEvent
     public static void onPlayerTick(PlayerTickEvent.Pre event) {
-        updateWingFlap(event.getEntity().level());
         AngelRingItem.tickPlayer(event.getEntity());
     }
 
-    @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);
-                    }
-                }
-            }
-        }
-    }
-
 }