Change lang entries (#69)

Author: ko-lja

src/generated/resources/assets/ae2/lang/en_us.json

@@ -464,8 +464,8 @@
   "gui.ae2.SearchTooltip": "Search in Name",
   "gui.ae2.SearchTooltipItemId": "Use * to search by id (*cell)",
   "gui.ae2.SearchTooltipModId": "Use @ to search by mod (@ae2)",
-  "gui.ae2.SearchTooltipTag": "Use $ to search by tags ($ingot)",
-  "gui.ae2.SearchTooltipToolTips": "Use # to search in tooltips (#looting)",
+  "gui.ae2.SearchTooltipTag": "Use # to search by tags (#ingot)",
+  "gui.ae2.SearchTooltipToolTips": "Use $ to search in tooltips ($looting)",
   "gui.ae2.SelectAmount": "Select Amount",
   "gui.ae2.SelectName": "Select Name",
   "gui.ae2.SelectedCraftingCPU": "Crafting CPU: %s",

src/main/java/appeng/client/gui/me/search/RepoSearch.java

@@ -70,9 +70,9 @@ private List<Predicate<GridInventoryEntry>> getPredicates(String query) {
         for (String part : terms) {
             if (part.startsWith("@")) {
                 predicateFilters.add(new ModSearchPredicate(part.substring(1)));
-            } else if (part.startsWith("#")) {
-                predicateFilters.add(new TooltipsSearchPredicate(part.substring(1), tooltipCache));
             } else if (part.startsWith("$")) {
+                predicateFilters.add(new TooltipsSearchPredicate(part.substring(1), tooltipCache));
+            } else if (part.startsWith("#")) {
                 predicateFilters.add(new TagSearchPredicate(part.substring(1)));
             } else if (part.startsWith("*")) {
                 predicateFilters.add(new ItemIdSearchPredicate(part.substring(1)));

src/main/java/appeng/core/localization/GuiText.java

@@ -234,9 +234,9 @@ public enum GuiText implements LocalizationEnum {
     SearchSettingsReplaceWithExternal("Replace with %s search"),
     SearchTooltip("Search in Name"),
     SearchTooltipModId("Use @ to search by mod (@ae2)"),
-    SearchTooltipToolTips("Use # to search in tooltips (#looting)"),
+    SearchTooltipToolTips("Use $ to search in tooltips ($looting)"),
     SearchTooltipItemId("Use * to search by id (*cell)"),
-    SearchTooltipTag("Use $ to search by tags ($ingot)"),
+    SearchTooltipTag("Use # to search by tags (#ingot)"),
     StorageCellTooltipUpgrades("Upgrades:"),
     Stored("Stored"),
     StoredEnergy("Stored Energy"),