Update to Minecraft 1.20.2 (#20)

* 1.20.2 * Checkstyle... * Finish preparing for release (Minecraft 1.20.2) --------- Co-authored-by: Spencer <[email protected]>
ReviversMC · Jan 2, 2024 · fca9957 · fca9957
1 parent cd27c1a
commit fca9957
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 22 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -52,8 +52,8 @@ jobs:
 
           files: build/libs/!(*-@(dev|sources)).jar
 
-          name: Release 5.1.2 for Minecraft 1.20 and later
-          version: 5.1.2+1.20-and-later
+          name: Release 5.2.0 for Minecraft 1.20.2
+          version: 5.2.0+1.20.2
           version-type: release
 
           loaders: |
@@ -63,7 +63,7 @@ jobs:
             fabric-api@*(required){modrinth:P7dR8mSH}{curseforge:306612}#(ignore:github)
 
           game-versions: |
-            [1.20-rc1,1.20.1]
+            [1.20.2]
 
           game-version-filter: none
 

diff --git 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
@@ -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
 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
@@ -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/...java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsRecipeProvider.java b/...java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsRecipeProvider.java
@@ -1,11 +1,9 @@
 package com.github.reviversmc.modern_glass_doors.datagen;
 
-import java.util.function.Consumer;
-
 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.RecipeJsonProvider;
+import net.minecraft.data.server.recipe.RecipeExporter;
 import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
 import net.minecraft.item.ItemConvertible;
 import net.minecraft.recipe.book.RecipeCategory;
@@ -20,7 +18,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 +30,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 +39,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))

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -41,7 +41,7 @@
 		]
 	},
 	"depends": {
-		"minecraft": ">=1.20-pre.2",
+		"minecraft": "1.20.2",
 		"fabric-item-group-api-v1": "*",
 		"fabric-blockrenderlayer-v1": "*"
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ pluginManagement { @@
     	}
     	plugins {
     		id 'fabric-loom' version "${fabric_loom_version}"
-    		id 'io.github.juuxel.loom-quiltflower' version "${loom_quiltflower_version}"
     	}
     }
@@ Expand Down @@