From cb9a9bcad7a289027e2e84e357b00d7ff54b4cc1 Mon Sep 17 00:00:00 2001
From: modmuss <modmuss50@gmail.com>
Date: Wed, 14 Jun 2023 15:35:22 +0100
Subject: [PATCH] Update CFR and fix LootDataType params (#3591)

---
 build.gradle                                     | 1 +
 gradle.properties                                | 2 +-
 mappings/net/minecraft/loot/LootDataType.mapping | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8d690afe25..093dd39643 100644
--- a/build.gradle
+++ b/build.gradle
@@ -75,6 +75,7 @@ def unpickMetaFile = file("unpick-definitions/unpick.json")
 dependencies {
 	enigmaRuntime "cuchaz:enigma-swing:${project.enigma_version}"
 	enigmaRuntime "net.fabricmc:name-proposal:${project.name_proposal_version}"
+	enigmaRuntime "net.fabricmc:cfr:${project.cfr_version}"
 	javadocClasspath "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
 	javadocClasspath "org.jetbrains:annotations:${project.jetbrains_annotations_version}"
 	javadocClasspath "com.google.code.findbugs:jsr305:3.0.2" // for some other jsr annotations
diff --git a/gradle.properties b/gradle.properties
index d3f5136069..5a8abff8ad 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.configuration-cache=true
 
 enigma_version=2.3.1
 unpick_version=2.3.0
-cfr_version=0.1.1
+cfr_version=0.2.1
 name_proposal_version=0.1.4
 asm_version=9.5
 
diff --git a/mappings/net/minecraft/loot/LootDataType.mapping b/mappings/net/minecraft/loot/LootDataType.mapping
index bcf275fac2..0207ca231f 100644
--- a/mappings/net/minecraft/loot/LootDataType.mapping
+++ b/mappings/net/minecraft/loot/LootDataType.mapping
@@ -40,8 +40,8 @@ CLASS net/minecraft/class_8490 net/minecraft/loot/LootDataType
 		ARG 0 clazz
 		ARG 1 combiner
 	METHOD method_51213 (Ljava/lang/Class;Ljava/util/function/Function;Ljava/lang/Class;Lcom/google/gson/Gson;Ljava/lang/String;)Ljava/util/function/BiFunction;
-		ARG 0 gson
-		ARG 1 dataTypeId
+		ARG 3 gson
+		ARG 4 dataTypeId
 	METHOD method_51214 getId ()Ljava/lang/String;
 	METHOD method_51215 stream ()Ljava/util/stream/Stream;
 	METHOD method_51216 validator ()Lnet/minecraft/class_8490$class_8491;