mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-17 10:03:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better handling of internal addon

Browse Source
This commit is contained in:
Zoë Gidiere 2025-07-13 15:47:48 -06:00
parent 8a61571ceb
commit 428bf341ef
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java
View File

@ -108,7 +108,7 @@ public abstract class AbstractPlatform implements Platform {
return Collections.emptySet();
}
protected void load() {
protected InternalAddon load() {
if(LOADED.get()) {
throw new IllegalStateException(
"Someone tried to initialize Terra, but Terra has already initialized. This is most likely due to a broken platform " +
@ -159,6 +159,8 @@ public abstract class AbstractPlatform implements Platform {
logger.info("Terra addons successfully loaded.");
logger.info("Finished initialization.");
return internalAddon;
}
protected InternalAddon loadAddons() {

20
platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSPlatform.java
View File

@ -53,13 +53,6 @@ public class NMSPlatform extends PlatformImpl {
public NMSPlatform(TerraBukkitPlugin plugin) {
super(plugin);
// TODO: Check if there is a better way to handle InternalAddon
this.getEventManager().getHandler(FunctionalEventHandler.class)
.register(new InternalAddon(), PlatformInitializationEvent.class)
.priority(1)
.then(event -> AwfulBukkitHacks.registerBiomes(this.getRawConfigRegistry()))
.global();
Bukkit.getPluginManager().registerEvents(new NMSInjectListener(), plugin);
}
@ -95,6 +88,19 @@ public class NMSPlatform extends PlatformImpl {
.registerLoader(VillagerType.class, VillagerTypeTemplate::new);
}
@Override
protected InternalAddon load() {
InternalAddon internalAddon = super.load();
this.getEventManager().getHandler(FunctionalEventHandler.class)
.register(internalAddon, PlatformInitializationEvent.class)
.priority(1)
.then(event -> AwfulBukkitHacks.registerBiomes(this.getRawConfigRegistry()))
.global();
return internalAddon;
}
@Override
protected Iterable<BaseAddon> platformAddon() {
return List.of(new NMSAddon(this));