GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2026-01-06 15:41:50 +00:00
Code Issues Releases Activity

Only register commands on Spigot if the extension has commands

Browse Source
This commit is contained in:
Camotoy
2022-09-14 14:19:56 -04:00
parent a99afe4418
commit 6df8740955
7 changed files with 21 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/org/geysermc/geyser/GeyserImpl.java
View File

@@ -147,7 +147,7 @@ public class GeyserImpl implements GeyserApi {
private final GeyserBootstrap bootstrap;
private final EventBus<EventRegistrar> eventBus;
private GeyserExtensionManager extensionManager;
private final GeyserExtensionManager extensionManager;
private Metrics metrics;
@@ -173,6 +173,7 @@ public class GeyserImpl implements GeyserApi {
/* Load Extensions */
this.extensionManager = new GeyserExtensionManager();
this.extensionManager.init();
this.eventBus.fire(new GeyserPreInitializeEvent(this.extensionManager, this.eventBus));
}
public void initialize() {
@@ -186,11 +187,6 @@ public class GeyserImpl implements GeyserApi {
logger.info("");
logger.info("******************************************");
/* Enable extensions */
this.extensionManager.enableExtensions();
this.eventBus.fire(new GeyserPreInitializeEvent(this.extensionManager, this.eventBus));
/* Initialize registries */
Registries.init();
BlockRegistries.init();

3
core/src/main/java/org/geysermc/geyser/command/GeyserCommand.java
View File

@@ -33,7 +33,6 @@ import org.geysermc.geyser.api.command.Command;
import org.geysermc.geyser.session.GeyserSession;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -49,7 +48,7 @@ public abstract class GeyserCommand implements Command {
protected final String description;
protected final String permission;
private List<String> aliases = new ArrayList<>();
private List<String> aliases = Collections.emptyList();
public abstract void execute(@Nullable GeyserSession session, GeyserCommandSource sender, String[] args);

45
core/src/main/java/org/geysermc/geyser/extension/GeyserExtensionManager.java
View File

@@ -25,8 +25,6 @@
package org.geysermc.geyser.extension;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import net.kyori.adventure.key.Key;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.geysermc.geyser.GeyserImpl;
@@ -39,34 +37,23 @@ import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.stream.Collectors;
public class GeyserExtensionManager extends ExtensionManager {
private static final Key BASE_EXTENSION_LOADER_KEY = Key.key("geysermc", "base");
private final Map<Key, ExtensionLoader> extensionLoaderTypes = new Object2ObjectOpenHashMap<>();
private final GeyserExtensionLoader extensionLoader = new GeyserExtensionLoader();
private final Map<String, Extension> extensions = new LinkedHashMap<>();
private final Map<Extension, ExtensionLoader> extensionsLoaders = new LinkedHashMap<>();
public void init() {
GeyserImpl.getInstance().getLogger().info(GeyserLocale.getLocaleStringLog("geyser.extensions.load.loading"));
extensionLoaderTypes.put(BASE_EXTENSION_LOADER_KEY, new GeyserExtensionLoader());
for (ExtensionLoader loader : this.extensionLoaders().values()) {
this.loadAllExtensions(loader);
}
loadAllExtensions(this.extensionLoader);
enableExtensions();
GeyserImpl.getInstance().getLogger().info(GeyserLocale.getLocaleStringLog("geyser.extensions.load.done", this.extensions.size()));
}
@Override
public Extension extension(@NonNull String name) {
if (this.extensions.containsKey(name)) {
return this.extensions.get(name);
}
return null;
return this.extensions.get(name);
}
@Override
@@ -121,37 +108,19 @@ public class GeyserExtensionManager extends ExtensionManager {
}
}
@Override
public ExtensionLoader extensionLoader(@NonNull Extension extension) {
return this.extensionsLoaders.get(extension);
}
@NonNull
@Override
public Collection<Extension> extensions() {
return Collections.unmodifiableCollection(this.extensions.values());
}
@Nullable
@Override
public ExtensionLoader extensionLoader(@NonNull String identifier) {
return this.extensionLoaderTypes.get(Key.key(identifier));
public @Nullable ExtensionLoader extensionLoader() {
return this.extensionLoader;
}
@Override
public void registerExtensionLoader(@NonNull String identifier, @NonNull ExtensionLoader extensionLoader) {
this.extensionLoaderTypes.put(Key.key(identifier), extensionLoader);
}
@NonNull
@Override
public Map<String, ExtensionLoader> extensionLoaders() {
return this.extensionLoaderTypes.entrySet().stream().collect(Collectors.toMap(key -> key.getKey().asString(), Map.Entry::getValue));
}
@Override
public void register(@NonNull Extension extension, @NonNull ExtensionLoader loader) {
this.extensionsLoaders.put(extension, loader);
public void register(@NonNull Extension extension) {
this.extensions.put(extension.name(), extension);
}
}