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/4] 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 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 exporter) { } } - private static void createGlassDoorRecipe(Consumer 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 exporter, .offerTo(exporter); } - private static void createDoorFromGlassDoorRecipe(Consumer 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)) From 0a70761754e249efb9ced936659dc8c21dce6966 Mon Sep 17 00:00:00 2001 From: Spencer <75862693+TacoMonkey11@users.noreply.github.com> Date: Fri, 29 Dec 2023 14:22:44 -0500 Subject: [PATCH 2/4] Checkstyle... --- .../datagen/ModernGlassDoorsRecipeProvider.java | 3 --- 1 file changed, 3 deletions(-) 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 62473e5..d3febf8 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 @@ -1,12 +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.RecipeExporter; -import net.minecraft.data.server.recipe.RecipeJsonProvider; import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; import net.minecraft.item.ItemConvertible; import net.minecraft.recipe.book.RecipeCategory; From 6287606c9201b2754f11fc11601daf86b6b74332 Mon Sep 17 00:00:00 2001 From: Spencer <75862693+TacoMonkey11@users.noreply.github.com> Date: Fri, 29 Dec 2023 14:28:11 -0500 Subject: [PATCH 3/4] 1.20.4 --- gradle.properties | 14 +++++++------- .../modern_glass_doors/blocks/GlassDoorBlock.java | 2 +- .../blocks/GlassTrapdoorBlock.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index 586e22e..04135bc 100755 --- a/gradle.properties +++ b/gradle.properties @@ -13,14 +13,14 @@ maven_group = com.github.reviversmc archives_base_name = modern-glass-doors # Mod Dependencies -minecraft_version = 1.20.2 +minecraft_version = 1.20.4 fabric_loader_version = 0.15.3 -fabric_api_version = 0.91.2+1.20.2 -yarn_mappings = 1.20.2+build.4 +fabric_api_version = 0.92.0+1.20.4 +yarn_mappings = 1.20.4+build.3 # Dev-Env Mods use_third_party_mods = true -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 +modmenu_version = 9.0.0 +sodium_version = mc1.20.3-0.5.5 +lithium_version = mc1.20.4-0.12.1 +ferritecore_version = 6.0.3-fabric diff --git a/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassDoorBlock.java b/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassDoorBlock.java index 1a46370..783cf07 100644 --- a/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassDoorBlock.java +++ b/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassDoorBlock.java @@ -26,7 +26,7 @@ public static BlockState copyState(BlockState state) { public final DoorBlock parentDoorType; GlassDoorBlock(MaterialCategory materialCategory, DoorBlock parentDoorType) { - super(Block.Settings.copy(parentDoorType), parentDoorType.blockSetType); + super(parentDoorType.blockSetType, Block.Settings.copy(parentDoorType)); this.materialCategory = materialCategory; this.parentDoorType = (DoorBlock) parentDoorType; diff --git a/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassTrapdoorBlock.java b/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassTrapdoorBlock.java index 34b85f8..a21278f 100644 --- a/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassTrapdoorBlock.java +++ b/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassTrapdoorBlock.java @@ -28,7 +28,7 @@ public static BlockState copyState(BlockState state) { private final TrapdoorBlock parentTrapdoorType; GlassTrapdoorBlock(MaterialCategory materialCategory, TrapdoorBlock parentTrapdoorType) { - super(Block.Settings.copy(parentTrapdoorType), parentTrapdoorType.blockSetType); + super(parentTrapdoorType.blockSetType, Block.Settings.copy(parentTrapdoorType)); this.materialCategory = materialCategory; this.parentTrapdoorType = (TrapdoorBlock) parentTrapdoorType; From f0d8bb75289045b98f426c371bd7067a182f1fb6 Mon Sep 17 00:00:00 2001 From: thefirethirteen Date: Tue, 2 Jan 2024 22:01:34 +0200 Subject: [PATCH 4/4] Finish preparing for release (Minecraft 1.20.3 and later) --- .github/workflows/release.yaml | 6 +++--- build.gradle | 3 ++- gradle.properties | 11 ++++++----- src/main/resources/fabric.mod.json | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index aa8b68f..1055932 100644 --- 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.3.0 for Minecraft 1.20.3 and later + version: 5.3.0+1.20.3-and-later 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.3,1.20.4] game-version-filter: none diff --git a/build.gradle b/build.gradle index 6eb73a2..bd86f9a 100755 --- a/build.gradle +++ b/build.gradle @@ -71,7 +71,8 @@ dependencies { modRuntimeOnly "com.terraformersmc:modmenu:${project.modmenu_version}" modRuntimeOnly "maven.modrinth:sodium:${project.sodium_version}" modRuntimeOnly "maven.modrinth:lithium:${project.lithium_version}" - modRuntimeOnly "maven.modrinth:ferrite-core:${project.ferritecore_version}" + // not available for MC 1.20.3 + // modRuntimeOnly "maven.modrinth:ferrite-core:${project.ferritecore_version}" } } diff --git a/gradle.properties b/gradle.properties index 04135bc..2d1cadb 100755 --- a/gradle.properties +++ b/gradle.properties @@ -8,19 +8,20 @@ fabric_loom_version = 1.4-SNAPSHOT checkstyle_version = 10.12.1 # Mod Properties -mod_version = 5.2.0+1.20.2-and-later +mod_version = 5.3.0+1.20.3-and-later maven_group = com.github.reviversmc archives_base_name = modern-glass-doors # Mod Dependencies -minecraft_version = 1.20.4 +minecraft_version = 1.20.3 fabric_loader_version = 0.15.3 -fabric_api_version = 0.92.0+1.20.4 -yarn_mappings = 1.20.4+build.3 +fabric_api_version = 0.91.1+1.20.3 +yarn_mappings = 1.20.3+build.1 # Dev-Env Mods use_third_party_mods = true modmenu_version = 9.0.0 sodium_version = mc1.20.3-0.5.5 -lithium_version = mc1.20.4-0.12.1 +lithium_version = mc1.20.3-0.12.1 +# not available for MC 1.20.3; disabled in build.gradle ferritecore_version = 6.0.3-fabric diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index cde827d..8b83dd7 100755 --- 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.3", "fabric-item-group-api-v1": "*", "fabric-blockrenderlayer-v1": "*" }