diff --git a/src/main/java/net/moecraft/nechar/NEINecharConfig.java b/src/main/java/net/moecraft/nechar/NEINecharConfig.java index 0630d27..2db34da 100644 --- a/src/main/java/net/moecraft/nechar/NEINecharConfig.java +++ b/src/main/java/net/moecraft/nechar/NEINecharConfig.java @@ -2,7 +2,6 @@ package net.moecraft.nechar; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; -import net.vfyjxf.nechar.NotEnoughCharacters; public class NEINecharConfig implements IConfigureNEI { @Override diff --git a/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java b/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java new file mode 100644 index 0000000..1e297c8 --- /dev/null +++ b/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java @@ -0,0 +1,24 @@ +package net.moecraft.nechar; + +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import net.minecraft.client.Minecraft; +import net.vfyjxf.nechar.NechConfig; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.File; + + +@Mod(modid = NotEnoughCharacters.ID, useMetadata = true) +public class NotEnoughCharacters { + public static final String ID = "nechar"; + public static final String VERSION = NotEnoughCharacters.class.getPackage().getImplementationVersion(); + public static final Logger logger = LogManager.getLogger("NotEnoughCharacters"); + + @Mod.EventHandler + public void preInit(FMLPreInitializationEvent event) { + logger.info("Not Enough Characters - v" + VERSION); + NechConfig.loadConfig(new File(Minecraft.getMinecraft().mcDataDir, "config/NotEnoughCharacters.cfg")); + } +} diff --git a/src/main/java/net/vfyjxf/nechar/NechConfig.java b/src/main/java/net/vfyjxf/nechar/NechConfig.java new file mode 100644 index 0000000..b507336 --- /dev/null +++ b/src/main/java/net/vfyjxf/nechar/NechConfig.java @@ -0,0 +1,42 @@ +package net.vfyjxf.nechar; + +import net.minecraftforge.common.config.Configuration; + +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[] 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", + "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 + }; + + public static void loadConfig(File configFile) { + config = new Configuration(configFile); + config.load(); + + 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" + + "The format is \"full.class.path$InnerClass:methodName\"").getStringList(); + + if(config.hasChanged()){ + config.save(); + } + + } +} diff --git a/src/main/java/net/vfyjxf/nechar/core/NechClassTransformer.java b/src/main/java/net/vfyjxf/nechar/core/NechClassTransformer.java index 67c0d04..81b6b4a 100644 --- a/src/main/java/net/vfyjxf/nechar/core/NechClassTransformer.java +++ b/src/main/java/net/vfyjxf/nechar/core/NechClassTransformer.java @@ -1,3 +1,8 @@ +/* + * 基于Towdium的JustEnoughCharacters(https://github.com/Towdium/JustEnoughCharacters/blob/1.12.0/src/main/java/me/towdium/jecharacters/core/JechClassTransformer.java) + * 原文件协议为MIT + */ + package net.vfyjxf.nechar.core; import net.minecraft.launchwrapper.IClassTransformer; diff --git a/src/main/java/net/vfyjxf/nechar/transform/Transformer.java b/src/main/java/net/vfyjxf/nechar/transform/Transformer.java index 6e4ef63..819d505 100644 --- a/src/main/java/net/vfyjxf/nechar/transform/Transformer.java +++ b/src/main/java/net/vfyjxf/nechar/transform/Transformer.java @@ -1,7 +1,12 @@ +/* + * 基于Towdium的JustEnoughCharacters(https://github.com/Towdium/JustEnoughCharacters/blob/1.12.0/src/main/java/me/towdium/jecharacters/transform/Transformer.java) + * 原文件协议为MIT + */ + package net.vfyjxf.nechar.transform; import com.google.common.collect.HashMultimap; -import net.vfyjxf.nechar.NotEnoughCharacters; +import net.moecraft.nechar.NotEnoughCharacters; import org.objectweb.asm.*; import org.objectweb.asm.tree.*; diff --git a/src/main/java/net/vfyjxf/nechar/transform/TransformerRegistry.java b/src/main/java/net/vfyjxf/nechar/transform/TransformerRegistry.java index 9cb24ac..b20d7d4 100644 --- a/src/main/java/net/vfyjxf/nechar/transform/TransformerRegistry.java +++ b/src/main/java/net/vfyjxf/nechar/transform/TransformerRegistry.java @@ -1,3 +1,8 @@ +/* + * 基于Towdium的JustEnoughCharacters(https://github.com/Towdium/JustEnoughCharacters/blob/1.12.0/src/main/java/me/towdium/jecharacters/transform/TransformerRegistry.java) + * 原文件协议为MIT + */ + package net.vfyjxf.nechar.transform; import net.vfyjxf.nechar.transform.transformers.TransformerRegExp; diff --git a/src/main/java/net/vfyjxf/nechar/transform/transformers/TransformerRegExp.java b/src/main/java/net/vfyjxf/nechar/transform/transformers/TransformerRegExp.java index 6705657..5f97757 100644 --- a/src/main/java/net/vfyjxf/nechar/transform/transformers/TransformerRegExp.java +++ b/src/main/java/net/vfyjxf/nechar/transform/transformers/TransformerRegExp.java @@ -1,5 +1,11 @@ +/* + * 基于Towdium的JustEnoughCharacters(https://github.com/Towdium/JustEnoughCharacters/blob/1.12.0/src/main/java/me/towdium/jecharacters/transform/transformers/TransformerRegExp.java) + * 原文件协议为MIT + */ + package net.vfyjxf.nechar.transform.transformers; +import net.vfyjxf.nechar.NechConfig; import net.vfyjxf.nechar.transform.Transformer; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.MethodNode; @@ -13,10 +19,7 @@ public class TransformerRegExp extends Transformer.Configurable { @Override protected String[] getDefault() { - return new String[]{ - "appeng.client.me.ItemRepo:updateView", - "net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo:updateView" - }; + return NechConfig.transformerRegExp; } diff --git a/src/main/java/net/vfyjxf/nechar/transform/transformers/TransformerString.java b/src/main/java/net/vfyjxf/nechar/transform/transformers/TransformerString.java index a8fa7ac..31be517 100644 --- a/src/main/java/net/vfyjxf/nechar/transform/transformers/TransformerString.java +++ b/src/main/java/net/vfyjxf/nechar/transform/transformers/TransformerString.java @@ -1,5 +1,11 @@ +/* + * 基于Towdium的JustEnoughCharacters(https://github.com/Towdium/JustEnoughCharacters/blob/1.12.0/src/main/java/me/towdium/jecharacters/transform/transformers/TransformerString.java) + * 原文件协议为MIT + */ + package net.vfyjxf.nechar.transform.transformers; +import net.vfyjxf.nechar.NechConfig; import net.vfyjxf.nechar.transform.Transformer; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.MethodNode; @@ -12,16 +18,7 @@ public class TransformerString extends Transformer.Configurable { @Override protected String[] getDefault() { - return 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", - "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 - }; + return NechConfig.transformerString; } diff --git a/src/main/java/net/vfyjxf/nechar/utils/Match.java b/src/main/java/net/vfyjxf/nechar/utils/Match.java index c5b21d3..6c7a47f 100644 --- a/src/main/java/net/vfyjxf/nechar/utils/Match.java +++ b/src/main/java/net/vfyjxf/nechar/utils/Match.java @@ -1,3 +1,8 @@ +/* + * 基于Towdium的JustEnoughCharacters(https://github.com/Towdium/JustEnoughCharacters/blob/1.12.0/src/main/java/me/towdium/jecharacters/transform/transformers/TransformerRegExp.java) + * 原文件协议为MIT + */ + package net.vfyjxf.nechar.utils; import me.towdium.pinin.PinIn;