Compare commits

..
Author SHA1 Message Date
Martin Robertz 8ae3304861 update 2025-04-25 13:38:04 +02:00
0dc7bc1228 Create Favorites Widget; More hotkeys; More Tooltips; (#617)
Co-authored-by: slprime <[email protected]>
Co-authored-by: Maya <[email protected]>
2025-04-24 17:48:40 +02:00
Maya 19d8b42993 update 2025-04-08 23:53:43 -05:00
Kogepan229 3b7eae67af Add AE2 Cell View handlers (#621) 2025-04-08 23:51:52 -05:00
4 changed files with 48 additions and 46 deletions

No files matched your search

+1 -1
View File
@@ -2,7 +2,7 @@
dependencies {
api('com.github.GTNewHorizons:CodeChickenCore:1.4.1:dev')
implementation('com.github.GTNewHorizons:GTNHLib:0.6.18:dev')
implementation('com.github.GTNewHorizons:GTNHLib:0.6.20:dev')
shadowImplementation('org.apache.commons:commons-csv:1.10.0')
@@ -1,7 +1,5 @@
package codechicken.nei;
import static codechicken.nei.NEIClientUtils.translate;
import java.awt.Point;
import java.io.File;
import java.io.FileInputStream;
@@ -148,7 +146,7 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
@Override
public String getButtonTip() {
return translate("bookmark.pullBookmarkedItems.tip");
return NEIClientUtils.translate("bookmark.pullBookmarkedItems.tip");
}
};
@@ -674,7 +672,7 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
if (overRowIndex != -1) {
final int groupId = this.grid.getRowGroupId(overRowIndex);
currenttip.add(translate("bookmark.group"));
currenttip.add(NEIClientUtils.translate("bookmark.group"));
if (groupId != BookmarkGrid.DEFAULT_GROUP_ID) {
currenttip = recipeChainTooltip(groupId, currenttip);
@@ -684,7 +682,7 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
} else
if (new Rectangle4i(pagePrev.x + pagePrev.w, pagePrev.y, pageNext.x - (pagePrev.x + pagePrev.w), pagePrev.h)
.contains(mousex, mousey)) {
currenttip.add(translate("bookmark.group"));
currenttip.add(NEIClientUtils.translate("bookmark.group"));
currenttip = recipeChainTooltip(BookmarkGrid.DEFAULT_GROUP_ID, currenttip);
} else {
this.recipeChainTooltipLineHandler = null;
@@ -731,32 +729,36 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
NEIClientUtils.getKeyName(
NEIClientUtils.CTRL_HASH,
NEIMouseUtils.MOUSE_BTN_NONE + NEIMouseUtils.MOUSE_SCROLL),
NEIClientUtils.translate("bookmark.group.change_quantity"));
NEIClientUtils.translate("bookmark.change_quantity"));
hotkeys.put(
NEIClientUtils.getKeyName(
NEIClientUtils.CTRL_HASH + NEIClientUtils.ALT_HASH,
NEIMouseUtils.MOUSE_BTN_NONE + NEIMouseUtils.MOUSE_SCROLL),
NEIClientUtils.translate("bookmark.group.change_quantity_step"));
NEIClientUtils.translate("bookmark.change_quantity_step"));
hotkeys.put(NEIMouseUtils.getKeyName(NEIMouseUtils.MOUSE_BTN_LMB), translate("bookmark.group.toggle_mode"));
hotkeys.put(
NEIMouseUtils.getKeyName(NEIMouseUtils.MOUSE_BTN_LMB),
NEIClientUtils.translate("bookmark.group.toggle_mode"));
hotkeys.put(
NEIMouseUtils.getKeyName(NEIMouseUtils.MOUSE_BTN_RMB),
translate("bookmark.group.toggle_crafting_chain"));
hotkeys.put(NEIClientConfig.getKeyName("gui.remove_recipe"), translate("bookmark.group.remove_recipe"));
NEIClientUtils.translate("bookmark.group.toggle_crafting_chain"));
hotkeys.put(
NEIClientConfig.getKeyName("gui.remove_recipe"),
NEIClientUtils.translate("bookmark.group.remove_recipe"));
if (BookmarkContainerInfo.getBookmarkContainerHandler(gui) != null) {
hotkeys.put(
NEIClientConfig.getKeyName("gui.bookmark_pull_items"),
translate("bookmark.group.pull_items"));
NEIClientUtils.translate("bookmark.group.pull_items"));
hotkeys.put(
NEIClientConfig.getKeyName("gui.bookmark_pull_items", NEIClientUtils.SHIFT_HASH),
translate("bookmark.group.pull_items_shift"));
NEIClientUtils.translate("bookmark.group.pull_items_shift"));
}
hotkeys.put(
NEIClientUtils.getKeyName(NEIClientUtils.ALT_HASH, NEIMouseUtils.MOUSE_BTN_LMB),
translate("bookmark.group.toggle_collapse"));
NEIClientUtils.translate("bookmark.group.toggle_collapse"));
}
if (overRowIndex != -1) {
@@ -764,7 +766,7 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
hotkeys.put(
NEIMouseUtils.getKeyName(NEIMouseUtils.MOUSE_BTN_LMB + NEIMouseUtils.MOUSE_DRAG),
translate("bookmark.group.include_group"));
NEIClientUtils.translate("bookmark.group.include_group"));
if (groupId != BookmarkGrid.DEFAULT_GROUP_ID) {
@@ -772,33 +774,33 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
NEIClientUtils.getKeyName(
NEIClientUtils.CTRL_HASH,
NEIMouseUtils.MOUSE_BTN_NONE + NEIMouseUtils.MOUSE_SCROLL),
NEIClientUtils.translate("bookmark.group.change_quantity"));
NEIClientUtils.translate("bookmark.change_quantity"));
hotkeys.put(
NEIClientUtils.getKeyName(
NEIClientUtils.CTRL_HASH + NEIClientUtils.ALT_HASH,
NEIMouseUtils.MOUSE_BTN_NONE + NEIMouseUtils.MOUSE_SCROLL),
NEIClientUtils.translate("bookmark.group.change_quantity_step"));
NEIClientUtils.translate("bookmark.change_quantity_step"));
hotkeys.put(
NEIMouseUtils.getKeyName(NEIMouseUtils.MOUSE_BTN_RMB + NEIMouseUtils.MOUSE_DRAG),
translate("bookmark.group.exclude_group"));
NEIClientUtils.translate("bookmark.group.exclude_group"));
hotkeys.put(
NEIMouseUtils.getKeyName(NEIMouseUtils.MOUSE_BTN_LMB),
translate("bookmark.group.toggle_mode"));
NEIClientUtils.translate("bookmark.group.toggle_mode"));
hotkeys.put(
NEIMouseUtils.getKeyName(NEIMouseUtils.MOUSE_BTN_RMB),
translate("bookmark.group.toggle_crafting_chain"));
NEIClientUtils.translate("bookmark.group.toggle_crafting_chain"));
hotkeys.put(
NEIClientUtils.getKeyName(
NEIClientUtils.SHIFT_HASH,
NEIMouseUtils.MOUSE_BTN_LMB + NEIMouseUtils.MOUSE_DRAG),
translate("bookmark.group.sorting"));
NEIClientUtils.translate("bookmark.group.sorting"));
hotkeys.put(
NEIClientUtils.getKeyName(NEIClientUtils.ALT_HASH, NEIMouseUtils.MOUSE_BTN_LMB),
translate("bookmark.group.toggle_collapse"));
NEIClientUtils.translate("bookmark.group.toggle_collapse"));
}
}
@@ -809,22 +811,28 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
NEIClientUtils.getKeyName(
NEIClientUtils.CTRL_HASH,
NEIMouseUtils.MOUSE_BTN_NONE + NEIMouseUtils.MOUSE_SCROLL),
NEIClientUtils.translate("itempanel.change_quantity"));
NEIClientUtils.translate("bookmark.change_quantity"));
hotkeys.put(
NEIClientUtils.getKeyName(
NEIClientUtils.CTRL_HASH + NEIClientUtils.ALT_HASH,
NEIMouseUtils.MOUSE_BTN_NONE + NEIMouseUtils.MOUSE_SCROLL),
NEIClientUtils.translate("itempanel.change_quantity_step"));
NEIClientUtils.translate("bookmark.change_quantity_step"));
hotkeys.put(
NEIClientUtils.getKeyName(
NEIClientUtils.SHIFT_HASH,
NEIMouseUtils.MOUSE_BTN_LMB + NEIMouseUtils.MOUSE_DRAG),
NEIClientUtils.translate("bookmark.item.sorting"));
if (group.collapsed) {
hotkeys.put(
NEIClientUtils.getKeyName(NEIClientUtils.ALT_HASH, NEIMouseUtils.MOUSE_BTN_LMB),
translate("bookmark.group.toggle_collapse"));
NEIClientUtils.translate("bookmark.group.toggle_collapse"));
} else if (group.crafting != null) {
hotkeys.put(
NEIClientUtils.getKeyName(NEIClientUtils.ALT_HASH, NEIMouseUtils.MOUSE_BTN_LMB),
translate("bookmark.recipe.toggle_collapse"));
NEIClientUtils.translate("bookmark.recipe.toggle_collapse"));
}
if (this.acceptsFollowingTooltipLineHandler != null) {
@@ -347,13 +347,12 @@ public abstract class ShortcutInputHandler {
if (slot != null) {
hotkeys.put(
NEIClientConfig.getKeyName("gui.bookmark"),
NEIClientUtils
.translate(slot.isIngredient() ? "itempanel.remove_item" : "itempanel.remove_recipe"));
NEIClientUtils.translate(slot.isIngredient() ? "bookmark.remove_item" : "bookmark.remove_recipe"));
if (slot.isIngredient()) {
hotkeys.put(
NEIClientConfig.getKeyName("gui.bookmark", NEIClientUtils.SHIFT_HASH),
NEIClientUtils.translate("itempanel.remove_recipe"));
NEIClientUtils.translate("bookmark.remove_recipe"));
}
if (BookmarkContainerInfo.getBookmarkContainerHandler(gui) != null) {
@@ -366,18 +365,18 @@ public abstract class ShortcutInputHandler {
}
} else {
hotkeys.put(NEIClientConfig.getKeyName("gui.bookmark"), NEIClientUtils.translate("itempanel.add_item"));
hotkeys.put(NEIClientConfig.getKeyName("gui.bookmark"), NEIClientUtils.translate("bookmark.add_item"));
if (StackInfo.getAmount(stack) > 0) {
hotkeys.put(
NEIClientConfig.getKeyName("gui.bookmark", NEIClientUtils.CTRL_HASH),
NEIClientUtils.translate("itempanel.add_item_with_count"));
NEIClientUtils.translate("bookmark.add_item_with_count"));
}
if (recipeId != null) {
hotkeys.put(
NEIClientConfig.getKeyName("gui.bookmark", NEIClientUtils.SHIFT_HASH),
NEIClientUtils.translate("itempanel.add_item_with_recipe"));
NEIClientUtils.translate("bookmark.add_item_with_recipe"));
}
}
+9 -14
View File
@@ -26,13 +26,19 @@ nei.bookmark.group.toggle_mode=Toggle Group Mode
nei.bookmark.group.toggle_collapse=Toggle Collapse/Expand
nei.bookmark.group.toggle_crafting_chain=Toggle Crafting Chain
nei.bookmark.group.overlay_use=Fill Crafting Grid
nei.bookmark.group.sorting=Sorting
nei.bookmark.group.sorting=Move Position
nei.bookmark.group.remove_recipe=Remove Group
nei.bookmark.group.pull_items=Pull all Items
nei.bookmark.group.pull_items_shift=Pull missing Items
nei.bookmark.group.craft=Craft Group
nei.bookmark.group.change_quantity=Change Quantity
nei.bookmark.group.change_quantity_step=Change Quantity with Multiplier
nei.bookmark.item.sorting=Move Position
nei.bookmark.remove_recipe=Remove Recipe
nei.bookmark.remove_item=Remove Item
nei.bookmark.add_item=Add Bookmark
nei.bookmark.add_item_with_recipe=Add Bookmark with Recipe
nei.bookmark.add_item_with_count=Add Bookmark with Count
nei.bookmark.change_quantity=Change Quantity
nei.bookmark.change_quantity_step=Change Quantity with Multiplier
nei.bookmark.recipe.toggle_collapse=Toggle Collapse/Expand
nei.bookmark.crafting_chain=Crafting Chain
nei.bookmark.crafting_chain.input=Ingredients
@@ -40,29 +46,18 @@ nei.bookmark.crafting_chain.missing=Missing Items
nei.bookmark.crafting_chain.output=Results
nei.bookmark.crafting_chain.remainder=Remainders
nei.bookmark.crafting_chain.available=Available Items
nei.itempanel.quantity.default=One stack
nei.itempanel.loading=Loading Item List...
nei.itempanel.deleteItem=Delete Item
nei.itempanel.collapsed.button.tip=Collapse/Expand All Collapsible Items
nei.itempanel.collapsed.hint.expand=Expand Group (%d items)
nei.itempanel.collapsed.hint.collapse=Collapse Group (%d items)
nei.itempanel.remove_recipe=Remove Recipe
nei.itempanel.remove_item=Remove Item
nei.itempanel.add_item=Add Bookmark
nei.itempanel.add_item_with_recipe=Add Bookmark with Recipe
nei.itempanel.add_item_with_count=Add Bookmark with Count
nei.itempanel.change_quantity=Change Quantity
nei.itempanel.change_quantity_step=Change Quantity with Multiplier
nei.itempanel.overlay_recipe=Overlay Recipe
nei.itempanel.craft=Craft Recipe
nei.itempanel.fill_crafting_grid=Fill Crafting Grid
nei.itempanel.fill_crafting_grid_quantity=Fill Crafting Grid With Quantity
nei.itempanel.open_crafting=Recipe to make this item
nei.itempanel.open_usage=Recipes that use this item
nei.itempanel.sort_item=Sorting
nei.itempanel.sort_recipe=Sorting
nei.itempanel.copy_name=Copy Item Name
nei.itempanel.copy_oredict=Copy Item OreDictionary