Shiewk/Widgets
1
Fork 0
mirror of https://github.com/Shiewk/Widgets.git synced 2026-04-28 11:34:17 +02:00
Code Issues Activity

(2.1.0) Sort widgets on the overview screen alphabetically

Browse Source
This commit is contained in:
Shy
2025-12-05 17:38:51 +01:00
parent 895779050d
commit b924fe6f89
5 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+1 -1
View File
@@ -6,7 +6,7 @@ minecraft_version=1.21.9
yarn_mappings=1.21.9+build.1 yarn_mappings=1.21.9+build.1
loader_version=0.17.2 loader_version=0.17.2
# Mod Properties # Mod Properties
mod_version=2.0.0 mod_version=2.1.0
maven_group=de.shiewk maven_group=de.shiewk
archives_base_name=Widgets archives_base_name=Widgets
# Dependencies # Dependencies
src/main/java/de/shiewk/widgets/client/screen/EditWidgetPositionsScreen.java
+2 -1
View File
@@ -20,6 +20,7 @@ import org.joml.Vector2i;
import java.awt.*; import java.awt.*;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.function.Consumer; import java.util.function.Consumer;
public class EditWidgetPositionsScreen extends AnimatedScreen { public class EditWidgetPositionsScreen extends AnimatedScreen {
@@ -279,7 +280,7 @@ public class EditWidgetPositionsScreen extends AnimatedScreen {
List<ContextMenuScreen.Option> options = new ObjectArrayList<>(Anchor.values().length); List<ContextMenuScreen.Option> options = new ObjectArrayList<>(Anchor.values().length);
for (Anchor anchor : Anchor.values()) { for (Anchor anchor : Anchor.values()) {
options.add(new ContextMenuScreen.Option( options.add(new ContextMenuScreen.Option(
Text.translatable("widgets.ui.anchor." + anchor.name().toLowerCase()), Text.translatable("widgets.ui.anchor." + anchor.name().toLowerCase(Locale.ROOT)),
hovered.getSettings().anchor == anchor, hovered.getSettings().anchor == anchor,
() -> { () -> {
hovered.setPos( hovered.setPos(
src/main/java/de/shiewk/widgets/client/screen/components/WidgetListWidget.java
+8 -5
View File
@@ -18,7 +18,9 @@ import net.minecraft.text.Text;
import org.joml.Matrix3x2fStack; import org.joml.Matrix3x2fStack;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.function.Consumer; import java.util.function.Consumer;
public class WidgetListWidget extends ScrollableWidget { public class WidgetListWidget extends ScrollableWidget {
@@ -31,6 +33,7 @@ public class WidgetListWidget extends ScrollableWidget {
private final Consumer<ModWidget> onEdit; private final Consumer<ModWidget> onEdit;
public static boolean searchQueryMatches(String search, ModWidget widget) { public static boolean searchQueryMatches(String search, ModWidget widget) {
if (search == null) return true;
return widget.getName().getString().contains(search) || widget.getDescription().getString().contains(search) || widget.getId().toString().contains(search); return widget.getName().getString().contains(search) || widget.getDescription().getString().contains(search) || widget.getId().toString().contains(search);
} }
@@ -44,11 +47,11 @@ public class WidgetListWidget extends ScrollableWidget {
} }
private List<ModWidget> loadWidgets(String search) { private List<ModWidget> loadWidgets(String search) {
if (search == null) { return WidgetManager.getAllWidgets()
return WidgetManager.getAllWidgets(); .stream()
} else { .filter(w -> searchQueryMatches(search, w))
return WidgetManager.getAllWidgets().stream().filter(w -> searchQueryMatches(search, w)).toList(); .sorted(Comparator.comparing(w -> w.getName().getString().toLowerCase(Locale.ROOT)))
} .toList();
} }
private void init(){ private void init(){
src/main/java/de/shiewk/widgets/widgets/ArmorHudWidget.java
+2 -1
View File
@@ -16,6 +16,7 @@ import net.minecraft.text.Text;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import java.util.List; import java.util.List;
import java.util.Locale;
import static net.minecraft.text.Text.translatable; import static net.minecraft.text.Text.translatable;
@@ -41,7 +42,7 @@ public class ArmorHudWidget extends ResizableWidget {
PERCENT; PERCENT;
public Text getDisplayName() { public Text getDisplayName() {
return translatable("widgets.widgets.armorHud.durabilityStyle." + name().toLowerCase()); return translatable("widgets.widgets.armorHud.durabilityStyle." + name().toLowerCase(Locale.ROOT));
} }
} }
src/main/java/de/shiewk/widgets/widgets/InventoryWidget.java
+2 -1
View File
@@ -16,6 +16,7 @@ import net.minecraft.text.Text;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import java.util.List; import java.util.List;
import java.util.Locale;
import static net.minecraft.text.Text.translatable; import static net.minecraft.text.Text.translatable;
@@ -42,7 +43,7 @@ public class InventoryWidget extends ResizableWidget {
} }
public Text display() { public Text display() {
return translatable("widgets.widgets.inventory.mode." + name().toLowerCase()); return translatable("widgets.widgets.inventory.mode." + name().toLowerCase(Locale.ROOT));
} }
} }