From 5775636c0dbb73f093695a5d90b2928d2eda0cbf Mon Sep 17 00:00:00 2001 From: NotRyken <127091011+NotRyken@users.noreply.github.com> Date: Wed, 20 Nov 2024 16:27:29 +0800 Subject: [PATCH] Update to mc1.21.3 --- common/build.gradle | 18 ++++++++++ .../flashside/gui/widget/FlashsideButton.java | 3 +- gradle.properties | 35 ++++++++++--------- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 39 insertions(+), 19 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index e1c6d82..9fc5620 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -3,7 +3,25 @@ plugins { id("net.neoforged.moddev") } + +// Vanilla depends on ASM 9.3, MDG makes that a 'strict' version constraint, +// but Mixin and MixinExtras needs newer ASM so we override that here. +configurations.configureEach { + resolutionStrategy.eachDependency { details -> + if (details.requested.group == "org.ow2.asm") { + details.useVersion(asm_version) + details.because("Mixin requires new ASM") + } + } +} + dependencies { + compileOnly "org.ow2.asm:asm:${asm_version}" + compileOnly "org.ow2.asm:asm-analysis:${asm_version}" + compileOnly "org.ow2.asm:asm-commons:${asm_version}" + compileOnly "org.ow2.asm:asm-tree:${asm_version}" + compileOnly "org.ow2.asm:asm-util:${asm_version}" + compileOnly("org.spongepowered:mixin:${mixin_version}") compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixinextras_version}")) diff --git a/fabric/src/main/java/dev/terminalmc/flashside/gui/widget/FlashsideButton.java b/fabric/src/main/java/dev/terminalmc/flashside/gui/widget/FlashsideButton.java index 4fc5fc2..9e8a5c0 100644 --- a/fabric/src/main/java/dev/terminalmc/flashside/gui/widget/FlashsideButton.java +++ b/fabric/src/main/java/dev/terminalmc/flashside/gui/widget/FlashsideButton.java @@ -20,6 +20,7 @@ import com.moulberry.flashback.screen.FlashbackButton; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Tooltip; +import net.minecraft.client.renderer.RenderType; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -51,6 +52,6 @@ protected void renderWidget(GuiGraphics graphics, int i, int j, float f) { int x = this.getX() + paddingX; int y = this.getY() + paddingY; - graphics.blit(overlay, x, y, 0f, 0f, size, size, size, size); + graphics.blit(RenderType::guiTextured, overlay, x, y, 0f, 0f, size, size, size, size); } } diff --git a/gradle.properties b/gradle.properties index 229148a..819f8a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ # Neo/Forge version ranges: https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html # Project -mod_version=0.1.1+1.21 +mod_version=0.1.1+1.21.3 mod_group=dev.terminalmc mod_id=flashside mod_name=Flashside @@ -23,34 +23,33 @@ java_version=21 java_versions_fabric=>=21 # Minecraft -minecraft_version=1.21 -minecraft_versions_fabric=>1.20.6 <1.22 +minecraft_version=1.21.3 +minecraft_versions_fabric=>1.21.1 <1.22 # Parchment https://parchmentmc.org/docs/getting-started#choose-a-version parchment_minecraft_version=1.21 -parchment_version=2024.07.28 +parchment_version=2024.11.10 # Fabric https://fabricmc.net/develop -fabric_loader_version=0.16.5 +fabric_loader_version=0.16.9 fabric_loader_versions=>=0.15.0 -fabric_api_version=0.102.0+1.21 +fabric_api_version=0.108.0+1.21.3 fabric_api_versions=* # NeoForge https://projects.neoforged.net/neoforged/neoforge neoforge_loader_versions=[1,) -neoforge_version=21.0.167 -neoforge_versions=[21.0.143, 22) +neoforge_version=21.3.33-beta +neoforge_versions=[21.2.0, 22) # NeoForm https://projects.neoforged.net/neoforged/neoform -neoform_version=1.21-20240613.152323 - +neoform_version=1.21.3-20241023.131943 # Cloth Config https://modrinth.com/mod/9s6osm5g/versions -clothconfig_version=15.0.140 +clothconfig_version=16.0.141 clothconfig_versions_fabric=>=15 clothconfig_versions_neoforge=[15,) # ModMenu https://modrinth.com/mod/mOgUt4GM/versions -modmenu_version=11.0.2 -modmenu_versions_fabric=>10 +modmenu_version=12.0.0-beta.1 +modmenu_versions_fabric=>11 # Flashback https://modrinth.com/mod/4das1Fjq/versions flashback_version=0.13.0 @@ -66,19 +65,21 @@ curseforge_id=833352 release_type=beta # Fabric release_mod_loaders_fabric=fabric -release_game_versions_fabric=1.21,1.21.1 +release_game_versions_fabric=1.21.2,1.21.3 release_required_dep_ids_fabric_mr=4das1Fjq,P7dR8mSH,mOgUt4GM,9s6osm5g # Mixin https://mvnrepository.com/artifact/org.spongepowered/mixin mixin_version=0.8.7 # MixinExtras https://github.com/LlamaLad7/MixinExtras/releases mixinextras_version=0.4.1 +# ASM https://mvnrepository.com/artifact/org.ow2.asm/asm +asm_version=9.7 # Plugins # Fabric Loom https://mvnrepository.com/artifact/net.fabricmc/fabric-loom -loom_version=1.7.4 +loom_version=1.8.12 # ModDev https://plugins.gradle.org/plugin/net.neoforged.moddev -moddev_version=1.0.19 +moddev_version=2.0.44-beta # Minotaur https://plugins.gradle.org/plugin/com.modrinth.minotaur minotaur_version=2.8.7 # CurseForgeGradle https://plugins.gradle.org/plugin/net.darkhax.curseforgegradle @@ -86,7 +87,7 @@ curseforgegradle_version=1.1.25 # github-release https://plugins.gradle.org/plugin/com.github.breadmoirai.github-release githubrelease_version=2.5.2 # grgit-service https://github.com/ajoberstar/grgit/releases -grgitservice_version=5.2.2 +grgitservice_version=5.3.0 # licenser https://plugins.gradle.org/plugin/org.cadixdev.licenser licenser_version=0.6.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a441313..94113f2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME