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

Reverted changes to comply with build version requirements and avoiding pulling functionality out of a common existing function

Browse Source
This commit is contained in:
ckyuri 2025-04-16 15:54:20 +01:00
parent 9749eecd87
commit 761a014ea5
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
buildSrc/src/main/kotlin/Versions.kt
View File

@ -57,10 +57,7 @@ object Versions {
object Bukkit { object Bukkit {
const val minecraft = "1.21.4" const val minecraft = "1.21.4"
// swapped to use a generic SNAPSHOT instead of a specific timestamp const val paperBuild = "$minecraft-R0.1-20250317.101324-208"
//const val paperBuild = "$minecraft-R0.1-20250317.101324-208"
const val paperBuild = "$minecraft-R0.1-SNAPSHOT"
const val paper = paperBuild const val paper = paperBuild
const val paperLib = "1.0.8" const val paperLib = "1.0.8"
const val reflectionRemapper = "0.1.1" const val reflectionRemapper = "0.1.1"

19
platforms/minestom/src/main/java/com/dfsek/terra/minestom/MinestomPlatform.java
View File

@ -49,21 +49,7 @@ public final class MinestomPlatform extends AbstractPlatform {
@Override @Override
public boolean reload() { public boolean reload() {
getTerraConfig().load(this); getTerraConfig().load(this);
getRawConfigRegistry().clear(); boolean succeed = loadConfigPacks();
try {
getRawConfigRegistry().loadAll(this);
} catch (IOException e) {
LOGGER.error("Failed to load configurations due to I/O error", e);
return false; // reload failed
} catch (PackLoadFailuresException e) {
LOGGER.error("Failed to load configurations due to pack load failures", e);
return false; // reload failed
} catch (Exception e) {
// Catch any other exceptions that might be thrown
LOGGER.error("Failed to load configurations due to unexpected error", e);
return false;
}
MinecraftServer.getInstanceManager().getInstances().forEach(world -> { MinecraftServer.getInstanceManager().getInstances().forEach(world -> {
if(world.generator() instanceof MinestomChunkGeneratorWrapper wrapper) { if(world.generator() instanceof MinestomChunkGeneratorWrapper wrapper) {
@ -74,9 +60,10 @@ public final class MinestomPlatform extends AbstractPlatform {
} }
}); });
return true; return succeed;
} }
@Override @Override
public @NotNull WorldHandle getWorldHandle() { public @NotNull WorldHandle getWorldHandle() {
return worldHandle; return worldHandle;