From 0fb17e6834b9fd8434d852d35c1d17f90cbbe499 Mon Sep 17 00:00:00 2001
From: Micle <micle@micle.dev>
Date: Mon, 25 May 2026 14:56:02 +0100
Subject: [PATCH] Partially ported proxy class, need to revisit particles and
 items.

---
 .../firefly_bush_backport/proxy/IProxy.java   |  8 +++---
 .../firefly_bush_backport/proxy/Proxy.java    | 26 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/dev/micle/firefly_bush_backport/proxy/IProxy.java b/src/main/java/dev/micle/firefly_bush_backport/proxy/IProxy.java
index b325ae3..56394ee 100644
--- a/src/main/java/dev/micle/firefly_bush_backport/proxy/IProxy.java
+++ b/src/main/java/dev/micle/firefly_bush_backport/proxy/IProxy.java
@@ -1,11 +1,11 @@
 package dev.micle.firefly_bush_backport.proxy;
 
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
 
 public interface IProxy {
     MinecraftServer getServer();
-    Player getClientPlayer();
-    Level getClientLevel();
+    PlayerEntity getClientPlayer();
+    ClientWorld getClientLevel();
 }
diff --git a/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java b/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java
index 55c1906..107fd5b 100644
--- a/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java
+++ b/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java
@@ -9,20 +9,20 @@ import dev.micle.firefly_bush_backport.item.ModItems;
 import dev.micle.firefly_bush_backport.particle.FireflyParticle;
 import dev.micle.firefly_bush_backport.particle.ModParticles;
 import dev.micle.firefly_bush_backport.sound.ModSounds;
+import net.minecraft.block.ComposterBlock;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.ComposterBlock;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.event.RegisterParticleProvidersEvent;
+import net.minecraftforge.client.event.ParticleFactoryRegisterEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.AddReloadListenerEvent;
-import net.minecraftforge.event.server.ServerStartedEvent;
-import net.minecraftforge.event.server.ServerStoppingEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.event.lifecycle.*;
+import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
+import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
 
 public class Proxy implements IProxy {
     private static MinecraftServer server = null;
@@ -62,11 +62,11 @@ public class Proxy implements IProxy {
 
     private static void onAddReloadListeners(AddReloadListenerEvent event) {}
 
-    private static void serverStarted(ServerStartedEvent event) {
+    private static void serverStarted(FMLServerStartedEvent event) {
         server = event.getServer();
     }
 
-    private static void serverStopping(ServerStoppingEvent event) {
+    private static void serverStopping(FMLServerStoppingEvent event) {
         server = null;
     }
 
@@ -76,12 +76,12 @@ public class Proxy implements IProxy {
     }
 
     @Override
-    public Player getClientPlayer() {
+    public PlayerEntity getClientPlayer() {
         return null;
     }
 
     @Override
-    public Level getClientLevel() {
+    public ClientWorld getClientLevel() {
         return null;
     }
 
@@ -100,19 +100,19 @@ public class Proxy implements IProxy {
 
         private static void postSetup(FMLLoadCompleteEvent event) {}
 
-        private static void registerParticleFactories(RegisterParticleProvidersEvent event) {
+        private static void registerParticleFactories(ParticleFactoryRegisterEvent event) {
             event.registerSpriteSet(ModParticles.FIREFLY.get(), FireflyParticle.FireflyProvider::new);
         }
 
         @Override
         @OnlyIn(Dist.CLIENT)
-        public Player getClientPlayer() {
+        public PlayerEntity getClientPlayer() {
             return Minecraft.getInstance().player;
         }
 
         @Override
         @OnlyIn(Dist.CLIENT)
-        public Level getClientLevel() {
+        public ClientWorld getClientLevel() {
             return Minecraft.getInstance().level;
         }
     }