From 05d6d06b12a76a440f79c3a61a615981ba275988 Mon Sep 17 00:00:00 2001
From: Spencer <75862693+TacoMonkey11@users.noreply.github.com>
Date: Fri, 29 Dec 2023 14:12:22 -0500
Subject: [PATCH] 1.20.2

---
 build.gradle                                  |  4 +++-
 gradle.properties                             | 19 +++++++++----------
 settings.gradle                               |  1 -
 .../ModernGlassDoorsRecipeProvider.java       |  7 ++++---
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index d479751..6eb73a2 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,5 @@
 plugins {
 	id 'fabric-loom'
-	id 'io.github.juuxel.loom-quiltflower'
 	id 'checkstyle'
 }
 
@@ -54,6 +53,9 @@ dependencies {
 	modImplementation(fabricApi.module('fabric-blockrenderlayer-v1', project.fabric_api_version))
 	modImplementation(fabricApi.module('fabric-data-generation-api-v1', project.fabric_api_version))
 
+	// Vineflower
+	vineflowerDecompilerClasspath "org.vineflower:vineflower:1.9.3"
+
 
 	if (project.use_third_party_mods == 'true') {
 		configurations {
diff --git a/gradle.properties b/gradle.properties
index 8fcef73..586e22e 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,24 +4,23 @@ org.gradle.parallel = true
 org.gradle.workers.max = 3
 
 # Gradle Plugins
-fabric_loom_version = 1.2-SNAPSHOT
-loom_quiltflower_version = 1.10.0
+fabric_loom_version = 1.4-SNAPSHOT
 checkstyle_version = 10.12.1
 
 # Mod Properties
-mod_version = 5.1.2+1.20-and-later
+mod_version = 5.2.0+1.20.2-and-later
 maven_group = com.github.reviversmc
 archives_base_name = modern-glass-doors
 
 # Mod Dependencies
-minecraft_version = 1.20.1
-fabric_loader_version = 0.14.21
-fabric_api_version = 0.84.0+1.20.1
-yarn_mappings = 1.20.1+build.8
+minecraft_version = 1.20.2
+fabric_loader_version = 0.15.3
+fabric_api_version = 0.91.2+1.20.2
+yarn_mappings = 1.20.2+build.4
 
 # Dev-Env Mods
 use_third_party_mods = true
-modmenu_version = 7.1.0
-sodium_version = mc1.20-0.4.10
-lithium_version = mc1.20.1-0.11.2
+modmenu_version = 8.0.1
+sodium_version = mc1.20.2-0.5.5
+lithium_version = mc1.20.2-0.12.0
 ferritecore_version = 6.0.1-fabric
diff --git a/settings.gradle b/settings.gradle
index 9549118..9b0f717 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,7 +9,6 @@ pluginManagement {
 	}
 	plugins {
 		id 'fabric-loom' version "${fabric_loom_version}"
-		id 'io.github.juuxel.loom-quiltflower' version "${loom_quiltflower_version}"
 	}
 }
 
diff --git a/src/main/java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsRecipeProvider.java b/src/main/java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsRecipeProvider.java
index a0c765f..62473e5 100644
--- a/src/main/java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsRecipeProvider.java
+++ b/src/main/java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsRecipeProvider.java
@@ -5,6 +5,7 @@
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.block.Blocks;
+import net.minecraft.data.server.recipe.RecipeExporter;
 import net.minecraft.data.server.recipe.RecipeJsonProvider;
 import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
 import net.minecraft.item.ItemConvertible;
@@ -20,7 +21,7 @@ public ModernGlassDoorsRecipeProvider(FabricDataOutput output) {
 	}
 
 	@Override
-	public void generate(Consumer<RecipeJsonProvider> exporter) {
+	public void generate(RecipeExporter exporter) {
 		for (GlassDoorBlock door : ModernGlassDoorsBlocks.GLASS_DOORS) {
 			createGlassDoorRecipe(exporter, door, door.getParentDoorType());
 			createDoorFromGlassDoorRecipe(exporter, door.getParentDoorType(), door);
@@ -32,7 +33,7 @@ public void generate(Consumer<RecipeJsonProvider> exporter) {
 		}
 	}
 
-	private static void createGlassDoorRecipe(Consumer<RecipeJsonProvider> exporter, ItemConvertible output, ItemConvertible input) {
+	private static void createGlassDoorRecipe(RecipeExporter exporter, ItemConvertible output, ItemConvertible input) {
 		ShapelessRecipeJsonBuilder.create(RecipeCategory.REDSTONE, output)
 				.input(input)
 				.input(Blocks.GLASS_PANE)
@@ -41,7 +42,7 @@ private static void createGlassDoorRecipe(Consumer<RecipeJsonProvider> exporter,
 				.offerTo(exporter);
 	}
 
-	private static void createDoorFromGlassDoorRecipe(Consumer<RecipeJsonProvider> exporter, ItemConvertible output, ItemConvertible input) {
+	private static void createDoorFromGlassDoorRecipe(RecipeExporter exporter, ItemConvertible output, ItemConvertible input) {
 		ShapelessRecipeJsonBuilder.create(RecipeCategory.REDSTONE, output)
 				.input(input)
 				.criterion(hasItem(input), conditionsFromItem(input))