Skip to content

Commit

Permalink
Fix crash when search yields no results
Browse files Browse the repository at this point in the history
Signed-off-by: Lilly Rose Berner <lilly@lostluma.net>
  • Loading branch information
LostLuma committed Feb 20, 2025
1 parent 062bdf2 commit 35edff5
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 2 deletions.
3 changes: 3 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ dependencies {
modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
compileOnly "org.quiltmc:quilt-loader:${project.quilt_loader_version}"

implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${project.mixinextras_version}"))
include("io.github.llamalad7:mixinextras-fabric:${project.mixinextras_version}:slim")

ploceus.dependOsl(project.osl_version)
}

Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ archives_base_name = modmenu
# Dependencies
minecraft_version = 1.12.2
feather_build = 19
fabric_loader_version = 0.14.22
fabric_loader_version = 0.16.10
quilt_loader_version = 0.19.2
mixinextras_version=0.5.0-beta.5
osl_version = 0.10.3
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package com.terraformersmc.modmenu.mixin;

import com.llamalad7.mixinextras.expression.Definition;
import com.llamalad7.mixinextras.expression.Expression;
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import com.llamalad7.mixinextras.sugar.Local;
import net.minecraft.client.gui.widget.ListWidget;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;

@Mixin(ListWidget.class)
public abstract class ListWidgetMixin {
@Shadow
protected abstract int getHeight();

@Definition(id = "maxScroll", local = @Local(type = int.class, ordinal = 7))
@Expression("maxScroll > 0")
@ModifyExpressionValue(method = "render(IIF)V", at = @At("MIXINEXTRAS:EXPRESSION"))
private boolean skipBlock(boolean original) {
if (this.getHeight() == 0) {
return false;
} else {
return original;
}
}
}
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"depends": {
"minecraft": "1.12.x",
"fabricloader": ">=0.14.21",
"fabricloader": ">=0.16.10",
"osl-entrypoints": ">=0.4.0",
"osl-resource-loader": ">=0.2.3"
},
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/mixins.modmenu.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@
"client": [
"AccessorButtonWidget",
"InvokerScreen",
"ListWidgetMixin",
"MixinGameMenu",
"MixinTitleScreen"
],
"injectors": {
"defaultRequire": 1
},
"mixinextras": {
"minVersion": "0.5.0-beta.5"
}
}

0 comments on commit 35edff5

Please sign in to comment.