bump version

Update zh_CN.lang

.gitignore

@@ -1,7 +1,6 @@
-build/build/*
-build/run/*
-build/.gradle/*
-*.ipr
-*.iml
-*.iws
-.idea/**
+.gradle/
+build/
+NotEnoughItems.iml
+NotEnoughItems.ipr
+NotEnoughItems.iws
+*.bat

README.md

@@ -0,0 +1,23 @@
+# NotEnoughItems - GTNH
+
+A continuation of NotEnoughItems for 1.7.10 by the developers of Gregtech: New Horizons modpack, with features either inspired and/or backported from JustEnoughItems
+
+ 
+
+We've tested this against all of the mods included in GTNH, as well as a limited set of other mods (like Reika's mods).  Every effort has been made to maintain backwards compatibility, however the focus is on the mods contained in the GTNH modpack.
+
+ 
+
+## New Features:
+
+* Speed - Uses a parallel stream to search the item list over multiple cores, resulting in 2-6x faster searches on average [Feels instantaneous]
+* A textbox for search with most of the features you'd expect - moving forward, backwards, selection, etc
+* Bookmarks!  What are you in the process of crafting? Bookmark it using either 'A' or configure your own key.
+* Utility/Cheat buttons line up and wrap based on GUI size
+* ItemList is no longer regenerated from the ItemRegistry on every inventory load
+ 
+## Other items of note:
+
+* Licensed under LGPL - Use this however you want, but please give back any modifications
+* Remove TMI style
+* Removed inventory Load/Save state

build.properties

@@ -2,4 +2,4 @@ mc_version=1.7.10
 forge_version=10.13.4.1614-1.7.10
 ccl_version=1.1.3.138
 ccc_version=1.0.7.+
-mod_version=2.0.0-beta-2-GTNH
+mod_version=2.0.2-GTNH

gradlew.bat

@@ -1,84 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

resources/assets/nei/lang/zh_CN.lang

@@ -1,11 +1,16 @@
 nei.load=载入
 nei.save=保存
+nei.bookmark.toggle=书签
 
 nei.enchant=附魔
 nei.enchant.level=等级
 nei.enchant.locked=锁定
 nei.enchant.unlocked=解锁
 
+nei.potion.favourite=最爱的药水
+nei.potion.duration=持续时间
+nei.potion.level=等级
+
 nei.inventory.options=选项
 nei.inventory.prev=上一页
 nei.inventory.next=下一页
@@ -39,7 +44,7 @@ nei.inventory.gamemode.3=设置为冒险模式
 nei.chat.gamemode.0=生存模式开启
 nei.chat.gamemode.1=创造模式开启
 nei.chat.gamemode.2=创造模式+开启
-nei.hat.gamemode.3=冒险模式开启
+nei.chat.gamemode.3=冒险模式开启
 nei.chat.rain.on=开启雨雪
 nei.chat.rain.off=关闭雨雪
 nei.chat.time=白天 %d. %d:00
@@ -55,16 +60,22 @@ nei.options.wbutton.tip.0=使用全局设置
 nei.options.wbutton.tip.1=覆写全局设置
 
 nei.options.keys=按键绑定
+nei.options.keys.showenchant=显示附魔
 nei.options.keys.gui=物品栏
 nei.options.keys.gui.recipe=查看合成
 nei.options.keys.gui.usage=查看用途
 nei.options.keys.gui.enchant=附魔
 nei.options.keys.gui.potion=药水
-nei.options.keys.gui.back=上一个合成表
+nei.options.keys.gui.back=返回上一合成表
 nei.options.keys.gui.prev=上一页
 nei.options.keys.gui.next=下一页
 nei.options.keys.gui.hide=隐藏/显示NEI界面
-ei.options.keys.gui.search=跳转到搜索框
+nei.options.keys.gui.next_recipe=下一合成表
+nei.options.keys.gui.prev_recipe=上一合成表
+nei.options.keys.gui.next_machine=下一机器
+nei.options.keys.gui.prev_machine=上一机器
+nei.options.keys.gui.search=跳转到搜索框
+nei.options.keys.gui.bookmark=添加书签
 nei.options.keys.world=世界
 nei.options.keys.world.chunkoverlay=区块(chunks)边界显示
 nei.options.keys.world.moboverlay=刷怪区域显示
@@ -84,7 +95,7 @@ nei.options.inventory.widgetsenabled.false=禁用NEI
 nei.options.inventory.cheatmode.0=合成模式
 nei.options.inventory.cheatmode.1=实用模式
 nei.options.inventory.cheatmode.2=作弊模式
-
+nei.options.inventory.layoutstyle=界面风格
 nei.options.inventory.profileRecipes=合成查阅性能分析
 nei.options.inventory.profileRecipes.true=开启
 nei.options.inventory.profileRecipes.false=关闭
@@ -129,6 +140,7 @@ nei.options.command.heal.tip={0}=玩家
 nei.options.world.highlight_tips=高亮显示
 nei.options.world.highlight_tips.hide=隐藏
 nei.options.world.highlight_tips.show=显示
+nei.options.world.highlight_tips.sample=样本
 
 nei.options.tools=工具
 nei.options.tools.dump=数据存储
@@ -152,11 +164,15 @@ nei.options.tools.dump.itempanel.dumped=物品面板内容已保存到.minecraft
 nei.options.tools.dump.itempanel.mode.0=CSV
 nei.options.tools.dump.itempanel.mode.1=NBT
 nei.options.tools.dump.itempanel.mode.2=Json
+nei.options.tools.dump.itempanel.mode.3=PNG
+nei.options.tools.dump.itempanel.icon.dumped=物品面板图标已保存到.minecraft/e%s
+nei.options.tools.dump.itempanel.icon.cancelled=保存取消
 
-
-
+nei.layoutstyle.minecraft=Minecraft风格
+nei.layoutstyle.oldtmi=老式TMI风格
 
 nei.recipe.page=页数 %s/%s
+nei.recipe.tooltip=合成表
 nei.recipe.shaped=有序合成
 nei.recipe.shapeless=无序合成
 nei.recipe.furnace=烧制
@@ -180,4 +196,31 @@ nei.itemsort.id=按物品ID排序
 nei.itemsort.default=默认
 nei.itemsort.default.tip=保留每个物品的自然顺序
 nei.itemsort.damage=按照物品耐久(metadata)排序
-nei.itemsort.name=按显示名称排序
+nei.itemsort.name=按显示名称排序
+
+nei.subsets.Blocks=方块
+nei.subsets.Blocks.MobSpawners=刷怪笼
+nei.subsets.CreativeTabs=创造模式标签页
+nei.subsets.Items=物品
+nei.subsets.Items.Armor=装甲
+nei.subsets.Items.Armor.Boots=靴子
+nei.subsets.Items.Armor.Chestplates=胸甲
+nei.subsets.Items.Armor.Helmets=头盔
+nei.subsets.Items.Armor.Leggings=腿甲
+nei.subsets.Items.Food=食物
+nei.subsets.Items.Potions=药水
+nei.subsets.Items.Potions.Ingredients=原料
+nei.subsets.Items.Potions.Negative=负面效果
+nei.subsets.Items.Potions.Neutral=中立效果
+nei.subsets.Items.Potions.Positive=正面效果
+nei.subsets.Items.Potions.Splash=喷溅
+nei.subsets.Items.Tools=工具
+nei.subsets.Items.Tools.Axes=斧
+nei.subsets.Items.Tools.Hoes=锄
+nei.subsets.Items.Tools.Other=其他
+nei.subsets.Items.Tools.Pickaxes=镐
+nei.subsets.Items.Tools.Shovels=铲
+nei.subsets.Items.Weapons=武器
+nei.subsets.Items.Weapons.Ranged=远程
+nei.subsets.Items.Weapons.Swords=剑
+nei.subsets.Mod=Mod

src/codechicken/nei/BookmarkPanel.java

@@ -129,6 +129,10 @@ public class BookmarkPanel extends ItemPanel {
         return false;
     }
 
+    @Override
+    public int getX(GuiContainer gui) {
+        return 5;
+    }
 
     @Override
     public int getMarginLeft() {
@@ -162,7 +166,7 @@ public class BookmarkPanel extends ItemPanel {
     }
 
     public int getWidth(GuiContainer gui) {
-        return LayoutManager.getLeftSize(gui) - x;
+        return LayoutManager.getLeftSize(gui) - ( (gui.xSize + gui.width) / 2 + 3 );
 
     }
 

src/codechicken/nei/ItemPanel.java

@@ -107,6 +107,10 @@ public class ItemPanel extends Widget {
         };
     }
 
+    public int getX(GuiContainer gui) {
+        return (gui.xSize + gui.width) / 2 + 3;
+    }
+
     public int getMarginLeft() {
         return x + (w % 18) / 2;
     }
@@ -177,7 +181,7 @@ public class ItemPanel extends Widget {
         pageLabel.text = getLabelText();
 
         y = prev.h + prev.y;
-        x = (gui.xSize + gui.width) / 2 + 3;
+        x = getX(gui);
         w = getWidth(gui);
         h = getHeight(gui);
 

src/codechicken/nei/LayoutStyleMinecraft.java

@@ -61,7 +61,7 @@ public class LayoutStyleMinecraft extends LayoutStyle
 
         //leftSize = ((gui.width - gui.xSize) / 2) - 3;
         leftSize = ItemPanels.bookmarkPanel.getWidth(gui);
-        numButtons = leftSize / 18;
+        numButtons = Math.max(leftSize / 18, 1);
 
         delete.state = 0x4;
         if (NEIController.getDeleteMode())
@@ -143,7 +143,7 @@ public class LayoutStyleMinecraft extends LayoutStyle
     }
 
     public void layoutButton(Button button) {
-        button.x = 6 + (buttonCount % numButtons) * 20;
+        button.x = 2 + (buttonCount % numButtons) * 20;
         button.y = 3 + (buttonCount / numButtons) * 18;
 
         button.h = 17;

src/codechicken/nei/recipe/RecipeItemInputHandler.java

@@ -35,9 +35,13 @@ public class RecipeItemInputHandler implements IContainerInputHandler
     public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button)
     {
         ItemStack stackover = GuiContainerManager.getStackMouseOver(gui);
-        if(stackover == null || !(gui instanceof GuiRecipe))
+
+        if(stackover == null)
             return false;
-        
+
+        if (!(gui instanceof GuiRecipe))
+            return false;
+
         if(button == 0)
             return GuiCraftingRecipe.openRecipeGui("item", stackover.copy());
 

src/codechicken/nei/recipe/TemplateRecipeHandler.java

@@ -83,9 +83,13 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
          */
         public List<PositionedStack> getOtherStacks() {
             ArrayList<PositionedStack> stacks = new ArrayList<>();
-            PositionedStack stack = getOtherStack();
-            if (stack != null)
-                stacks.add(stack);
+            try {
+                PositionedStack stack = getOtherStack();
+                if (stack != null)
+                    stacks.add(stack);
+            } catch (ArithmeticException e) {
+                NEIClientConfig.logger.error("Error in getOtherStacks: " + e);
+            }
             return stacks;
         }