From a04b3ddd89b59e8e90ce56391c3a02e8f870cfe2 Mon Sep 17 00:00:00 2001
From: Treetrain1 <39657565+Treetrain1@users.noreply.github.com>
Date: Thu, 14 Dec 2023 10:50:16 -0600
Subject: [PATCH 1/4] loader 0.15.2

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 30237cac4..1070b4969 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@
 	minecraft_version=1.20.2
 	quilt_mappings=1.20.2+build.3
 	parchment_mappings=1.20.2:2023.10.22
-	loader_version=0.15.1
+	loader_version=0.15.2
 
 # Mod Properties
 	mod_version = 1.5.2
@@ -27,7 +27,7 @@
 	fabric_api_version=0.91.2+1.20.2
     fabric_kotlin_version=1.10.16+kotlin.1.9.21
     # https://github.com/LlamaLad7/MixinExtras/releases
-    mixin_extras_version=0.3.1
+    mixin_extras_version=0.3.2
     toml4j_version=0.7.2
     jankson_version=1.2.3
 

From 95e62b7659ac2f14c6b707a4d55c032aa2e46b88 Mon Sep 17 00:00:00 2001
From: Treetrain1 <39657565+Treetrain1@users.noreply.github.com>
Date: Thu, 14 Dec 2023 10:57:05 -0600
Subject: [PATCH 2/4] compat

---
 CHANGELOG.md                                             | 1 +
 .../lib/item/mixin/bonemeal/BoneMealItemMixin.java       | 1 -
 .../worldgen/biome/mixin/OverworldBiomePresetMixin.java  | 9 ++++-----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36c26e0b6..2b5c78691 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,3 +11,4 @@ Put changelog here:
   - Fixed a small bug with `Locked When Synced` fields syncing instead of remaining stagnant
   - Added an additional tooltip to notify Server Operators and LAN Hosts when a config value will sync
 - Moved most packets from channels to `FabricPacket`s
+- Improved compatibility of Overworld Biome API
\ No newline at end of file
diff --git a/src/main/java/net/frozenblock/lib/item/mixin/bonemeal/BoneMealItemMixin.java b/src/main/java/net/frozenblock/lib/item/mixin/bonemeal/BoneMealItemMixin.java
index b55705a46..1b5673a3e 100644
--- a/src/main/java/net/frozenblock/lib/item/mixin/bonemeal/BoneMealItemMixin.java
+++ b/src/main/java/net/frozenblock/lib/item/mixin/bonemeal/BoneMealItemMixin.java
@@ -45,7 +45,6 @@ public void useBonemeal(UseOnContext context, CallbackInfoReturnable<Interaction
             if (BonemealBehaviors.BONEMEAL_BEHAVIORS.get(state.getBlock()).bonemeal(context, level, blockPos, state, direction, horizontal) && !level.isClientSide) {
                 context.getItemInHand().shrink(1);
                 info.setReturnValue(InteractionResult.SUCCESS);
-                info.cancel();
             } else {
                 info.setReturnValue(InteractionResult.sidedSuccess(level.isClientSide));
             }
diff --git a/src/main/java/net/frozenblock/lib/worldgen/biome/mixin/OverworldBiomePresetMixin.java b/src/main/java/net/frozenblock/lib/worldgen/biome/mixin/OverworldBiomePresetMixin.java
index 5060811bf..083865b54 100644
--- a/src/main/java/net/frozenblock/lib/worldgen/biome/mixin/OverworldBiomePresetMixin.java
+++ b/src/main/java/net/frozenblock/lib/worldgen/biome/mixin/OverworldBiomePresetMixin.java
@@ -19,21 +19,20 @@
 package net.frozenblock.lib.worldgen.biome.mixin;
 
 import java.util.function.Function;
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import net.frozenblock.lib.worldgen.biome.impl.OverworldBiomeData;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.Climate;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 
 @Mixin(targets = "net/minecraft/world/level/biome/MultiNoiseBiomeSourceParameterList$Preset$2", priority = 991)
 public class OverworldBiomePresetMixin {
 
-	@Inject(method = "apply", at = @At("RETURN"), cancellable = true)
-	public <T> void apply(Function<ResourceKey<Biome>, T> function, CallbackInfoReturnable<Climate.ParameterList<T>> cir) {
-		cir.setReturnValue(OverworldBiomeData.withModdedBiomeEntries(cir.getReturnValue(), function));
+	@ModifyReturnValue(method = "apply", at = @At("RETURN"))
+	private <T> void Climate.ParameterList<T> apply(Climate.ParameterList<T> original, Function<ResourceKey<Biome>, T> function) {
+		return OverworldBiomeData.withModdedBiomeEntries(original, function);
 	}
 }

From d21d97ab75a0107b8f74d505da39b90705c18ae0 Mon Sep 17 00:00:00 2001
From: Treetrain1 <39657565+Treetrain1@users.noreply.github.com>
Date: Thu, 14 Dec 2023 10:57:18 -0600
Subject: [PATCH 3/4] oh im smart

---
 .../lib/worldgen/biome/mixin/OverworldBiomePresetMixin.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/frozenblock/lib/worldgen/biome/mixin/OverworldBiomePresetMixin.java b/src/main/java/net/frozenblock/lib/worldgen/biome/mixin/OverworldBiomePresetMixin.java
index 083865b54..c4eb4ab80 100644
--- a/src/main/java/net/frozenblock/lib/worldgen/biome/mixin/OverworldBiomePresetMixin.java
+++ b/src/main/java/net/frozenblock/lib/worldgen/biome/mixin/OverworldBiomePresetMixin.java
@@ -32,7 +32,7 @@
 public class OverworldBiomePresetMixin {
 
 	@ModifyReturnValue(method = "apply", at = @At("RETURN"))
-	private <T> void Climate.ParameterList<T> apply(Climate.ParameterList<T> original, Function<ResourceKey<Biome>, T> function) {
+	private <T> Climate.ParameterList<T> apply(Climate.ParameterList<T> original, Function<ResourceKey<Biome>, T> function) {
 		return OverworldBiomeData.withModdedBiomeEntries(original, function);
 	}
 }

From 72df0f8002c31e3babc26b10281d034d8a45b726 Mon Sep 17 00:00:00 2001
From: Treetrain1 <39657565+Treetrain1@users.noreply.github.com>
Date: Thu, 14 Dec 2023 21:59:19 -0600
Subject: [PATCH 4/4] changelog

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b5c78691..e1cf7f31d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,6 @@ Put changelog here:
   - Adds `SaveToggle` annotation
 - Moved all field annotations for config syncing to `EntrySyncData` for easier use
   - Fixed a small bug with `Locked When Synced` fields syncing instead of remaining stagnant
-  - Added an additional tooltip to notify Server Operators and LAN Hosts when a config value will sync
-- Moved most packets from channels to `FabricPacket`s
-- Improved compatibility of Overworld Biome API
\ No newline at end of file
+  - Added a tooltip to notify Server Operators and LAN Hosts when a config value will sync
+- Converted most packets from channels to `FabricPacket`s
+- Improved compatibility of Overworld Biome API