mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-19 11:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev/7.0-2

Browse Source
This commit is contained in:
Zoë Gidiere 2025-07-13 17:03:38 -06:00
commit b9187248c3
2 changed files with 19 additions and 2 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

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

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

@ -2,6 +2,8 @@ package com.dfsek.terra.bukkit.nms.v1_21_7;
import com.dfsek.tectonic.api.TypeRegistry; import com.dfsek.tectonic.api.TypeRegistry;
import com.dfsek.tectonic.api.exception.LoadException; import com.dfsek.tectonic.api.exception.LoadException;
import com.dfsek.terra.addon.InternalAddon;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.Music; import net.minecraft.sounds.Music;
import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvent;
@ -41,7 +43,7 @@ public class NMSPlatform extends PlatformImpl {
public NMSPlatform(TerraBukkitPlugin plugin) { public NMSPlatform(TerraBukkitPlugin plugin) {
super(plugin); super(plugin);
AwfulBukkitHacks.registerBiomes(this.getRawConfigRegistry());
Bukkit.getPluginManager().registerEvents(new NMSInjectListener(), plugin); Bukkit.getPluginManager().registerEvents(new NMSInjectListener(), plugin);
} }
@ -77,6 +79,19 @@ public class NMSPlatform extends PlatformImpl {
.registerLoader(VillagerType.class, VillagerTypeTemplate::new); .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 @Override
protected Iterable<BaseAddon> platformAddon() { protected Iterable<BaseAddon> platformAddon() {
return List.of(new NMSAddon(this)); return List.of(new NMSAddon(this));