diff options
| -rw-r--r-- | fabric/build.gradle | 7 | ||||
| -rw-r--r-- | fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinRecipeToast.java | 4 | ||||
| -rw-r--r-- | forge/build.gradle | 3 | ||||
| -rw-r--r-- | gradle.properties | 8 |
4 files changed, 12 insertions, 10 deletions
diff --git a/fabric/build.gradle b/fabric/build.gradle index 1aae90029..a8f0e5c9c 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -106,12 +106,12 @@ unifiedPublishing { project { displayName = "[Fabric $rootProject.supported_version] v$project.version" releaseType = "release" - gameVersions = ["1.20", "1.20.1"] + gameVersions = [] gameLoaders = ["fabric"] changelog = rootProject.releaseChangelog mainPublication remapJar - + relations { depends { curseforge = "architectury-api" @@ -131,7 +131,7 @@ unifiedPublishing { curseforge { token = project.hasProperty("danielshe_curse_api_key") ? project.property("danielshe_curse_api_key") : System.getenv("danielshe_curse_api_key") id = "310111" - gameVersions.addAll "Java 17", "1.20-Snapshot" + gameVersions.addAll "Java 17", "1.20.2-Snapshot" } } @@ -140,6 +140,7 @@ unifiedPublishing { token = project.hasProperty("modrinth_key") ? project.property("modrinth_key") : System.getenv("modrinth_key") id = "nfn13YXA" version = "$project.version+$project.name" + gameVersions.addAll project.minecraft_version } } } diff --git a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinRecipeToast.java b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinRecipeToast.java index cb819b494..fd8a6a12c 100644 --- a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinRecipeToast.java +++ b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinRecipeToast.java @@ -26,7 +26,7 @@ package me.shedaniel.rei.mixin.fabric; import me.shedaniel.rei.api.client.config.ConfigObject; import net.minecraft.client.gui.components.toasts.RecipeToast; import net.minecraft.client.gui.components.toasts.ToastComponent; -import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.item.crafting.RecipeHolder; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @@ -36,7 +36,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(RecipeToast.class) public class MixinRecipeToast { @Inject(method = "addOrUpdate", at = @At("HEAD"), cancellable = true) - private static void addOrUpdate(ToastComponent toastGui, Recipe<?> recipe, CallbackInfo info) { + private static void addOrUpdate(ToastComponent toastGui, RecipeHolder<?> recipe, CallbackInfo info) { if (disableRecipeBook()) info.cancel(); } diff --git a/forge/build.gradle b/forge/build.gradle index cce6cce21..ac6b33686 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -255,7 +255,7 @@ unifiedPublishing { project { displayName = "[Forge $rootProject.supported_version] v$project.version" releaseType = "release" - gameVersions = ["1.20", "1.20.1"] + gameVersions = [] gameLoaders = ["forge"] changelog = rootProject.releaseChangelog @@ -286,6 +286,7 @@ unifiedPublishing { token = project.hasProperty("modrinth_key") ? project.property("modrinth_key") : System.getenv("modrinth_key") id = "OM4ZYSws" version = "$project.version+$project.name" + gameVersions.addAll project.minecraft_version } } } diff --git a/gradle.properties b/gradle.properties index 6c3d14e58..041599849 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,14 @@ org.gradle.jvmargs=-Xmx6G base_version=13.0 unstable=false -supported_version=1.20.2-pre2 -minecraft_version=1.20.2-pre2 +supported_version=1.20.2-rc1 +minecraft_version=1.20.2-rc1 forgeEnabled=false forge_version=46.0.1 fabricloader_version=0.14.22 cloth_config_version=12.0.107 modmenu_version=7.0.0 -fabric_api=0.88.3+1.20.2 -architectury_version=10.0.6 +fabric_api=0.88.5+1.20.2 +architectury_version=10.0.7 api_exculde= #api_include=me.shedaniel.cloth:cloth-events,me.shedaniel.cloth:config-2,me.sargunvohra.mcmods:autoconfig1u,org.jetbrains:annotations,net.fabricmc.fabric-api:fabric |