Skip to content

Commit 3072905

Browse files
committed
Only reset selected entry if null
1 parent 70633d0 commit 3072905

2 files changed

Lines changed: 27 additions & 4 deletions

File tree

fabric/src/main/java/dev/terminalmc/modlistmemory/mixin/MixinModsScreen.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@
1616

1717
package dev.terminalmc.modlistmemory.mixin;
1818

19+
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
20+
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
1921
import com.terraformersmc.modmenu.gui.ModsScreen;
2022
import com.terraformersmc.modmenu.gui.widget.ModListWidget;
23+
import com.terraformersmc.modmenu.gui.widget.entries.ModListEntry;
2124
import dev.terminalmc.modlistmemory.config.Config;
2225
import org.spongepowered.asm.mixin.Mixin;
2326
import org.spongepowered.asm.mixin.Shadow;
@@ -33,6 +36,26 @@ public class MixinModsScreen {
3336
@Shadow
3437
private ModListWidget modList;
3538

39+
@Shadow
40+
private ModListEntry selected;
41+
42+
@WrapOperation(
43+
method = "init",
44+
at = @At(
45+
value = "INVOKE",
46+
target = "Lcom/terraformersmc/modmenu/gui/ModsScreen;updateSelectedEntry(Lcom/terraformersmc/modmenu/gui/widget/entries/ModListEntry;)V"
47+
)
48+
)
49+
private void wrapUpdatedSelectedEntry(
50+
ModsScreen instance,
51+
ModListEntry modListEntry,
52+
Operation<Void> original
53+
) {
54+
if (this.selected == null) {
55+
original.call(instance, modListEntry);
56+
}
57+
}
58+
3659
@Inject(
3760
method = "init",
3861
at = @At("RETURN")

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ mod_curseforge_slug=modlistmemory
5454
# Subproject Build Compatibility
5555
# -> Comment out or unset to disable publishing of a subproject.
5656
mod_loaders_fabric=fabric
57-
mc_versions_fabric=1.21.9,1.21.10
57+
mc_versions_fabric=1.21.9,1.21.10,1.21.11
5858
mod_loaders_neoforge=neoforge
59-
mc_versions_neoforge=1.21.10
59+
mc_versions_neoforge=1.21.10,1.21.11
6060

6161
# Java
6262
java_version=21
@@ -117,8 +117,8 @@ vr_neoforge_clothconfig=[20,)
117117

118118
# ModMenu https://modrinth.com/project/mOgUt4GM/versions
119119
d_fabric_modmenu=-:-:imp:maven.modrinth:mOgUt4GM:$v:-,depends:modmenu,req:mOgUt4GM,req:modmenu
120-
v_modmenu=16.0.0-rc.1
121-
vr_fabric_modmenu=>=16.0.0-rc.1
120+
v_modmenu=16.0.0
121+
vr_fabric_modmenu=>=16.0.0
122122

123123
# Better Modlist https://modrinth.com/project/sbpqhzIG/versions
124124
d_neoforge_bettermodlist=-:-:imp:maven.modrinth:sbpqhzIG:$v:-,required:better-modlist,req:sbpqhzIG,req:better-modlist-neoforge

0 commit comments

Comments
 (0)