Merge branch '1.19' into 1.19_itemless

sisby-folk · Jul 7, 2023 · 43e9e44 · 43e9e44
2 parents 95f79c7 + d8b8ffc
commit 43e9e44
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/common/src/main/java/hunternif/mc/impl/atlas/client/TileTextureMap.java b/common/src/main/java/hunternif/mc/impl/atlas/client/TileTextureMap.java
@@ -286,7 +286,7 @@ public static boolean biomeIsSavanna(RegistryEntry<Biome> biomeTag) {
     }
 
     @ExpectPlatform
-    private static boolean biomeIsPlateau(RegistryEntry<Biome> biomeTag) {
+    public static boolean biomeIsPlateau(RegistryEntry<Biome> biomeTag) {
         return false;
     }
 

diff --git a/common/src/main/java/hunternif/mc/impl/atlas/core/scanning/TileDetectorBase.java b/common/src/main/java/hunternif/mc/impl/atlas/core/scanning/TileDetectorBase.java
@@ -52,9 +52,7 @@ static private boolean hasSwampWater(RegistryEntry<Biome> biomeTag) {
         throw new AssertionError("Not implemented");
     }
 
-    static int priorityForBiome(World world, Biome biome) {
-        Registry<Biome> biomeRegistry = world.getRegistryManager().get(Registry.BIOME_KEY);
-        RegistryEntry<Biome> biomeTag = biomeRegistry.entryOf(biomeRegistry.getKey(biome).orElse(null));
+    static int priorityForBiome(RegistryEntry<Biome> biomeTag) {
         if (biomeTag.isIn(BiomeTags.IS_OCEAN) || biomeTag.isIn(BiomeTags.IS_RIVER) || biomeTag.isIn(BiomeTags.IS_DEEP_OCEAN)) {
             return 4;
         } else if (biomeTag.isIn(BiomeTags.IS_BEACH)) {
@@ -175,7 +173,7 @@ public Identifier getBiomeID(World world, Chunk chunk) {
                 }
 
 //                updateOccurrencesMap(biomeOccurrences, world, biome, getHeightType(weirdness), priorityForBiome(getBiomeIdentifier(world, biome)));
-                updateOccurrencesMap(biomeOccurrences, world, biome, getHeightTypeFromY(y, world.getSeaLevel()), priorityForBiome(world, biome));
+                updateOccurrencesMap(biomeOccurrences, world, biome, getHeightTypeFromY(y, world.getSeaLevel()), priorityForBiome(biomeTag));
             }
         }
 

diff --git a/common/src/main/java/hunternif/mc/impl/atlas/core/scanning/TileDetectorNether.java b/common/src/main/java/hunternif/mc/impl/atlas/core/scanning/TileDetectorNether.java
@@ -65,7 +65,7 @@ public Identifier getBiomeID(World world, Chunk chunk) {
                     }
                 } else {
                     // In case there are custom biomes "modded in":
-                    updateOccurrencesMap(biomeOccurrences, getBiomeIdentifier(world,biome), priorityForBiome(world,biome));
+                    updateOccurrencesMap(biomeOccurrences, getBiomeIdentifier(world,biome), priorityForBiome(biomeTag));
                 }
             }
         }

diff --git a/fabric/src/main/java/hunternif/mc/impl/atlas/client/fabric/TileTextureMapImpl.java b/fabric/src/main/java/hunternif/mc/impl/atlas/client/fabric/TileTextureMapImpl.java
@@ -53,7 +53,7 @@ public static boolean biomeIsBadlands(RegistryEntry<Biome> biomeTag) {
         return biomeTag.isIn((ConventionalBiomeTags.BADLANDS)) || biomeTag.isIn((ConventionalBiomeTags.MESA));
     }
 
-    private static boolean biomeIsPlateau(RegistryEntry<Biome> biomeTag) {
+    public static boolean biomeIsPlateau(RegistryEntry<Biome> biomeTag) {
         return false; // None
     }
 

diff --git a/forge/src/main/java/hunternif/mc/impl/atlas/client/forge/TileTextureMapImpl.java b/forge/src/main/java/hunternif/mc/impl/atlas/client/forge/TileTextureMapImpl.java
@@ -53,7 +53,7 @@ public static boolean biomeIsBadlands(RegistryEntry<Biome> biomeTag) {
         return false; // None
     }
 
-    private static boolean biomeIsPlateau(RegistryEntry<Biome> biomeTag) {
+    public static boolean biomeIsPlateau(RegistryEntry<Biome> biomeTag) {
         return biomeTag.isIn((Tags.Biomes.IS_PLATEAU));
     }