GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

Move command registry creation to mod init on fabric

This commit is contained in:
Konicai 2023-09-03 23:16:16 -04:00
parent 1eba87d4e2
commit c7826b5e73
No known key found for this signature in database
GPG Key ID: 710D09287708C823
1 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bootstrap/fabric/src/main/java/org/geysermc/geyser/platform/fabric/GeyserFabricMod.java
View File

@ -68,14 +68,11 @@ import java.util.UUID;
public class GeyserFabricMod implements ModInitializer, GeyserBootstrap {
private static GeyserFabricMod INSTANCE;
private boolean reloading;
private GeyserImpl geyser;
private ModContainer mod;
private Path dataFolder;
private MinecraftServer server;
private CommandManager<GeyserCommandSource> cloud;
private CommandRegistry commandRegistry;
private GeyserFabricConfiguration geyserConfig;
private GeyserFabricLogger geyserLogger;
@ -123,8 +120,7 @@ public class GeyserFabricMod implements ModInitializer, GeyserBootstrap {
if (server != null) {
// Server has started and this is a reload
startGeyser(this.server);
reloading = false;
startGeyser(server);
return;
}
@ -134,20 +130,18 @@ public class GeyserFabricMod implements ModInitializer, GeyserBootstrap {
ServerPlayConnectionEvents.JOIN.register((handler, $, $$) -> GeyserFabricUpdateListener.onPlayReady(handler));
// Cloud requires the command manager itself to be created during mod init
var sourceConverter = CommandSourceConverter.layered(
CommandSourceStack.class,
id -> server.getPlayerList().getPlayer(id),
Player::createCommandSourceStack,
() -> server.createCommandSourceStack() // note: method reference here will cause NPE
);
cloud = new FabricServerCommandManager<>(
CommandManager<GeyserCommandSource> cloud = new FabricServerCommandManager<>(
CommandExecutionCoordinator.simpleCoordinator(),
FabricCommandSource::new,
sourceConverter::convert
);
// Geyser registers commands after the server has started
cloud.setSetting(CommandManager.ManagerSettings.ALLOW_UNSAFE_REGISTRATION, true);
commandRegistry = new CommandRegistry(geyser, cloud);
}
/**
@ -163,22 +157,6 @@ public class GeyserFabricMod implements ModInitializer, GeyserBootstrap {
this.geyserPingPassthrough = GeyserLegacyPingPassthrough.init(geyser);
this.geyserWorldManager = new GeyserFabricWorldManager(server);
this.commandRegistry = new CommandRegistry(geyser, cloud);
// the minecraft command dispatcher can be rebuilt at any time, at which point CommandRegistrationCallback.EVENT is fired.
// the dispatcher is initially created after mod init but before the server starts.
// that event is not required to register commands, but cloud uses it so that commands are properly
// registered anytime the dispatcher is rebuilt.
// we just registered commands to cloud, after the server started, meaning we missed the initial registration event.
// this means cloud didn't register the commands to the server
// hack: we now trigger a resource reload so that the dispatcher is rebuilt, the event is fired, and cloud registers the commands.
geyserLogger.info("Reloading resources so that Geyser commands can be successfully registered");
try {
server.getCommands().getDispatcher().execute("reload", server.createCommandSourceStack());
} catch (CommandSyntaxException e) {
geyserLogger.error("Failed to reload in order to register commands", e);
}
}
@Override
@ -187,9 +165,6 @@ public class GeyserFabricMod implements ModInitializer, GeyserBootstrap {
geyser.shutdown();
geyser = null;
}
if (!reloading) {
this.server = null;
}
}
@Override
@ -273,10 +248,6 @@ public class GeyserFabricMod implements ModInitializer, GeyserBootstrap {
}
}
public void setReloading(boolean reloading) {
this.reloading = reloading; // todo: commands
}
public static GeyserFabricMod getInstance() {
return INSTANCE;
}