From 35918240f938fc5f85dba50ae4d917d93bc5d143 Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Sat, 25 Jun 2022 20:36:24 +0200
Subject: [PATCH] [Change] Disabled feature sorting (appears to conflict with
 other mods)

---
 .../api/v2/levelgen/biomes/BiomeAPI.java      | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java
index 61a50879..a24d97dd 100644
--- a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java
+++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java
@@ -48,7 +48,6 @@ import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 
 import java.util.List;
 import java.util.Map;
@@ -808,28 +807,28 @@ public class BiomeAPI {
     }
 
     private static void sortFeatures(List<Holder<PlacedFeature>> features) {
-        InternalBiomeAPI.initFeatureOrder();
-
-        Set<Holder<PlacedFeature>> featuresWithoutDuplicates = Sets.newHashSet();
-        features.forEach(holder -> featuresWithoutDuplicates.add(holder));
-
-        if (featuresWithoutDuplicates.size() != features.size()) {
-            features.clear();
-            featuresWithoutDuplicates.forEach(feature -> features.add(feature));
-        }
-
-        features.forEach(feature -> {
-            InternalBiomeAPI.FEATURE_ORDER.computeIfAbsent(
-                    feature,
-                    f -> InternalBiomeAPI.FEATURE_ORDER_ID.getAndIncrement()
-            );
-        });
-
-        features.sort((f1, f2) -> {
-            int v1 = InternalBiomeAPI.FEATURE_ORDER.getOrDefault(f1, 70000);
-            int v2 = InternalBiomeAPI.FEATURE_ORDER.getOrDefault(f2, 70000);
-            return Integer.compare(v1, v2);
-        });
+//        InternalBiomeAPI.initFeatureOrder();
+//
+//        Set<Holder<PlacedFeature>> featuresWithoutDuplicates = Sets.newHashSet();
+//        features.forEach(holder -> featuresWithoutDuplicates.add(holder));
+//
+//        if (featuresWithoutDuplicates.size() != features.size()) {
+//            features.clear();
+//            featuresWithoutDuplicates.forEach(feature -> features.add(feature));
+//        }
+//
+//        features.forEach(feature -> {
+//            InternalBiomeAPI.FEATURE_ORDER.computeIfAbsent(
+//                    feature,
+//                    f -> InternalBiomeAPI.FEATURE_ORDER_ID.getAndIncrement()
+//            );
+//        });
+//
+//        features.sort((f1, f2) -> {
+//            int v1 = InternalBiomeAPI.FEATURE_ORDER.getOrDefault(f1, 70000);
+//            int v2 = InternalBiomeAPI.FEATURE_ORDER.getOrDefault(f2, 70000);
+//            return Integer.compare(v1, v2);
+//        });
     }