Convert to Mojmap.

Author: gniftygnome

build.gradle

@@ -14,11 +14,7 @@ subprojects {
 
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        mappings loom.layered {
-            it.mappings("net.fabricmc:yarn:${rootProject.yarn_mappings}:v2")
-            it.mappings("dev.architectury:yarn-mappings-patch-forge:1.21.9+build.6")
-            it.mappings("dev.architectury:yarn-mappings-patch-neoforge:1.21+build.4")
-        }
+        mappings loom.officialMojangMappings()
     }
 }
 

common/src/main/java/com/terraformersmc/biolith/api/biome/BiolithFittestNodes.java

@@ -1,18 +1,18 @@
 package com.terraformersmc.biolith.api.biome;
 
-import net.minecraft.world.biome.source.util.MultiNoiseUtil;
+import net.minecraft.world.level.biome.Climate;
 
 @SuppressWarnings("unused")
-public record BiolithFittestNodes<T>(MultiNoiseUtil.SearchTree.TreeLeafNode<T> ultimate, long ultimateDistance, MultiNoiseUtil.SearchTree.TreeLeafNode<T> penultimate, long penultimateDistance) {
-    public BiolithFittestNodes(MultiNoiseUtil.SearchTree.TreeLeafNode<T> ultimate, long ultimateDistance) {
+public record BiolithFittestNodes<T>(Climate.RTree.Leaf<T> ultimate, long ultimateDistance, Climate.RTree.Leaf<T> penultimate, long penultimateDistance) {
+    public BiolithFittestNodes(Climate.RTree.Leaf<T> ultimate, long ultimateDistance) {
         this(ultimate, ultimateDistance, null, Long.MAX_VALUE);
     }
 
-    public BiolithFittestNodes<T> of(MultiNoiseUtil.SearchTree.TreeLeafNode<T> ultimate, long ultimateDistance, MultiNoiseUtil.SearchTree.TreeLeafNode<T> penultimate, long penultimateDistance) {
+    public BiolithFittestNodes<T> of(Climate.RTree.Leaf<T> ultimate, long ultimateDistance, Climate.RTree.Leaf<T> penultimate, long penultimateDistance) {
         return new BiolithFittestNodes<>(ultimate, ultimateDistance, penultimate, penultimateDistance);
     }
 
-    public BiolithFittestNodes<T> withPenultimate(MultiNoiseUtil.SearchTree.TreeLeafNode<T> penultimate, long penultimateDistance) {
+    public BiolithFittestNodes<T> withPenultimate(Climate.RTree.Leaf<T> penultimate, long penultimateDistance) {
         return new BiolithFittestNodes<>(ultimate, ultimateDistance, penultimate, penultimateDistance);
     }
 }

common/src/main/java/com/terraformersmc/biolith/api/biome/BiomePlacement.java

@@ -2,9 +2,9 @@
 
 import com.terraformersmc.biolith.api.biome.sub.Criterion;
 import com.terraformersmc.biolith.impl.biome.BiomeCoordinator;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.biome.source.util.MultiNoiseUtil;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.Climate;
 
 @SuppressWarnings("unused")
 public final class BiomePlacement {
@@ -18,7 +18,7 @@ private BiomePlacement() {
      * @param biome      The biome to be placed
      * @param noisePoint A multi-noise point at which to place the biome
      */
-    public static void addEnd(RegistryKey<Biome> biome, MultiNoiseUtil.NoiseHypercube noisePoint) {
+    public static void addEnd(ResourceKey<Biome> biome, Climate.ParameterPoint noisePoint) {
         BiomeCoordinator.END.addPlacement(biome, noisePoint, false);
     }
 
@@ -28,7 +28,7 @@ public static void addEnd(RegistryKey<Biome> biome, MultiNoiseUtil.NoiseHypercub
      * @param biome      The biome to be placed
      * @param noisePoint A multi-noise point at which to place the biome
      */
-    public static void addNether(RegistryKey<Biome> biome, MultiNoiseUtil.NoiseHypercube noisePoint) {
+    public static void addNether(ResourceKey<Biome> biome, Climate.ParameterPoint noisePoint) {
         BiomeCoordinator.NETHER.addPlacement(biome, noisePoint, false);
     }
 
@@ -38,7 +38,7 @@ public static void addNether(RegistryKey<Biome> biome, MultiNoiseUtil.NoiseHyper
      * @param biome      The biome to be placed
      * @param noisePoint A multi-noise point at which to place the biome
      */
-    public static void addOverworld(RegistryKey<Biome> biome, MultiNoiseUtil.NoiseHypercube noisePoint) {
+    public static void addOverworld(ResourceKey<Biome> biome, Climate.ParameterPoint noisePoint) {
         BiomeCoordinator.OVERWORLD.addPlacement(biome, noisePoint, false);
     }
 
@@ -48,7 +48,7 @@ public static void addOverworld(RegistryKey<Biome> biome, MultiNoiseUtil.NoiseHy
      *
      * @param biome The biome to be removed
      */
-    public static void removeEnd(RegistryKey<Biome> biome) {
+    public static void removeEnd(ResourceKey<Biome> biome) {
         BiomeCoordinator.END.addRemoval(biome, false);
     }
 
@@ -57,7 +57,7 @@ public static void removeEnd(RegistryKey<Biome> biome) {
      *
      * @param biome The biome to be removed
      */
-    public static void removeNether(RegistryKey<Biome> biome) {
+    public static void removeNether(ResourceKey<Biome> biome) {
         BiomeCoordinator.NETHER.addRemoval(biome, false);
     }
 
@@ -66,7 +66,7 @@ public static void removeNether(RegistryKey<Biome> biome) {
      *
      * @param biome The biome to be placed
      */
-    public static void removeOverworld(RegistryKey<Biome> biome) {
+    public static void removeOverworld(ResourceKey<Biome> biome) {
         BiomeCoordinator.OVERWORLD.addRemoval(biome, false);
     }
 
@@ -77,7 +77,7 @@ public static void removeOverworld(RegistryKey<Biome> biome) {
      * @param target The biome to be replaced
      * @param biome  The replacement biome
      */
-    public static void replaceEnd(RegistryKey<Biome> target, RegistryKey<Biome> biome) {
+    public static void replaceEnd(ResourceKey<Biome> target, ResourceKey<Biome> biome) {
         BiomeCoordinator.END.addReplacement(target, biome, 1.0D, false);
     }
 
@@ -89,7 +89,7 @@ public static void replaceEnd(RegistryKey<Biome> target, RegistryKey<Biome> biom
      * @param biome      The replacement biome
      * @param proportion Approximate fraction of the target biome's volume to replace
      */
-    public static void replaceEnd(RegistryKey<Biome> target, RegistryKey<Biome> biome, double proportion) {
+    public static void replaceEnd(ResourceKey<Biome> target, ResourceKey<Biome> biome, double proportion) {
         BiomeCoordinator.END.addReplacement(target, biome, proportion, false);
     }
 
@@ -99,7 +99,7 @@ public static void replaceEnd(RegistryKey<Biome> target, RegistryKey<Biome> biom
      * @param target The biome to be replaced
      * @param biome  The replacement biome
      */
-    public static void replaceNether(RegistryKey<Biome> target, RegistryKey<Biome> biome) {
+    public static void replaceNether(ResourceKey<Biome> target, ResourceKey<Biome> biome) {
         BiomeCoordinator.NETHER.addReplacement(target, biome, 1.0D, false);
     }
 
@@ -111,7 +111,7 @@ public static void replaceNether(RegistryKey<Biome> target, RegistryKey<Biome> b
      * @param biome      The replacement biome
      * @param proportion Approximate fraction of the target biome's volume to replace
      */
-    public static void replaceNether(RegistryKey<Biome> target, RegistryKey<Biome> biome, double proportion) {
+    public static void replaceNether(ResourceKey<Biome> target, ResourceKey<Biome> biome, double proportion) {
         BiomeCoordinator.NETHER.addReplacement(target, biome, proportion, false);
     }
 
@@ -121,7 +121,7 @@ public static void replaceNether(RegistryKey<Biome> target, RegistryKey<Biome> b
      * @param target The biome to be replaced
      * @param biome  The replacement biome
      */
-    public static void replaceOverworld(RegistryKey<Biome> target, RegistryKey<Biome> biome) {
+    public static void replaceOverworld(ResourceKey<Biome> target, ResourceKey<Biome> biome) {
         BiomeCoordinator.OVERWORLD.addReplacement(target, biome, 1.0D, false);
     }
 
@@ -133,7 +133,7 @@ public static void replaceOverworld(RegistryKey<Biome> target, RegistryKey<Biome
      * @param biome      The replacement biome
      * @param proportion Approximate fraction of the target biome's volume to replace
      */
-    public static void replaceOverworld(RegistryKey<Biome> target, RegistryKey<Biome> biome, double proportion) {
+    public static void replaceOverworld(ResourceKey<Biome> target, ResourceKey<Biome> biome, double proportion) {
         BiomeCoordinator.OVERWORLD.addReplacement(target, biome, proportion, false);
     }
 
@@ -146,7 +146,7 @@ public static void replaceOverworld(RegistryKey<Biome> target, RegistryKey<Biome
      * @param biome   The replacement biome
      * @param criterion Matching criteria for when to replace
      */
-    public static void addSubEnd(RegistryKey<Biome> target, RegistryKey<Biome> biome, Criterion criterion) {
+    public static void addSubEnd(ResourceKey<Biome> target, ResourceKey<Biome> biome, Criterion criterion) {
         BiomeCoordinator.END.addSubBiome(target, biome, criterion, false);
     }
 
@@ -158,7 +158,7 @@ public static void addSubEnd(RegistryKey<Biome> target, RegistryKey<Biome> biome
      * @param biome   The replacement biome
      * @param criterion Matching criteria for when to replace
      */
-    public static void addSubNether(RegistryKey<Biome> target, RegistryKey<Biome> biome, Criterion criterion) {
+    public static void addSubNether(ResourceKey<Biome> target, ResourceKey<Biome> biome, Criterion criterion) {
         BiomeCoordinator.NETHER.addSubBiome(target, biome, criterion, false);
     }
 
@@ -170,7 +170,7 @@ public static void addSubNether(RegistryKey<Biome> target, RegistryKey<Biome> bi
      * @param biome   The replacement biome
      * @param criterion Matching criteria for when to replace
      */
-    public static void addSubOverworld(RegistryKey<Biome> target, RegistryKey<Biome> biome, Criterion criterion) {
+    public static void addSubOverworld(ResourceKey<Biome> target, ResourceKey<Biome> biome, Criterion criterion) {
         BiomeCoordinator.OVERWORLD.addSubBiome(target, biome, criterion, false);
     }
 }

common/src/main/java/com/terraformersmc/biolith/api/biome/sub/BiomeParameterTargets.java

@@ -2,11 +2,11 @@
 
 import com.mojang.serialization.Codec;
 import com.terraformersmc.biolith.impl.biome.DimensionBiomePlacement;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.util.StringIdentifiable;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.biome.source.BiomeCoords;
-import net.minecraft.world.biome.source.util.MultiNoiseUtil;
+import net.minecraft.core.QuartPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.util.Mth;
+import net.minecraft.util.StringRepresentable;
+import net.minecraft.world.level.biome.Climate;
 
 /**
  * Available noise values in the {@link BiomeParameterTargets} enum:
@@ -21,7 +21,7 @@
  * <li>WEIRDNESS</li>
  * </ul>
  */
-public enum BiomeParameterTargets implements StringIdentifiable {
+public enum BiomeParameterTargets implements StringRepresentable {
     /*
      * Do not add before or modify the order of the first six names;
      * they must be in the same order as Mojang's parameter arrays.
@@ -36,33 +36,33 @@ public enum BiomeParameterTargets implements StringIdentifiable {
     PEAKS_VALLEYS("peaks_valleys"),
     DEPTH_OCEAN("depth_ocean");
 
-    public static final Codec<BiomeParameterTargets> CODEC = StringIdentifiable.createCodec(BiomeParameterTargets::values);
+    public static final Codec<BiomeParameterTargets> CODEC = StringRepresentable.fromEnum(BiomeParameterTargets::values);
     private final String name;
 
     BiomeParameterTargets(String name) {
         this.name = name;
     }
 
     /**
-     * @param noisePoint A {@link MultiNoiseUtil.NoiseValuePoint} from which to select a value
+     * @param noisePoint A {@link Climate.TargetPoint} from which to select a value
      * @return The noise value selected by this parameter target (long-type, not float-type)
      */
-    public long getNoiseValue(MultiNoiseUtil.NoiseValuePoint noisePoint) {
+    public long getNoiseValue(Climate.TargetPoint noisePoint) {
         return
             switch (this) {
-                case TEMPERATURE -> noisePoint.temperatureNoise();
-                case HUMIDITY -> noisePoint.humidityNoise();
-                case CONTINENTALNESS -> noisePoint.continentalnessNoise();
-                case EROSION -> noisePoint.erosionNoise();
+                case TEMPERATURE -> noisePoint.temperature();
+                case HUMIDITY -> noisePoint.humidity();
+                case CONTINENTALNESS -> noisePoint.continentalness();
+                case EROSION -> noisePoint.erosion();
                 case DEPTH -> noisePoint.depth();
-                case WEIRDNESS -> noisePoint.weirdnessNoise();
-                case PEAKS_VALLEYS -> BiomeParameterTargets.getPeaksValleysNoiseLong(noisePoint.weirdnessNoise());
+                case WEIRDNESS -> noisePoint.weirdness();
+                case PEAKS_VALLEYS -> BiomeParameterTargets.getPeaksValleysNoiseLong(noisePoint.weirdness());
                 case DEPTH_OCEAN -> BiomeParameterTargets.getDepthWithOceanSurfaceLong(noisePoint.depth());
             };
     }
 
     @Override
-    public String asString() {
+    public String getSerializedName() {
         return this.name;
     }
 
@@ -96,32 +96,32 @@ public static long getPeaksValleysNoiseLong(long weirdness) {
      * @return The long-type calculated depth with ocean surface
      */
     public static long getDepthWithOceanSurfaceLong(long depth) {
-        ServerWorld world = DimensionBiomePlacement.getEvaluatingWorld();
+        ServerLevel world = DimensionBiomePlacement.getEvaluatingWorld();
         int seaLevel = world.getSeaLevel();
-        double bottom = world.getBottomY();
-        double top = world.getTopYInclusive();
+        double bottom = world.getMinY();
+        double top = world.getMaxY();
         double bottomNew = 15000;
         double topNew = -15000;
 
         return Math.max(depth,
-                (long) MathHelper.clampedMap(BiomeCoords.toBlock(DimensionBiomePlacement.getEvaluatingBiomePos().getY()), bottom, top, bottomNew, topNew) -
-                (long) MathHelper.clampedMap(seaLevel, bottom, top, bottomNew, topNew));
+                (long) Mth.clampedMap(QuartPos.toBlock(DimensionBiomePlacement.getEvaluatingBiomePos().getY()), bottom, top, bottomNew, topNew) -
+                (long) Mth.clampedMap(seaLevel, bottom, top, bottomNew, topNew));
     }
 
     /**
-     * @param range A {@link MultiNoiseUtil.ParameterRange parameter range} for which to find the center
+     * @param range A {@link Climate.Parameter parameter range} for which to find the center
      * @return The long-type center of the provided parameter range
      */
-    public static long parameterCenter(MultiNoiseUtil.ParameterRange range) {
+    public static long parameterCenter(Climate.Parameter range) {
         return (range.min() + range.max()) / 2L;
     }
 
     /**
-     * @param parameters A {@link MultiNoiseUtil.ParameterRange parameter range array} for which to find the center
-     * @return The {@link MultiNoiseUtil.NoiseValuePoint center point} of the provided parameter range
+     * @param parameters A {@link Climate.Parameter parameter range array} for which to find the center
+     * @return The {@link Climate.TargetPoint center point} of the provided parameter range
      */
-    public static MultiNoiseUtil.NoiseValuePoint parametersCenterPoint(MultiNoiseUtil.ParameterRange[] parameters) {
-        return new MultiNoiseUtil.NoiseValuePoint(
+    public static Climate.TargetPoint parametersCenterPoint(Climate.Parameter[] parameters) {
+        return new Climate.TargetPoint(
                 parameterCenter(parameters[0]),
                 parameterCenter(parameters[1]),
                 parameterCenter(parameters[2]),
@@ -132,29 +132,29 @@ public static MultiNoiseUtil.NoiseValuePoint parametersCenterPoint(MultiNoiseUti
     }
 
     /**
-     * @param point1 A {@link MultiNoiseUtil.NoiseValuePoint noise point} for comparison
-     * @param point2 A {@link MultiNoiseUtil.NoiseValuePoint noise point} for comparison
+     * @param point1 A {@link Climate.TargetPoint noise point} for comparison
+     * @param point2 A {@link Climate.TargetPoint noise point} for comparison
      * @param offset The long-type value of an offset to add to the squared distance
      * @return The long-type squared distance between the two noise points
      */
-    public static long getSquaredDistance(MultiNoiseUtil.NoiseValuePoint point1, MultiNoiseUtil.NoiseValuePoint point2, long offset) {
-        return (MathHelper.square(point1.temperatureNoise() - point2.temperatureNoise()) +
-                MathHelper.square(point1.humidityNoise() - point2.humidityNoise()) +
-                MathHelper.square(point1.continentalnessNoise() - point2.continentalnessNoise()) +
-                MathHelper.square(point1.erosionNoise() - point2.erosionNoise()) +
-                MathHelper.square(point1.depth() - point2.depth()) +
-                MathHelper.square(point1.weirdnessNoise() - point2.weirdnessNoise()) +
-                MathHelper.square(offset)
+    public static long getSquaredDistance(Climate.TargetPoint point1, Climate.TargetPoint point2, long offset) {
+        return (Mth.square(point1.temperature() - point2.temperature()) +
+                Mth.square(point1.humidity() - point2.humidity()) +
+                Mth.square(point1.continentalness() - point2.continentalness()) +
+                Mth.square(point1.erosion() - point2.erosion()) +
+                Mth.square(point1.depth() - point2.depth()) +
+                Mth.square(point1.weirdness() - point2.weirdness()) +
+                Mth.square(offset)
         );
     }
 
     /**
-     * @param point1 A {@link MultiNoiseUtil.NoiseValuePoint noise point} for comparison
-     * @param point2 A {@link MultiNoiseUtil.NoiseValuePoint noise point} for comparison
+     * @param point1 A {@link Climate.TargetPoint noise point} for comparison
+     * @param point2 A {@link Climate.TargetPoint noise point} for comparison
      * @return The long-type squared distance between the two noise points
      */
     @SuppressWarnings("unused")
-    public static long getSquaredDistance(MultiNoiseUtil.NoiseValuePoint point1, MultiNoiseUtil.NoiseValuePoint point2) {
+    public static long getSquaredDistance(Climate.TargetPoint point1, Climate.TargetPoint point2) {
         return getSquaredDistance(point1, point2, 0L);
     }
 }