From c36b12e6576868ba1f8ccda5e157aef21144a2fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Sat, 1 Mar 2025 10:48:42 -0700 Subject: [PATCH 1/2] Fix Vanilla Features Spawning in Terra Biomes --- .../com/dfsek/terra/bukkit/nms/v1_21_3/NMSBiomeInjector.java | 3 ++- .../src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/platforms/bukkit/nms/v1_21_3/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_3/NMSBiomeInjector.java b/platforms/bukkit/nms/v1_21_3/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_3/NMSBiomeInjector.java index 37848431a..691790be1 100644 --- a/platforms/bukkit/nms/v1_21_3/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_3/NMSBiomeInjector.java +++ b/platforms/bukkit/nms/v1_21_3/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_3/NMSBiomeInjector.java @@ -4,6 +4,7 @@ import net.minecraft.core.Holder; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.biome.BiomeGenerationSettings; import net.minecraft.world.level.biome.BiomeSpecialEffects; import java.util.Locale; @@ -90,7 +91,7 @@ public class NMSBiomeInjector { return builder .specialEffects(effects.build()) - .generationSettings(vanilla.getGenerationSettings()) + .generationSettings(new BiomeGenerationSettings.PlainBuilder().build()) .build(); } diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java index f40744278..a5b406bf7 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java @@ -17,6 +17,8 @@ import com.dfsek.terra.mod.config.VanillaBiomeProperties; import com.dfsek.terra.mod.mixin.access.BiomeAccessor; import com.dfsek.terra.mod.mixin.invoke.BiomeInvoker; +import net.minecraft.world.biome.GenerationSettings; + public class BiomeUtil { public static final Map> @@ -81,7 +83,7 @@ public class BiomeUtil { return builder .effects(effects.build()) - .generationSettings(vanilla.getGenerationSettings()) + .generationSettings(new GenerationSettings.Builder().build()) .build(); } From 49c6e700372f50f24f38a646ecbe4dc4aa7b72b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Sat, 1 Mar 2025 10:48:58 -0700 Subject: [PATCH 2/2] try catch downloading packs for offline usage --- buildSrc/src/main/kotlin/DistributionConfig.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/kotlin/DistributionConfig.kt b/buildSrc/src/main/kotlin/DistributionConfig.kt index 72a4146f6..65d295aba 100644 --- a/buildSrc/src/main/kotlin/DistributionConfig.kt +++ b/buildSrc/src/main/kotlin/DistributionConfig.kt @@ -47,10 +47,12 @@ fun Project.configureDistribution() { val downloadDefaultPacks = tasks.create("downloadDefaultPacks") { group = "terra" doFirst { - file("${buildDir}/resources/main/packs/").deleteRecursively() - val defaultPackUrl = - URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/" + Versions.Terra.overworldConfig + "/default.zip") - downloadPack(defaultPackUrl, project) + try { + file("${buildDir}/resources/main/packs/").deleteRecursively() + val defaultPackUrl = + URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/" + Versions.Terra.overworldConfig + "/default.zip") + downloadPack(defaultPackUrl, project) + } catch (_:Exception) {} } }