Remove onEnable, onDisable and onLoad and replace it with lifecycle events

This commit is contained in:
RednedEpic 2022-01-16 18:28:39 -06:00
parent 34d1dfde5e
commit ac134b84f2
6 changed files with 59 additions and 34 deletions

View file

@ -25,10 +25,16 @@
package org.geysermc.geyser.api.event.lifecycle; package org.geysermc.geyser.api.event.lifecycle;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.geysermc.geyser.api.event.Event; import org.geysermc.geyser.api.event.Event;
import org.geysermc.geyser.api.event.EventBus;
import org.geysermc.geyser.api.extension.ExtensionManager;
/** /**
* Called when Geyser has completed initializing. * Called when Geyser has completed initializing.
*
* @param extensionManager the extension manager
* @param eventBus the event bus
*/ */
public class GeyserPostInitializeEvent implements Event { public record GeyserPostInitializeEvent(@NonNull ExtensionManager extensionManager, @NonNull EventBus eventBus) implements Event {
} }

View file

@ -0,0 +1,40 @@
/*
* Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* @author GeyserMC
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.geyser.api.event.lifecycle;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.geysermc.geyser.api.event.Event;
import org.geysermc.geyser.api.event.EventBus;
import org.geysermc.geyser.api.extension.ExtensionManager;
/**
* Called when Geyser is starting to initialize.
*
* @param extensionManager the extension manager
* @param eventBus the event bus
*/
public record GeyserPreInitializeEvent(@NonNull ExtensionManager extensionManager, @NonNull EventBus eventBus) implements Event {
}

View file

@ -25,10 +25,14 @@
package org.geysermc.geyser.api.event.lifecycle; package org.geysermc.geyser.api.event.lifecycle;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.geysermc.geyser.api.command.CommandManager;
import org.geysermc.geyser.api.event.Event; import org.geysermc.geyser.api.event.Event;
import org.geysermc.geyser.api.event.EventBus;
import org.geysermc.geyser.api.extension.ExtensionManager;
/** /**
* Called when Geyser is shutting down. * Called when Geyser is shutting down.
*/ */
public class GeyserShutdownEvent implements Event { public record GeyserShutdownEvent(@NonNull ExtensionManager extensionManager, @NonNull CommandManager commandManager, @NonNull EventBus eventBus) implements Event {
} }

View file

@ -36,24 +36,6 @@ import java.nio.file.Path;
*/ */
public interface Extension { public interface Extension {
/**
* Called when the extension is loaded
*/
default void onLoad() {
}
/**
* Called when the extension is enabled
*/
default void onEnable() {
}
/**
* Called when the extension is disabled
*/
default void onDisable() {
}
/** /**
* Gets if the extension is enabled * Gets if the extension is enabled
* *

View file

@ -51,6 +51,7 @@ import org.geysermc.floodgate.news.NewsItemAction;
import org.geysermc.geyser.api.GeyserApi; import org.geysermc.geyser.api.GeyserApi;
import org.geysermc.geyser.api.event.EventBus; import org.geysermc.geyser.api.event.EventBus;
import org.geysermc.geyser.api.event.lifecycle.GeyserPostInitializeEvent; import org.geysermc.geyser.api.event.lifecycle.GeyserPostInitializeEvent;
import org.geysermc.geyser.api.event.lifecycle.GeyserPreInitializeEvent;
import org.geysermc.geyser.api.event.lifecycle.GeyserShutdownEvent; import org.geysermc.geyser.api.event.lifecycle.GeyserShutdownEvent;
import org.geysermc.geyser.command.GeyserCommandManager; import org.geysermc.geyser.command.GeyserCommandManager;
import org.geysermc.geyser.configuration.GeyserConfiguration; import org.geysermc.geyser.configuration.GeyserConfiguration;
@ -167,6 +168,8 @@ public class GeyserImpl implements GeyserApi {
this.extensionManager = new GeyserExtensionManager(); this.extensionManager = new GeyserExtensionManager();
this.extensionManager.init(); this.extensionManager.init();
this.eventBus.fire(new GeyserPreInitializeEvent(this.extensionManager, this.eventBus));
start(); start();
GeyserConfiguration config = bootstrap.getGeyserConfig(); GeyserConfiguration config = bootstrap.getGeyserConfig();
@ -418,7 +421,7 @@ public class GeyserImpl implements GeyserApi {
newsHandler.handleNews(null, NewsItemAction.ON_SERVER_STARTED); newsHandler.handleNews(null, NewsItemAction.ON_SERVER_STARTED);
this.eventBus.fire(new GeyserPostInitializeEvent()); this.eventBus.fire(new GeyserPostInitializeEvent(this.extensionManager, this.eventBus));
} }
@Override @Override
@ -474,7 +477,7 @@ public class GeyserImpl implements GeyserApi {
ResourcePack.PACKS.clear(); ResourcePack.PACKS.clear();
this.eventBus.fire(new GeyserShutdownEvent()); this.eventBus.fire(new GeyserShutdownEvent(this.extensionManager, this.commandManager(), this.eventBus));
this.extensionManager.disableExtensions(); this.extensionManager.disableExtensions();
bootstrap.getGeyserLogger().info(GeyserLocale.getLocaleStringLog("geyser.core.shutdown.done")); bootstrap.getGeyserLogger().info(GeyserLocale.getLocaleStringLog("geyser.core.shutdown.done"));

View file

@ -90,9 +90,7 @@ public class GeyserExtensionLoader extends ExtensionLoader {
private GeyserExtensionContainer setup(Extension extension, GeyserExtensionDescription description, Path dataFolder, ExtensionEventBus eventBus) { private GeyserExtensionContainer setup(Extension extension, GeyserExtensionDescription description, Path dataFolder, ExtensionEventBus eventBus) {
GeyserExtensionLogger logger = new GeyserExtensionLogger(GeyserImpl.getInstance().getLogger(), description.name()); GeyserExtensionLogger logger = new GeyserExtensionLogger(GeyserImpl.getInstance().getLogger(), description.name());
GeyserExtensionContainer container = new GeyserExtensionContainer(extension, dataFolder, description, this, logger, eventBus); return new GeyserExtensionContainer(extension, dataFolder, description, this, logger, eventBus);
extension.onLoad();
return container;
} }
public GeyserExtensionDescription extensionDescription(Path path) throws InvalidDescriptionException { public GeyserExtensionDescription extensionDescription(Path path) throws InvalidDescriptionException {
@ -225,15 +223,7 @@ public class GeyserExtensionLoader extends ExtensionLoader {
@Override @Override
protected void setEnabled(@NonNull Extension extension, boolean enabled) { protected void setEnabled(@NonNull Extension extension, boolean enabled) {
boolean isEnabled = this.extensionContainers.get(extension).enabled;
if (isEnabled != enabled) {
this.extensionContainers.get(extension).enabled = enabled; this.extensionContainers.get(extension).enabled = enabled;
if (enabled) {
extension.onEnable();
} else {
extension.onDisable();
}
}
} }
@NonNull @NonNull