Skip to content

Commit

Permalink
Update to mc1.21.3
Browse files Browse the repository at this point in the history
  • Loading branch information
NotRyken committed Dec 20, 2024
1 parent 506a664 commit 7428cb3
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 14 deletions.
18 changes: 18 additions & 0 deletions common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
}
}
28 changes: 15 additions & 13 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Neo/Forge version ranges: https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html

# Project
mod_version=0.3.0+1.21
mod_version=0.3.0+1.21.3
mod_group=dev.terminalmc
mod_id=flashside
mod_name=Flashside
Expand All @@ -24,8 +24,8 @@ 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
Expand All @@ -34,24 +34,24 @@ parchment_version=2024.11.10
# Fabric https://fabricmc.net/develop
fabric_loader_version=0.16.9
fabric_loader_versions=>=0.15.0
fabric_api_version=0.102.0+1.21
fabric_api_version=0.110.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.57
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_versions_fabric=>=15
clothconfig_versions_neoforge=[15,)
clothconfig_version=16.0.141
clothconfig_versions_fabric=>=16
clothconfig_versions_neoforge=[16,)

# ModMenu https://modrinth.com/mod/mOgUt4GM/versions
modmenu_version=11.0.3
modmenu_versions_fabric=>=11.0.0-beta.1
modmenu_version=12.0.0
modmenu_versions_fabric=>=12.0.0-beta.1

# Flashback https://modrinth.com/mod/4das1Fjq/versions
flashback_version=0.13.0
Expand All @@ -67,7 +67,7 @@ curseforge_slug=aaaaaa
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,1.21.4
release_required_dep_ids_fabric_mr=4das1Fjq,P7dR8mSH,mOgUt4GM,9s6osm5g

# Mixin https://mvnrepository.com/artifact/org.spongepowered/mixin
Expand All @@ -76,6 +76,8 @@ mixin_version=0.8.7
mixinextras_version=0.4.1
# MixinSquared https://github.com/Bawnorton/MixinSquared/releases
mixinsquared_version=0.2.0
# ASM https://mvnrepository.com/artifact/org.ow2.asm/asm
asm_version=9.7

# Plugins
# Fabric Loom https://mvnrepository.com/artifact/net.fabricmc/fabric-loom
Expand Down

0 comments on commit 7428cb3

Please sign in to comment.