Merge pull request 'bug/7-dedicated_server_loading_client_classes' (#8) from bug/7-dedicated_server_loading_client_classes into 1.20.1

Reviewed-on: https://gitea.local.micle.dev/minecraft-mods/xp_tools/pulls/8
This commit is contained in:
2025-05-25 00:52:26 +00:00
2 changed files with 5 additions and 1 deletions

View File

@ -8,6 +8,8 @@ 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.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.event.server.ServerStartedEvent; import net.minecraftforge.event.server.ServerStartedEvent;
@ -83,11 +85,13 @@ public class Proxy implements IProxy {
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
@OnlyIn(Dist.CLIENT)
public Level getClientLevel() { public Level getClientLevel() {
return Minecraft.getInstance().level; return Minecraft.getInstance().level;
} }

View File

@ -12,7 +12,7 @@ displayName = "${mod_name}"
#logoFile="xp_tools.png" #logoFile="xp_tools.png"
#credits="" #credits=""
authors = "${mod_authors}" authors = "${mod_authors}"
#displayTest="MATCH_VERSION" # MATCH_VERSION, IGNORE_SERVER_VERSION (server only), IGNORE_ALL_VERSION (client only), NONE (IExtensionPoint.DisplayTest) displayTest="IGNORE_SERVER_VERSION" # MATCH_VERSION, IGNORE_SERVER_VERSION (server only), IGNORE_ALL_VERSION (client only), NONE (IExtensionPoint.DisplayTest)
description = '''${mod_description}''' description = '''${mod_description}'''
[[dependencies."${mod_id}"]] [[dependencies."${mod_id}"]]