mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-19 07:11:14 +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-03-01 14:36:04 -07:00
parent 8ffb09db36 49c6e70037
commit d2b7384639
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/DistributionConfig.kt
+2
View File
@@ -47,10 +47,12 @@ fun Project.configureDistribution() {
val downloadDefaultPacks = tasks.create("downloadDefaultPacks") { val downloadDefaultPacks = tasks.create("downloadDefaultPacks") {
group = "terra" group = "terra"
doFirst { doFirst {
try {
file("${buildDir}/resources/main/packs/").deleteRecursively() file("${buildDir}/resources/main/packs/").deleteRecursively()
val defaultPackUrl = val defaultPackUrl =
URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/" + Versions.Terra.overworldConfig + "/default.zip") URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/" + Versions.Terra.overworldConfig + "/default.zip")
downloadPack(defaultPackUrl, project) downloadPack(defaultPackUrl, project)
} catch (_:Exception) {}
} }
} }
platforms/bukkit/nms/v1_21_3/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_3/NMSBiomeInjector.java
+2 -1
View File
@@ -4,6 +4,7 @@ import net.minecraft.core.Holder;
import net.minecraft.core.Registry; import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.biome.BiomeGenerationSettings;
import net.minecraft.world.level.biome.BiomeSpecialEffects; import net.minecraft.world.level.biome.BiomeSpecialEffects;
import java.util.Locale; import java.util.Locale;
@@ -90,7 +91,7 @@ public class NMSBiomeInjector {
return builder return builder
.specialEffects(effects.build()) .specialEffects(effects.build())
.generationSettings(vanilla.getGenerationSettings()) .generationSettings(new BiomeGenerationSettings.PlainBuilder().build())
.build(); .build();
} }
platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java
+3 -1
View File
@@ -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.access.BiomeAccessor;
import com.dfsek.terra.mod.mixin.invoke.BiomeInvoker; import com.dfsek.terra.mod.mixin.invoke.BiomeInvoker;
import net.minecraft.world.biome.GenerationSettings;
public class BiomeUtil { public class BiomeUtil {
public static final Map<Identifier, List<Identifier>> public static final Map<Identifier, List<Identifier>>
@@ -81,7 +83,7 @@ public class BiomeUtil {
return builder return builder
.effects(effects.build()) .effects(effects.build())
.generationSettings(vanilla.getGenerationSettings()) .generationSettings(new GenerationSettings.Builder().build())
.build(); .build();
} }