mirror of
https://github.com/GTNewHorizons/NotEnoughCharacters.git
synced 2026-11-21 04:42:09 +00:00
#1 finished
This commit is contained in:
1 parent
36a47b709a
commit
f4b9b206c3
4 files changed
+59
-23
No files matched your search
@@ -8,16 +8,22 @@ import java.io.File;
|
||||
public class NechConfig {
|
||||
|
||||
private static Configuration config;
|
||||
public static String[] transformerRegExp = new String[]{
|
||||
"appeng.client.me.ItemRepo:updateView",
|
||||
"net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo:updateView"
|
||||
|
||||
|
||||
public static String[] transformerRegExpAdditionalList = new String[0];
|
||||
public static String[] transformerStringAdditionalList = new String[0];
|
||||
public static String[] transformerMethodBlackList = new String[0];
|
||||
|
||||
public static String[] defaultTransformerRegExp = new String[]{
|
||||
"appeng.client.me.ItemRepo:updateView",//Applied-Energistics-2 search
|
||||
"net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo:updateView"//WirelessCraftingTerminal search
|
||||
};
|
||||
public static String[] transformerString = new String[]{
|
||||
"extracells.gui.GuiFluidTerminal:updateFluids",
|
||||
"extracells.gui.GuiFluidStorage:updateFluids",
|
||||
"witchinggadgets.client.ThaumonomiconIndexSearcher:buildEntryList",
|
||||
"appeng.client.gui.implementations.GuiInterfaceTerminal:refreshList",
|
||||
"appeng.client.gui.implementations.GuiInterfaceTerminal:itemStackMatchesSearchTerm",
|
||||
public static String[] defaultTransformerStringList = new String[]{
|
||||
"extracells.gui.GuiFluidTerminal:updateFluids",//Extra Cells FluidTerminal search
|
||||
"extracells.gui.GuiFluidStorage:updateFluids", //Extra Cells wireless terminal search
|
||||
"witchinggadgets.client.ThaumonomiconIndexSearcher:buildEntryList", //Witching Gadgets Thaumonomicon search
|
||||
"appeng.client.gui.implementations.GuiInterfaceTerminal:refreshList", //Applied-Energistics-2 InterfaceTerminal
|
||||
"appeng.client.gui.implementations.GuiInterfaceTerminal:itemStackMatchesSearchTerm", //Applied-Energistics-2 InterfaceTerminal
|
||||
"vswe.stevesfactory.components.ComponentMenuLiquid:updateSearch", // Steve's Factory Manager liquid search
|
||||
"vswe.stevesfactory.components.ComponentMenuItem:updateSearch", // Steve's Factory Manager item search
|
||||
"betterquesting.api2.client.gui.panels.lists.CanvasQuestSearch:queryMatches" //Better Questing quest search --gtnh
|
||||
@@ -26,17 +32,27 @@ public class NechConfig {
|
||||
public static void loadConfig(File configFile) {
|
||||
config = new Configuration(configFile);
|
||||
config.load();
|
||||
config.get("transformers", "DefaultTransformerRegExp", defaultTransformerRegExp,
|
||||
"Default list of methods to transform, of which uses regular expression to match.\n" +
|
||||
"This list is maintained by the mod and will have no effect if you change it.");
|
||||
config.get("transformers", "DefaultTransformerString", defaultTransformerStringList,
|
||||
"Default list of methods to transform, of which uses \"String.contains\" to match.\n" +
|
||||
"This list is maintained by the mod and will have no effect if you change it.");
|
||||
|
||||
transformerRegExp = config.get("transformers", "TransformerRegExp", transformerRegExp,
|
||||
"The list of methods to transform, of which uses regular expression to match.\n" +
|
||||
"The format is \"full.class.path$InnerClass:methodName\"").getStringList();
|
||||
transformerString = config.get("transformers", "TransformerString", transformerString,
|
||||
"The list of methods to transform, of which uses \"String.contains\" to match.\n" +
|
||||
config.getCategory("transformers").get("DefaultTransformerRegExp").set(defaultTransformerRegExp);
|
||||
config.getCategory("transformers").get("DefaultTransformerString").set(defaultTransformerStringList);
|
||||
|
||||
transformerRegExpAdditionalList = config.get("additional","AdditionalTransformerRegExpList",new String[0],
|
||||
"Additional list of methods to transform, of which uses regular expression to match.\n" +
|
||||
"The format is \"full.class.path$InnerClass:methodName\"").getStringList();
|
||||
|
||||
transformerStringAdditionalList = config.get("additional","AdditionalTransformerStringList",new String[0],
|
||||
"Additional list of methods to transform, of which uses \"String.contains\" to match.\n" +
|
||||
"The format is \"full.class.path$InnerClass:methodName\"").getStringList();
|
||||
|
||||
if(config.hasChanged()){
|
||||
config.save();
|
||||
}
|
||||
|
||||
transformerMethodBlackList = config.get("blacklist","transformerMethodBlackList",new String[0],
|
||||
"Blacklist of methods to transform\n" +
|
||||
"The format is \"full.class.path$InnerClass:methodName\"").getStringList();
|
||||
if(config.hasChanged()) config.save();
|
||||
}
|
||||
}
|
||||
@@ -7,13 +7,12 @@ package net.vfyjxf.nechar.transform;
|
||||
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import net.moecraft.nechar.NotEnoughCharacters;
|
||||
import net.vfyjxf.nechar.NechConfig;
|
||||
import org.objectweb.asm.*;
|
||||
import org.objectweb.asm.tree.*;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.Iterator;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.*;
|
||||
|
||||
@SuppressWarnings("SameParameterValue")
|
||||
public interface Transformer {
|
||||
@@ -112,6 +111,7 @@ public interface Transformer {
|
||||
byte[] transform(byte[] bytes);
|
||||
|
||||
abstract class Default implements Transformer {
|
||||
@Override
|
||||
public byte[] transform(byte[] bytes) {
|
||||
ClassNode classNode = new ClassNode();
|
||||
ClassReader classReader = new ClassReader(bytes);
|
||||
@@ -130,6 +130,7 @@ public interface Transformer {
|
||||
|
||||
protected abstract String[] getDefault();
|
||||
|
||||
protected abstract String[] getAdditional();
|
||||
|
||||
protected abstract String getName();
|
||||
|
||||
@@ -151,6 +152,8 @@ public interface Transformer {
|
||||
public void reload() {
|
||||
MethodDecoder mdt = new MethodDecoder();
|
||||
mdt.addAll(getDefault());
|
||||
mdt.addAll(getAdditional());
|
||||
mdt.removeAll(NechConfig.transformerMethodBlackList);
|
||||
md = mdt;
|
||||
}
|
||||
}
|
||||
@@ -170,6 +173,13 @@ public interface Transformer {
|
||||
}
|
||||
}
|
||||
|
||||
public void removeAll(String[] names) {
|
||||
for (String s : names) {
|
||||
String[] ss = s.split(":");
|
||||
if (ss.length == 2) methods.remove(ss[0], ss[1]);
|
||||
else logError(s);
|
||||
}
|
||||
}
|
||||
|
||||
public Set<String> getMethodsForClass(String c) {
|
||||
return methods.get(c);
|
||||
|
||||
@@ -19,7 +19,12 @@ public class TransformerRegExp extends Transformer.Configurable {
|
||||
|
||||
@Override
|
||||
protected String[] getDefault() {
|
||||
return NechConfig.transformerRegExp;
|
||||
return NechConfig.defaultTransformerRegExp;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String[] getAdditional() {
|
||||
return NechConfig.transformerRegExpAdditionalList;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -18,7 +18,12 @@ public class TransformerString extends Transformer.Configurable {
|
||||
|
||||
@Override
|
||||
protected String[] getDefault() {
|
||||
return NechConfig.transformerString;
|
||||
return NechConfig.defaultTransformerStringList;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String[] getAdditional() {
|
||||
return NechConfig.transformerStringAdditionalList;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user