Skip to content

Commit 374ab4b

Browse files
committed
Add support for sorting the QIO by item registry name
1 parent 69ec077 commit 374ab4b

File tree

7 files changed

+21
-4
lines changed

7 files changed

+21
-4
lines changed

src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -893,9 +893,11 @@ private void addMisc() {
893893
add(MekanismLang.LIST_SORT_COUNT, "Count");
894894
add(MekanismLang.LIST_SORT_NAME, "Name");
895895
add(MekanismLang.LIST_SORT_MOD, "Mod");
896+
add(MekanismLang.LIST_SORT_REGISTRY_NAME, "Item ID");
896897
add(MekanismLang.LIST_SORT_NAME_DESC, "Sort items by name.");
897898
add(MekanismLang.LIST_SORT_COUNT_DESC, "Sort items by count.");
898899
add(MekanismLang.LIST_SORT_MOD_DESC, "Sort items by mod.");
900+
add(MekanismLang.LIST_SORT_REGISTRY_NAME_DESC, "Sort items by registry name.");
899901
add(MekanismLang.LIST_SORT_ASCENDING_DESC, "Sort items in ascending order.");
900902
add(MekanismLang.LIST_SORT_DESCENDING_DESC, "Sort items in descending order.");
901903
add(MekanismLang.LIST_SEARCH, "Search:");

src/main/java/mekanism/common/MekanismLang.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,11 @@ public enum MekanismLang implements ILangEntry {
7676
LIST_SORT_COUNT("qio", "sort_count"),
7777
LIST_SORT_NAME("qio", "sort_name"),
7878
LIST_SORT_MOD("qio", "sort_mod"),
79+
LIST_SORT_REGISTRY_NAME("qio", "sort_registry_name"),
7980
LIST_SORT_NAME_DESC("qio", "sort_name_desc"),
8081
LIST_SORT_COUNT_DESC("qio", "sort_count_desc"),
8182
LIST_SORT_MOD_DESC("qio", "sort_mod_desc"),
83+
LIST_SORT_REGISTRY_NAME_DESC("qio", "sort_registry_name.desc"),
8284
LIST_SORT_ASCENDING_DESC("qio", "sort_ascending_desc"),
8385
LIST_SORT_DESCENDING_DESC("qio", "sort_descending_desc"),
8486
LIST_SEARCH("qio", "list_search"),

src/main/java/mekanism/common/inventory/ISlotClickHandler.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import mekanism.common.annotations.GLFWMouseButtons;
66
import mekanism.common.lib.inventory.HashedItem;
77
import mekanism.common.util.MekanismUtils;
8+
import mekanism.common.util.RegistryUtils;
9+
import net.minecraft.resources.ResourceLocation;
810
import net.minecraft.world.item.ItemStack;
911
import org.jetbrains.annotations.Nullable;
1012

@@ -27,5 +29,9 @@ default String getDisplayName() {
2729
default String getModID() {
2830
return MekanismUtils.getModId(item().getInternalStack());
2931
}
32+
33+
default ResourceLocation getRegistryName() {
34+
return RegistryUtils.getName(item().getInternalStack().getItem());
35+
}
3036
}
3137
}

src/main/java/mekanism/common/inventory/container/QIOItemViewerContainer.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,10 @@ public enum ListSortType implements IDropdownEnum<ListSortType> {
591591
SIZE(MekanismLang.LIST_SORT_COUNT, MekanismLang.LIST_SORT_COUNT_DESC, Comparator.comparingLong(IScrollableSlot::count).thenComparing(IScrollableSlot::getDisplayName),
592592
Comparator.comparingLong(IScrollableSlot::count).reversed().thenComparing(IScrollableSlot::getDisplayName)),
593593
MOD(MekanismLang.LIST_SORT_MOD, MekanismLang.LIST_SORT_MOD_DESC, Comparator.comparing(IScrollableSlot::getModID).thenComparing(IScrollableSlot::getDisplayName),
594-
Comparator.comparing(IScrollableSlot::getModID).reversed().thenComparing(IScrollableSlot::getDisplayName));
594+
Comparator.comparing(IScrollableSlot::getModID).reversed().thenComparing(IScrollableSlot::getDisplayName)),
595+
REGISTRY_NAME(MekanismLang.LIST_SORT_REGISTRY_NAME, MekanismLang.LIST_SORT_REGISTRY_NAME_DESC,
596+
Comparator.comparing(IScrollableSlot::getRegistryName, ResourceLocation::compareNamespaced).thenComparingLong(IScrollableSlot::count),
597+
Comparator.comparing(IScrollableSlot::getRegistryName, ResourceLocation::compareNamespaced).reversed().thenComparingLong(IScrollableSlot::count));
595598

596599
private final ILangEntry name;
597600
private final ILangEntry tooltip;

0 commit comments

Comments
 (0)