Skip to content

Commit 7acca1c

Browse files
author
zy
committed
更新
1 parent f556c60 commit 7acca1c

3 files changed

Lines changed: 27 additions & 3 deletions

File tree

src/main/java/com/asdflj/nech/integration/nei/ButtonConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ public interface ButtonConstants {
66
String PARENTHESES = "nech.parentheses";
77
String VOLTAGE = "nech.contain_with_voltage";
88
String LUA_SCRIPT = "nech.lua_script";
9-
String LUA_SCRIPTS = "nech.lua_scripts.";
9+
String LUA_SCRIPTS = "nech.lua_scripts";
1010

1111
}

src/main/java/com/asdflj/nech/integration/nei/LuaToggleButton.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public LuaToggleButton(String name) {
1515
}
1616

1717
private LuaToggleButton(String name, boolean defaultValue) {
18-
super(LUA_SCRIPTS + name, true);
18+
super(LUA_SCRIPTS + "." + name, true);
1919
tag.getTag(name)
2020
.getBooleanValue(defaultValue);
2121
this.n = name;

src/main/java/com/asdflj/nech/utils/LuaPlugin.java

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
import com.asdflj.nech.integration.nei.LuaToggleButton;
2020
import com.asdflj.nech.proxy.ClientProxy;
2121

22+
import codechicken.nei.NEIClientConfig;
2223
import codechicken.nei.api.API;
24+
import codechicken.nei.config.OptionList;
2325
import cpw.mods.fml.relauncher.FMLInjectionData;
2426

2527
public class LuaPlugin {
@@ -60,7 +62,10 @@ public static List<LuaObject> readLuaFiles(String directoryPath) {
6062
public static void loadLuaScript() {
6163
for (LuaObject luaObject : list) {
6264
if (luaObject.getBtn() != null) {
63-
getOptionList().optionList.remove(luaObject.getBtn());
65+
OptionList optionList = getOptionList("lua_scripts", NEIClientConfig.getOptionList());
66+
if (optionList != null) {
67+
optionList.optionList.remove(luaObject.getBtn());
68+
}
6469
}
6570
}
6671
list.clear();
@@ -70,6 +75,25 @@ public static void loadLuaScript() {
7075
}
7176
}
7277

78+
public static OptionList getOptionList(String name, OptionList optionList) {
79+
if (optionList == null) {
80+
return null;
81+
}
82+
for (var o : optionList.optionList) {
83+
if (o instanceof OptionList l) {
84+
if (l.name.equals(name)) {
85+
return l;
86+
} else {
87+
OptionList result = getOptionList(name, l);
88+
if (result != null) {
89+
return result;
90+
}
91+
}
92+
}
93+
}
94+
return null;
95+
}
96+
7397
public static void reloadLuaScript() {
7498
loadLuaScript();
7599
Match.refresh();

0 commit comments

Comments
 (0)