Compare commits

...

2 Commits

Author SHA1 Message Date
1b3b733457 Changed version to 2.0.1. 2022-01-19 16:12:14 +00:00
ca6691de1a Fixed server crashing on startup. 2022-01-19 16:10:17 +00:00
3 changed files with 10 additions and 6 deletions

View File

@ -7,7 +7,7 @@ modID = totemofreviving
name = Micle's Totem of Reviving name = Micle's Totem of Reviving
author = Micle author = Micle
buildVersion = 2.0.0 buildVersion = 2.0.1
mcVersion = 1.17.1 mcVersion = 1.17.1
forgeVersion = 37.1.1 forgeVersion = 37.1.1

View File

@ -1,13 +1,13 @@
package dev.micle.totemofreviving; package dev.micle.totemofreviving;
import net.minecraft.client.multiplayer.ClientLevel;
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;
public interface ISideProxy { public interface ISideProxy {
MinecraftServer getServer(); MinecraftServer getServer();
Player getClientPlayer(); Player getClientPlayer();
ClientLevel getClientWorld(); Level getClientWorld();
} }

View File

@ -5,9 +5,11 @@ import dev.micle.totemofreviving.data.DataGenerators;
import dev.micle.totemofreviving.network.Network; import dev.micle.totemofreviving.network.Network;
import dev.micle.totemofreviving.setup.Registration; import dev.micle.totemofreviving.setup.Registration;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ClientLevel;
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.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.AddReloadListenerEvent; import net.minecraftforge.event.AddReloadListenerEvent;
import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.IEventBus;
@ -63,7 +65,7 @@ class SideProxy implements ISideProxy {
} }
@Override @Override
public ClientLevel getClientWorld() { public Level getClientWorld() {
return null; return null;
} }
@ -79,12 +81,14 @@ class SideProxy implements ISideProxy {
private static void postSetup(FMLLoadCompleteEvent event) {} private static void postSetup(FMLLoadCompleteEvent event) {}
@Override @Override
@OnlyIn(Dist.CLIENT)
public Player getClientPlayer() { public Player getClientPlayer() {
return Minecraft.getInstance().player; return Minecraft.getInstance().player;
} }
@Override @Override
public ClientLevel getClientWorld() { @OnlyIn(Dist.CLIENT)
public Level getClientWorld() {
return Minecraft.getInstance().level; return Minecraft.getInstance().level;
} }
} }