Skip to content

Commit f151ee5

Browse files
committed
Update to mc1.21.4
1 parent 2e8c755 commit f151ee5

File tree

3 files changed

+24
-22
lines changed

3 files changed

+24
-22
lines changed

common/src/main/java/dev/terminalmc/moremousetweaks/MoreMouseTweaks.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public static void init() {
4040
}
4141

4242
public static void onConfigSaved(Config config) {
43-
if (Minecraft.getInstance().getSingleplayerServer() == null) {
43+
//noinspection ConstantValue
44+
if (Minecraft.getInstance() == null || Minecraft.getInstance().getSingleplayerServer() == null) {
4445
InteractionManager.setTickRate(config.options.interactionRateServer);
4546
} else {
4647
InteractionManager.setTickRate(config.options.interactionRateClient);
@@ -59,7 +60,8 @@ public static void updateItemTags(Config.Options options) {
5960
}
6061

6162
public static void setInteractionManagerTickRate(Config.Options options) {
62-
if (Minecraft.getInstance().getSingleplayerServer() == null) {
63+
//noinspection ConstantValue
64+
if (Minecraft.getInstance() == null || Minecraft.getInstance().getSingleplayerServer() == null) {
6365
InteractionManager.setTickRate(options.interactionRateServer);
6466
} else {
6567
InteractionManager.setTickRate(options.interactionRateClient);

common/src/main/java/dev/terminalmc/moremousetweaks/mixin/quick/MixinAbstractWidget.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
@Mixin(AbstractWidget.class)
3333
public abstract class MixinAbstractWidget {
3434
@Shadow
35-
protected abstract boolean clicked(double mouseX, double mouseY);
35+
public abstract boolean isMouseOver(double mouseX, double mouseY);
3636

3737
@Inject(
3838
method = "mouseClicked",
@@ -43,7 +43,7 @@ public abstract class MixinAbstractWidget {
4343
cancellable = true
4444
)
4545
public void mouseClicked(double x, double y, int button, CallbackInfoReturnable<Boolean> cir) {
46-
if (this.clicked(x, y)) {
46+
if (this.isMouseOver(x, y)) {
4747
if (this instanceof ISpecialClickableButtonWidget widget) {
4848
if (widget.mmt$mouseClicked(button)) {
4949
cir.setReturnValue(true);

gradle.properties

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,44 +27,44 @@ java_versions_fabric=>=21
2727
java_versions_neoforge=[21,)
2828

2929
# Minecraft
30-
minecraft_version=1.21.3
31-
minecraft_versions_fabric=>1.21.1 <1.22
32-
minecraft_versions_neoforge=(1.21.1, 1.22)
30+
minecraft_version=1.21.4
31+
minecraft_versions_fabric=>1.21.3 <1.22
32+
minecraft_versions_neoforge=(1.21.3, 1.22)
3333

3434
# Parchment https://parchmentmc.org/docs/getting-started#choose-a-version
35-
parchment_minecraft_version=1.21.3
36-
parchment_version=2024.12.07
35+
parchment_minecraft_version=1.21.4
36+
parchment_version=2025.03.23
3737

3838
# Fabric https://fabricmc.net/develop
3939
fabric_loader_version=0.16.9
4040
fabric_loader_versions=>=0.15.0
41-
fabric_api_version=0.110.0+1.21.3
41+
fabric_api_version=0.119.2+1.21.4
4242
fabric_api_versions=*
4343

4444
# NeoForge https://projects.neoforged.net/neoforged/neoforge
4545
neoforge_loader_versions=[1,)
46-
neoforge_version=21.3.57
47-
neoforge_versions=[21.2.0, 22)
46+
neoforge_version=21.4.123
47+
neoforge_versions=[21.4.0, 22)
4848
# NeoForm https://projects.neoforged.net/neoforged/neoform
49-
neoform_version=1.21.3-20241023.131943
49+
neoform_version=1.21.4-20241203.161809
5050

5151
# MouseTweaks https://modrinth.com/mod/aC3cM3Vq/versions
52-
mousetweaks_version_fabric=1.21.3-2.26.1-fabric
52+
mousetweaks_version_fabric=1.21.3-2.27-fabric
5353
mousetweaks_versions_fabric=*
5454
mousetweaks_version_neoforge=1.21.3-2.26.1-neoforge
5555
mousetweaks_versions_neoforge=[1,)
5656

5757
# Cloth Config https://modrinth.com/mod/9s6osm5g/versions
58-
clothconfig_version=16.0.141
59-
clothconfig_versions_fabric=>=16
60-
clothconfig_versions_neoforge=[16,)
58+
clothconfig_version=17.0.144
59+
clothconfig_versions_fabric=>=17
60+
clothconfig_versions_neoforge=[17,)
6161

6262
# ModMenu https://modrinth.com/mod/mOgUt4GM/versions
63-
modmenu_version=12.0.0
64-
modmenu_versions_fabric=>=12.0.0-beta.1
63+
modmenu_version=13.0.3
64+
modmenu_versions_fabric=>=13.0.0-beta.1
6565

6666
# ItemLocks https://modrinth.com/mod/tJzrFuyy/versions
67-
itemlocks_version=1.21.2-1.3.9
67+
itemlocks_version=1.21.4-1.3.10
6868

6969
# GitHub, Modrinth, CurseForge releases
7070
# Plural properties expect CSV lists
@@ -76,12 +76,12 @@ curseforge_slug=moremousetweaks
7676
release_type=STABLE
7777
# Fabric
7878
release_mod_loaders_fabric=fabric
79-
release_game_versions_fabric=1.21.2,1.21.3
79+
release_game_versions_fabric=1.21.4,1.21.5
8080
release_required_dep_ids_fabric_mr=aC3cM3Vq,P7dR8mSH,mOgUt4GM,9s6osm5g
8181
release_required_dep_ids_fabric_cf=mouse-tweaks,fabric-api,modmenu,cloth-config
8282
# NeoForge
8383
release_mod_loaders_neoforge=neoforge
84-
release_game_versions_neoforge=1.21.2,1.21.3
84+
release_game_versions_neoforge=1.21.4,1.21.5
8585
release_required_dep_ids_neoforge_mr=aC3cM3Vq,9s6osm5g
8686
release_required_dep_ids_neoforge_cf=mouse-tweaks,cloth-config
8787

0 commit comments

Comments
 (0)