Ported Proxy.

This commit is contained in:
2026-05-01 17:37:09 +01:00
parent c75998037c
commit 89ef123213
2 changed files with 26 additions and 20 deletions

View File

@ -4,8 +4,15 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import javax.annotation.Nullable;
public interface IProxy { public interface IProxy {
@Nullable
MinecraftServer getServer(); MinecraftServer getServer();
@Nullable
Player getClientPlayer(); Player getClientPlayer();
@Nullable
Level getClientLevel(); Level getClientLevel();
} }

View File

@ -1,6 +1,5 @@
package dev.micle.firefly_bush_backport.proxy; package dev.micle.firefly_bush_backport.proxy;
import dev.micle.firefly_bush_backport.FireflyBushBackport;
import dev.micle.firefly_bush_backport.block.ModBlocks; import dev.micle.firefly_bush_backport.block.ModBlocks;
import dev.micle.firefly_bush_backport.config.Config; import dev.micle.firefly_bush_backport.config.Config;
import dev.micle.firefly_bush_backport.tab.ModCreativeModeTabs; import dev.micle.firefly_bush_backport.tab.ModCreativeModeTabs;
@ -12,23 +11,22 @@ import net.minecraft.client.Minecraft;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraftforge.api.distmarker.Dist; import net.neoforged.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.neoforged.api.distmarker.OnlyIn;
import net.minecraftforge.client.event.RegisterParticleProvidersEvent; import net.neoforged.bus.api.IEventBus;
import net.minecraftforge.common.MinecraftForge; import net.neoforged.fml.ModContainer;
import net.minecraftforge.event.AddReloadListenerEvent; import net.neoforged.fml.event.lifecycle.*;
import net.minecraftforge.event.server.ServerStartedEvent; import net.neoforged.neoforge.client.event.RegisterParticleProvidersEvent;
import net.minecraftforge.event.server.ServerStoppingEvent; import net.neoforged.neoforge.common.NeoForge;
import net.minecraftforge.eventbus.api.IEventBus; import net.neoforged.neoforge.event.AddReloadListenerEvent;
import net.minecraftforge.fml.event.lifecycle.*; import net.neoforged.neoforge.event.server.ServerStartedEvent;
import net.neoforged.neoforge.event.server.ServerStoppingEvent;
public class Proxy implements IProxy { public class Proxy implements IProxy {
private static MinecraftServer server = null; private static MinecraftServer server = null;
// Common setup // Common setup
public Proxy() { public Proxy(IEventBus modEventBus, ModContainer modContainer) {
IEventBus modEventBus = FireflyBushBackport.getFMLJavaModLoadingContext().getModEventBus();
Config.register(); Config.register();
ModBlocks.register(modEventBus); ModBlocks.register(modEventBus);
ModItems.register(modEventBus); ModItems.register(modEventBus);
@ -42,9 +40,9 @@ public class Proxy implements IProxy {
modEventBus.addListener(Proxy::imcProcess); modEventBus.addListener(Proxy::imcProcess);
// Register event bus listeners // Register event bus listeners
MinecraftForge.EVENT_BUS.addListener(Proxy::onAddReloadListeners); NeoForge.EVENT_BUS.addListener(Proxy::onAddReloadListeners);
MinecraftForge.EVENT_BUS.addListener(Proxy::serverStarted); NeoForge.EVENT_BUS.addListener(Proxy::serverStarted);
MinecraftForge.EVENT_BUS.addListener(Proxy::serverStopping); NeoForge.EVENT_BUS.addListener(Proxy::serverStopping);
} }
private static void setup(FMLCommonSetupEvent event) {} private static void setup(FMLCommonSetupEvent event) {}
@ -80,8 +78,8 @@ public class Proxy implements IProxy {
// Client setup // Client setup
public static class Client extends Proxy { public static class Client extends Proxy {
public Client() { public Client(IEventBus modEventBus, ModContainer modContainer) {
IEventBus modEventBus = FireflyBushBackport.getFMLJavaModLoadingContext().getModEventBus(); super(modEventBus, modContainer);
// Register mod event bus listeners // Register mod event bus listeners
modEventBus.addListener(Client::setup); modEventBus.addListener(Client::setup);
@ -112,9 +110,10 @@ public class Proxy implements IProxy {
// Server setup // Server setup
public static class Server extends Proxy { public static class Server extends Proxy {
public Server() { public Server(IEventBus modEventBus, ModContainer modContainer) {
super(modEventBus, modContainer);
// Register mod event bus listeners // Register mod event bus listeners
IEventBus modEventBus = FireflyBushBackport.getFMLJavaModLoadingContext().getModEventBus();
modEventBus.addListener(Server::setup); modEventBus.addListener(Server::setup);
} }