From be7ad14b4beb2dc88923727691a6e1de4593ceff Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Sun, 12 May 2024 11:17:41 -0700
Subject: [PATCH] Fix Biome patch change that caused our field redirect coremod
 to not function correctly.

---
 .../world/level/biome/Biome.java.patch        | 43 +++++++++++++++----
 .../common/extensions/IForgeBiome.java        | 33 --------------
 2 files changed, 35 insertions(+), 41 deletions(-)
 delete mode 100644 src/main/java/net/minecraftforge/common/extensions/IForgeBiome.java

diff --git a/patches/minecraft/net/minecraft/world/level/biome/Biome.java.patch b/patches/minecraft/net/minecraft/world/level/biome/Biome.java.patch
index fa87227911..38428c9d93 100644
--- a/patches/minecraft/net/minecraft/world/level/biome/Biome.java.patch
+++ b/patches/minecraft/net/minecraft/world/level/biome/Biome.java.patch
@@ -1,11 +1,7 @@
 --- a/net/minecraft/world/level/biome/Biome.java
 +++ b/net/minecraft/world/level/biome/Biome.java
-@@ -32,11 +_,11 @@
- import net.minecraft.world.level.material.FluidState;
- import net.minecraft.world.level.material.Fluids;
- 
--public final class Biome {
-+public final class Biome implements net.minecraftforge.common.extensions.IForgeBiome {
+@@ -35,8 +_,8 @@
+ public final class Biome {
      public static final Codec<Biome> DIRECT_CODEC = RecordCodecBuilder.create(
          p_220544_ -> p_220544_.group(
 -                    Biome.ClimateSettings.CODEC.forGetter(p_151717_ -> p_151717_.climateSettings),
@@ -15,6 +11,17 @@
                      BiomeGenerationSettings.CODEC.forGetter(p_220548_ -> p_220548_.generationSettings),
                      MobSpawnSettings.CODEC.forGetter(p_220546_ -> p_220546_.mobSettings)
                  )
+@@ -58,8 +_,10 @@
+     )
+     public static final PerlinSimplexNoise BIOME_INFO_NOISE = new PerlinSimplexNoise(new WorldgenRandom(new LegacyRandomSource(2345L)), ImmutableList.of(0));
+     private static final int TEMPERATURE_CACHE_SIZE = 1024;
++    /** @deprecated Redirected to {@link #getModifiedClimateSettings()} by field_to_method.js */
+     private final Biome.ClimateSettings climateSettings;
+     private final BiomeGenerationSettings generationSettings;
++    /** @deprecated Redirected to {@link #getModifiedSpecialEffects()} by field_to_method.js */
+     private final MobSpawnSettings mobSettings;
+     private final BiomeSpecialEffects specialEffects;
+     private final ThreadLocal<Long2FloatLinkedOpenHashMap> temperatureCache = ThreadLocal.withInitial(() -> Util.make(() -> {
 @@ -71,12 +_,14 @@
              long2floatlinkedopenhashmap.defaultReturnValue(Float.NaN);
              return long2floatlinkedopenhashmap;
@@ -48,15 +55,35 @@
      }
  
      public int getFogColor() {
-@@ -251,6 +_,11 @@
+@@ -251,6 +_,31 @@
  
      public Optional<Music> getBackgroundMusic() {
          return this.specialEffects.getBackgroundMusic();
 +    }
 +
-+    @Override
++    /**
++     * {@return Cache of original biome data and biome data modified by biome modifiers}
++     * Modified biome data is set by server after datapacks and serverconfigs load.
++     * Climate and effects field reads are coremodded to redirect to this.
++     **/
 +    public net.minecraftforge.common.world.ModifiableBiomeInfo modifiableBiomeInfo() {
 +        return this.modifiableBiomeInfo;
++    }
++
++    /**
++     * {@return The biome's climate settings, with modifications if called after modifiers are applied in server init.}
++     * Note: This method is called by our field_to_method coremod. Which redirects {@link #climateSettings} to this method at load time.
++     */
++    public ClimateSettings getModifiedClimateSettings() {
++        return this.modifiableBiomeInfo().get().climateSettings();
++    }
++
++    /**
++     * {@return The biome's client effects, with modifications if called after modifiers are applied in server init.}
++     * Note: This methods is called by our field_to_method coremod. Which redirects {@link #specialEffects} to this method at load time.
++     */
++    public BiomeSpecialEffects getModifiedSpecialEffects() {
++        return this.modifiableBiomeInfo().get().effects();
      }
  
      public static class BiomeBuilder {
diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeBiome.java b/src/main/java/net/minecraftforge/common/extensions/IForgeBiome.java
deleted file mode 100644
index 5346805a89..0000000000
--- a/src/main/java/net/minecraftforge/common/extensions/IForgeBiome.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.common.extensions;
-
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.BiomeSpecialEffects;
-import net.minecraftforge.common.world.ModifiableBiomeInfo;
-
-public interface IForgeBiome {
-    /**
-     * {@return Cache of original biome data and biome data modified by biome modifiers}
-     * Modified biome data is set by server after datapacks and serverconfigs load.
-     * Climate and effects field reads are coremodded to redirect to this.
-     **/
-    ModifiableBiomeInfo modifiableBiomeInfo();
-
-    /**
-     * {@return The biome's climate settings, with modifications if called after modifiers are applied in server init.}
-     */
-    default Biome.ClimateSettings getModifiedClimateSettings() {
-        return modifiableBiomeInfo().get().climateSettings();
-    }
-
-    /**
-     * {@return The biome's client effects, with modifications if called after modifiers are applied in server init.}
-     */
-    default BiomeSpecialEffects getModifiedSpecialEffects() {
-        return modifiableBiomeInfo().get().effects();
-    }
-}