Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0

# Conflicts: # build.gradle.kts # buildSrc/src/main/kotlin/DependencyConfig.kt # buildSrc/src/main/kotlin/DistributionConfig.kt # common/addons/biome-provider-image/build.gradle.kts # common/addons/biome-provider-pipeline/build.gradle.kts # common/addons/biome-provider-single/build.gradle.kts # common/addons/chunk-generator-noise-3d/build.gradle.kts # common/addons/command-addons/build.gradle.kts # common/addons/command-packs/build.gradle.kts # common/addons/command-profiler/build.gradle.kts # common/addons/command-structures/build.gradle.kts # common/addons/config-biome/build.gradle.kts # common/addons/config-distributors/build.gradle.kts # common/addons/config-feature/build.gradle.kts # common/addons/config-flora/build.gradle.kts # common/addons/config-locators/build.gradle.kts # common/addons/config-noise-function/build.gradle.kts # common/addons/config-ore/build.gradle.kts # common/addons/config-palette/build.gradle.kts # common/addons/config-structure/build.gradle.kts # common/addons/generation-stage-feature/build.gradle.kts # common/addons/generation-stage-structure/build.gradle.kts # common/addons/language-yaml/build.gradle.kts # common/addons/manifest-addon-loader/build.gradle.kts # common/addons/palette-block-shortcut/build.gradle.kts # common/addons/structure-block-shortcut/build.gradle.kts # common/addons/structure-mutator/build.gradle.kts # common/addons/structure-sponge-loader/build.gradle.kts # common/addons/structure-terrascript-loader/build.gradle.kts # common/addons/terrascript-function-check-noise-3d/build.gradle.kts # common/addons/terrascript-function-sampler/build.gradle.kts # common/api/build.gradle.kts # common/implementation/base/build.gradle.kts # common/implementation/bootstrap-addon-loader/build.gradle.kts # platforms/bukkit/build.gradle.kts # platforms/cli/build.gradle.kts # platforms/merged/build.gradle.kts
2026-04-09 17:26:07 +00:00 · 2022-05-14 12:03:56 -07:00
parent 4396623420 977316c57f
commit 2fe04d7f6b
52 changed files with 255 additions and 153 deletions
--- a/platforms/bukkit/build.gradle.kts
+++ b/platforms/bukkit/build.gradle.kts
@@ -14,7 +14,7 @@ val paperURL = "https://papermc.io/api/v2/projects/paper/versions/%version%/buil
 val purpurURL = "https://api.pl3x.net/v2/purpur/%version%/latest/download"

 dependencies {
-    api(project(":common:implementation:base"))
+    shadedApi(project(":common:implementation:base"))
    
    api("org.slf4j:slf4j-api:1.8.0-beta4") {
        because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.")
@@ -24,11 +24,11 @@ dependencies {
    }
    
    compileOnly("io.papermc.paper", "paper-api", Versions.Bukkit.paper)
-    implementation("io.papermc", "paperlib", Versions.Bukkit.paperLib)
+    shadedApi("io.papermc", "paperlib", Versions.Bukkit.paperLib)
    
-    api("com.google.guava:guava:30.0-jre")
+    shadedApi("com.google.guava:guava:30.0-jre")
    
-    api("cloud.commandframework", "cloud-paper", Versions.Libraries.cloud)
+    shadedApi("cloud.commandframework", "cloud-paper", Versions.Libraries.cloud)
 }

 val jvmFlags = listOf(
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java
@@ -6,6 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;

 import com.dfsek.terra.api.block.entity.BlockEntity;
@@ -29,6 +30,8 @@ public class BukkitProtoWorld implements ProtoWorld {
    private final LimitedRegion delegate;
    private final BlockState air;
    
+    private static final AtomicBoolean warn = new AtomicBoolean(true);
+    
    public BukkitProtoWorld(LimitedRegion delegate, BlockState air) {
        this.delegate = delegate;
        this.air = air;
@@ -114,19 +117,25 @@ public class BukkitProtoWorld implements ProtoWorld {
    private <T> Optional<T> access(int x, int y, int z, Supplier<T> action) {
        if(delegate.isInRegion(x, y, z)) {
            return Optional.of(action.get());
-        } else {
+        } else if(warn.getAndSet(false)) {
            LOGGER.warn("Detected world access at coordinates out of bounds: ({}, {}, {}) accessed for region [{}, {}]", x, y, z,
                        delegate.getCenterChunkX(), delegate.getCenterChunkZ());
-            return Optional.empty();
+        } else {
+            LOGGER.debug("Detected world access at coordinates out of bounds: ({}, {}, {}) accessed for region [{}, {}]", x, y, z,
+                        delegate.getCenterChunkX(), delegate.getCenterChunkZ());
        }
+        return Optional.empty();
    }
    
    private void access(int x, int y, int z, Runnable action) {
        if(delegate.isInRegion(x, y, z)) {
            action.run();
-        } else {
+        } else if(warn.getAndSet(false)) {
            LOGGER.warn("Detected world access at coordinates out of bounds: ({}, {}, {}) accessed for region [{}, {}]", x, y, z,
                        delegate.getCenterChunkX(), delegate.getCenterChunkZ());
+        } else {
+            LOGGER.debug("Detected world access at coordinates out of bounds: ({}, {}, {}) accessed for region [{}, {}]", x, y, z,
+                         delegate.getCenterChunkX(), delegate.getCenterChunkZ());
        }
    }
 }
--- a/platforms/cli/build.gradle.kts
+++ b/platforms/cli/build.gradle.kts
@@ -3,13 +3,13 @@ repositories {
 }

 dependencies {
-    api("commons-io:commons-io:2.6")
-    api("com.github.Querz:NBT:6.1")
-    api(project(":common:implementation:base"))
+    shadedApi("commons-io:commons-io:2.7")
+    shadedApi("com.github.Querz:NBT:6.1")
+    shadedApi(project(":common:implementation:base"))
    
-    implementation("com.google.guava:guava:31.0.1-jre")
+    shadedImplementation("com.google.guava:guava:31.0.1-jre")
    
-    implementation("ch.qos.logback:logback-classic:1.2.7")
+    shadedImplementation("ch.qos.logback:logback-classic:1.2.9")
    
    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
 }
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/DataPackContentsMixin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/DataPackContentsMixin.java
@@ -13,7 +13,9 @@ import com.dfsek.terra.fabric.util.FabricUtil;

@Mixin(DataPackContents.class)
 public class DataPackContentsMixin {
-    
+    /*
+     * #refresh populates all tags in the registries
+     */
    @Inject(method = "refresh(Lnet/minecraft/util/registry/DynamicRegistryManager;)V", at = @At("RETURN"))
    private void injectReload(DynamicRegistryManager dynamicRegistryManager, CallbackInfo ci) {
        FabricUtil.registerTags(dynamicRegistryManager.get(Registry.BIOME_KEY));
--- a/platforms/merged/build.gradle.kts
+++ b/platforms/merged/build.gradle.kts
@@ -3,7 +3,7 @@ val platformOverrides = mapOf(
                             )

 dependencies {
-    api(project(":common:implementation"))
+    api(project(":common:implementation:base"))
 }

 val taskSet = HashSet<AbstractArchiveTask>()