From 7b0dd1c169712c9b5c1ebb2620702cebc41fab7c Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Sat, 8 Apr 2023 13:25:47 +0200
Subject: [PATCH] [Change] Removed `BiomeSourceFromRegistry`-Interface

---
 .../bclib/api/v2/generator/BCLBiomeSource.java | 15 +--------------
 .../biomesource/BiomeSourceFromRegistry.java   | 18 ------------------
 .../EnforceableChunkGenerator.java             |  5 -----
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 src/main/java/org/betterx/worlds/together/biomesource/BiomeSourceFromRegistry.java

diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/BCLBiomeSource.java b/src/main/java/org/betterx/bclib/api/v2/generator/BCLBiomeSource.java
index 1f98ee27..291abdd9 100644
--- a/src/main/java/org/betterx/bclib/api/v2/generator/BCLBiomeSource.java
+++ b/src/main/java/org/betterx/bclib/api/v2/generator/BCLBiomeSource.java
@@ -5,7 +5,6 @@ import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome;
 import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeRegistry;
 import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI;
 import org.betterx.bclib.config.Configs;
-import org.betterx.worlds.together.biomesource.BiomeSourceFromRegistry;
 import org.betterx.worlds.together.biomesource.BiomeSourceHelper;
 import org.betterx.worlds.together.biomesource.MergeableBiomeSource;
 import org.betterx.worlds.together.biomesource.ReloadableBiomeSource;
@@ -14,7 +13,6 @@ import org.betterx.worlds.together.world.BiomeSourceWithSeed;
 import org.betterx.worlds.together.world.event.WorldBootstrap;
 
 import net.minecraft.core.Holder;
-import net.minecraft.core.HolderGetter;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.Registries;
@@ -29,7 +27,7 @@ import java.util.*;
 import java.util.stream.Stream;
 import org.jetbrains.annotations.NotNull;
 
-public abstract class BCLBiomeSource extends BiomeSource implements BiomeSourceWithSeed, MergeableBiomeSource<BCLBiomeSource>, BiomeSourceWithNoiseRelatedSettings, ReloadableBiomeSource, BiomeSourceFromRegistry<BCLBiomeSource> {
+public abstract class BCLBiomeSource extends BiomeSource implements BiomeSourceWithSeed, MergeableBiomeSource<BCLBiomeSource>, BiomeSourceWithNoiseRelatedSettings, ReloadableBiomeSource {
     @FunctionalInterface
     public interface PickerAdder {
         boolean add(BCLBiome bclBiome, BiomeAPI.BiomeType type, BiomePicker picker);
@@ -63,11 +61,6 @@ public abstract class BCLBiomeSource extends BiomeSource implements BiomeSourceW
         return dynamicPossibleBiomes;
     }
 
-    @Override
-    public boolean didBiomeRegistryChange() {
-        return false;
-        //return this.registryModificationCounter != InternalBiomeAPI.getBiomeRegistryModificationCount(biomeRegistry);
-    }
 
     protected boolean wasBound() {
         return didCreatePickers;
@@ -288,12 +281,6 @@ public abstract class BCLBiomeSource extends BiomeSource implements BiomeSourceW
         this.setMaxHeight(generator.noiseSettings().height());
     }
 
-    @Override
-    public HolderGetter<Biome> getBiomeRegistry() {
-        //return biomeRegistry;
-        return null;
-    }
-
     protected void reloadBiomes(boolean force) {
         rebuildBiomes(force);
         this.initMap(currentSeed);
diff --git a/src/main/java/org/betterx/worlds/together/biomesource/BiomeSourceFromRegistry.java b/src/main/java/org/betterx/worlds/together/biomesource/BiomeSourceFromRegistry.java
deleted file mode 100644
index 729fcf56..00000000
--- a/src/main/java/org/betterx/worlds/together/biomesource/BiomeSourceFromRegistry.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.betterx.worlds.together.biomesource;
-
-import net.minecraft.core.HolderGetter;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.BiomeSource;
-
-@Deprecated(forRemoval = true)
-public interface BiomeSourceFromRegistry<T extends BiomeSource> {
-    HolderGetter<Biome> getBiomeRegistry();
-    boolean didBiomeRegistryChange();
-
-    default <R extends BiomeSource> boolean togetherBiomeSourceContentChanged(BiomeSourceFromRegistry<R> other) {
-        if (other.getBiomeRegistry() != getBiomeRegistry()) return true;
-        if (other.didBiomeRegistryChange() || didBiomeRegistryChange()) return true;
-
-        return false;
-    }
-}
diff --git a/src/main/java/org/betterx/worlds/together/chunkgenerator/EnforceableChunkGenerator.java b/src/main/java/org/betterx/worlds/together/chunkgenerator/EnforceableChunkGenerator.java
index 6efd54e3..9fa29286 100644
--- a/src/main/java/org/betterx/worlds/together/chunkgenerator/EnforceableChunkGenerator.java
+++ b/src/main/java/org/betterx/worlds/together/chunkgenerator/EnforceableChunkGenerator.java
@@ -1,6 +1,5 @@
 package org.betterx.worlds.together.chunkgenerator;
 
-import org.betterx.worlds.together.biomesource.BiomeSourceFromRegistry;
 import org.betterx.worlds.together.biomesource.BiomeSourceWithConfig;
 import org.betterx.worlds.together.biomesource.MergeableBiomeSource;
 
@@ -33,10 +32,6 @@ public interface EnforceableChunkGenerator<G extends ChunkGenerator> {
             if (!ba.getTogetherConfig().couldSetWithoutRepair(bb.getTogetherConfig()))
                 return true;
         }
-        if (one instanceof BiomeSourceFromRegistry ba && two instanceof BiomeSourceFromRegistry bb) {
-            if (ba.togetherBiomeSourceContentChanged(bb))
-                return true;
-        }
         if (one instanceof MergeableBiomeSource ba) {
             if (ba.togetherShouldMerge(two))
                 return true;