mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-02-16 02:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev/7.0-2

Browse Source
This commit is contained in:
Zoë Gidiere
2025-06-18 11:20:58 -06:00
parent a25e3cd5a5 68d5b22ca4
commit 16755fa049
10 changed files with 83 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
buildSrc/src/main/kotlin/DependencyConfig.kt
View File

@@ -66,11 +66,8 @@ fun Project.configureDependencies() {
maven("https://storehouse.okaeri.eu/repository/maven-public/") {
name = "Okaeri"
}
maven("https://maven.solo-studios.ca/releases") {
name = "Solo Studios"
}
maven("https://maven.solo-studios.ca/snapshots") {
name = "Solo Studios"
maven("https://repo.onarandombox.com/multiverse-releases") {
name = "onarandombox"
}
}

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

@@ -1,6 +1,6 @@
object Versions {
object Terra {
const val overworldConfig = "v1.5.1"
const val overworldConfig = "v1.5.2"
}
object Libraries {
@@ -66,6 +66,7 @@ object Versions {
const val runPaper = "2.3.1"
const val paperWeight = "2.0.0-beta.17"
const val cloud = "2.0.0-beta.10"
const val multiverse = "5.0.2"
}
//

2
platforms/bukkit/common/build.gradle.kts
View File

@@ -7,6 +7,8 @@ dependencies {
compileOnly("io.papermc.paper", "paper-api", Versions.Bukkit.paper)
compileOnly("org.mvplugins.multiverse.core", "multiverse-core", Versions.Bukkit.multiverse)
shadedApi("io.papermc", "paperlib", Versions.Bukkit.paperLib)
shadedApi("com.google.guava", "guava", Versions.Libraries.Internal.guava)

2
platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
View File

@@ -87,7 +87,7 @@ public class TerraBukkitPlugin extends JavaPlugin {
return;
}
Bukkit.getPluginManager().registerEvents(new CommonListener(), this); // Register master event listener
Bukkit.getPluginManager().registerEvents(new CommonListener(platform), this); // Register master event listener
PaperUtil.checkPaper(this);
}

47
platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/hooks/MultiverseGeneratorPluginHook.java Normal file
View File

@@ -0,0 +1,47 @@
package com.dfsek.terra.bukkit.hooks;
import com.dfsek.terra.api.Platform;
import com.dfsek.terra.api.registry.key.Keyed;
import org.mvplugins.multiverse.core.world.generators.GeneratorPlugin;
import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
import org.mvplugins.multiverse.external.jetbrains.annotations.Nullable;
import java.util.Collection;
public final class MultiverseGeneratorPluginHook implements GeneratorPlugin {
private final Platform platform;
public MultiverseGeneratorPluginHook(Platform platform) {
this.platform = platform;
}
@Override
public @NotNull Collection<String> suggestIds(@Nullable String s) {
return platform.getConfigRegistry().entries().stream()
.map(Keyed::getID)
.toList();
}
@Override
public @Nullable Collection<String> getExampleUsages() {
return platform.getConfigRegistry()
.entries()
.stream()
.map(Keyed::getID)
.map("/mv create example_world NORMAL -g Terra:%s"::formatted)
.limit(5) // reasonable amount
.toList();
}
@Override
public @Nullable String getInfoLink() {
return "https://terra.polydev.org/";
}
@Override
public @NotNull String getPluginName() {
return "Terra";
}
}

29
platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java
View File

@@ -17,13 +17,40 @@
package com.dfsek.terra.bukkit.listeners;
import com.dfsek.terra.api.Platform;
import com.dfsek.terra.bukkit.hooks.MultiverseGeneratorPluginHook;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.server.PluginEnableEvent;
import org.mvplugins.multiverse.core.MultiverseCoreApi;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Listener for events on all implementations.
*/
public class CommonListener implements Listener {
public CommonListener() {
private static final Logger logger = LoggerFactory.getLogger(CommonListener.class);
private final Platform platform;
public CommonListener(Platform platform) {
this.platform = platform;
}
@EventHandler
public void onPluginEnable(PluginEnableEvent event) {
if(event.getPlugin().getName().equals("Multiverse-Core")) {
try {
Class.forName("org.mvplugins.multiverse.core.MultiverseCoreApi");
MultiverseCoreApi.get().getGeneratorProvider()
.registerGeneratorPlugin(new MultiverseGeneratorPluginHook(platform));
} catch(ClassNotFoundException e) {
logger.debug("Multiverse v5 is not installed.");
} catch(IllegalStateException e) {
logger.error("Failed to register Terra generator plugin to multiverse.", e);
}
}
}
}

2
platforms/fabric/src/main/resources/fabric.mod.json
View File

@@ -35,7 +35,7 @@
"depends": {
"fabricloader": ">=0.16.10",
"java": ">=21",
"minecraft": ">=1.21.5",
"minecraft": ">=1.21.6",
"fabric": "*"
}
}

2
platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java
View File

@@ -19,8 +19,6 @@ import java.net.Proxy;
import com.dfsek.terra.lifecycle.LifecyclePlatform;
import static com.dfsek.terra.lifecycle.util.LifecycleUtil.initialized;
@Mixin(MinecraftServer.class)
public class MinecraftServerMixin {

2
platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/RegistryLoaderMixin.java
View File

@@ -49,8 +49,6 @@ import com.dfsek.terra.lifecycle.LifecyclePlatform;
import com.dfsek.terra.lifecycle.util.LifecycleUtil;
import com.dfsek.terra.lifecycle.util.RegistryHack;
import static com.dfsek.terra.lifecycle.util.LifecycleUtil.initialized;
@Mixin(RegistryLoader.class)
public class RegistryLoaderMixin {

2
platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleUtil.java
View File

@@ -12,8 +12,6 @@ import com.dfsek.terra.mod.CommonPlatform;
public final class LifecycleUtil {
public static boolean initialized = false;
private LifecycleUtil() {
}