Private
Public Access
1
0

Partially ported proxy class, need to revisit particles and items.

This commit is contained in:
2026-05-25 14:56:02 +01:00
parent 748653618a
commit 0fb17e6834
2 changed files with 17 additions and 17 deletions

View File

@ -1,11 +1,11 @@
package dev.micle.firefly_bush_backport.proxy; 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.server.MinecraftServer;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.Level;
public interface IProxy { public interface IProxy {
MinecraftServer getServer(); MinecraftServer getServer();
Player getClientPlayer(); PlayerEntity getClientPlayer();
Level getClientLevel(); ClientWorld getClientLevel();
} }

View File

@ -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.FireflyParticle;
import dev.micle.firefly_bush_backport.particle.ModParticles; import dev.micle.firefly_bush_backport.particle.ModParticles;
import dev.micle.firefly_bush_backport.sound.ModSounds; import dev.micle.firefly_bush_backport.sound.ModSounds;
import net.minecraft.block.ComposterBlock;
import net.minecraft.client.Minecraft; 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.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.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; 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.common.MinecraftForge;
import net.minecraftforge.event.AddReloadListenerEvent; 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.eventbus.api.IEventBus;
import net.minecraftforge.fml.event.lifecycle.*; 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 { public class Proxy implements IProxy {
private static MinecraftServer server = null; private static MinecraftServer server = null;
@ -62,11 +62,11 @@ public class Proxy implements IProxy {
private static void onAddReloadListeners(AddReloadListenerEvent event) {} private static void onAddReloadListeners(AddReloadListenerEvent event) {}
private static void serverStarted(ServerStartedEvent event) { private static void serverStarted(FMLServerStartedEvent event) {
server = event.getServer(); server = event.getServer();
} }
private static void serverStopping(ServerStoppingEvent event) { private static void serverStopping(FMLServerStoppingEvent event) {
server = null; server = null;
} }
@ -76,12 +76,12 @@ public class Proxy implements IProxy {
} }
@Override @Override
public Player getClientPlayer() { public PlayerEntity getClientPlayer() {
return null; return null;
} }
@Override @Override
public Level getClientLevel() { public ClientWorld getClientLevel() {
return null; return null;
} }
@ -100,19 +100,19 @@ public class Proxy implements IProxy {
private static void postSetup(FMLLoadCompleteEvent event) {} 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); event.registerSpriteSet(ModParticles.FIREFLY.get(), FireflyParticle.FireflyProvider::new);
} }
@Override @Override
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public Player getClientPlayer() { public PlayerEntity getClientPlayer() {
return Minecraft.getInstance().player; return Minecraft.getInstance().player;
} }
@Override @Override
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public Level getClientLevel() { public ClientWorld getClientLevel() {
return Minecraft.getInstance().level; return Minecraft.getInstance().level;
} }
} }