mirror of
https://github.com/GTNewHorizons/NotEnoughCharacters.git
synced 2026-11-20 04:19:34 +00:00
update
add modsupport
This commit is contained in:
1 parent
e9b0a76c57
commit
e697908b28
15 files changed
+559
-60
No files matched your search
Binary file not shown.
+117
-41
@@ -2,30 +2,46 @@ buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven {
|
||||
name = 'forge'
|
||||
url = 'http://files.minecraftforge.net/maven'
|
||||
name = "aliyun" //阿里云
|
||||
url 'https://maven.aliyun.com/repository/public/'
|
||||
}
|
||||
|
||||
maven {
|
||||
name = "longan" //龙眼 maven
|
||||
url 'https://longan.beanflame.cn/maven'
|
||||
}
|
||||
maven {
|
||||
name = 'sonatype'
|
||||
url = 'https://oss.sonatype.org/content/repositories/snapshots/'
|
||||
name = "forge"
|
||||
url = "http://files.minecraftforge.net/maven"
|
||||
}
|
||||
maven {
|
||||
name = "sonatype"
|
||||
url = "https://oss.sonatype.org/content/repositories/snapshots/"
|
||||
}
|
||||
}
|
||||
dependencies {
|
||||
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
|
||||
classpath 'cn.beanflame.longangradle:ForgeLonganGradle:1.2-0.1.2-Longan'
|
||||
// classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
|
||||
// classpath 'com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
apply plugin: 'forge'
|
||||
|
||||
version = '1.0'
|
||||
group = 'net.moecraft.nechar'
|
||||
version = '1.2'
|
||||
group = 'net.vfyjxf.nechar'
|
||||
archivesBaseName = 'NotEnoughCharacters'
|
||||
|
||||
minecraft {
|
||||
version = '1.7.10-10.13.4.1614-1.7.10'
|
||||
runDir = 'eclipse'
|
||||
}
|
||||
version = "1.7.10-10.13.4.1614-1.7.10"
|
||||
runDir = "eclipse"
|
||||
// 最新的 MCP 版本是 stable_12
|
||||
//mappings = "stable_12"
|
||||
// clientJvmArgs += "-Dfml.coreMods.load=net.vfyjxf.nechar.mixin.MixinLoadingPlugin"
|
||||
// serverJvmArgs += "-Dfml.coreMods.load=net.vfyjxf.nechar.mixin.MixinLoadingPlugin"
|
||||
|
||||
}
|
||||
compileJava {
|
||||
options.encoding = 'UTF-8'
|
||||
sourceCompatibility = '1.8'
|
||||
@@ -38,51 +54,68 @@ repositories {
|
||||
name 'chickenbones'
|
||||
url 'http://chickenbones.net/maven'
|
||||
}
|
||||
maven {
|
||||
name "Modmaven"
|
||||
url "https://modmaven.k-4u.nl/"
|
||||
// For Gradle 5.1 and above, limit it to just AE2
|
||||
// content {
|
||||
// includeGroup 'appeng'
|
||||
}
|
||||
|
||||
maven {
|
||||
name = "sponge"
|
||||
url = 'https://repo.spongepowered.org/maven'
|
||||
}
|
||||
|
||||
maven {
|
||||
name = 'Extra Cells'
|
||||
url = 'https://maven.cil.li/ExtraCells/'
|
||||
}
|
||||
flatDir {
|
||||
dirs 'libs'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
configurations {
|
||||
// configuration that holds jars to include in the jar
|
||||
shade
|
||||
compile.extendsFrom shade
|
||||
}
|
||||
|
||||
|
||||
dependencies {
|
||||
// you may put jars on which you depend on in ./libs
|
||||
// or you may define them like so..
|
||||
//compile 'some.group:artifact:version:classifier'
|
||||
//compile 'some.group:artifact:version'
|
||||
|
||||
// real examples
|
||||
//compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
|
||||
//compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
|
||||
|
||||
// for more info...
|
||||
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
|
||||
// http://www.gradle.org/docs/current/userguide/dependency_management.html
|
||||
|
||||
compile 'codechicken:NotEnoughItems:1.7.10-2.0.0-GTNH:dev'
|
||||
compile 'codechicken:CodeChickenLib:1.7.10-1.1.3.138:dev'
|
||||
compile 'codechicken:CodeChickenCore:1.7.10-1.0.7.+:dev'
|
||||
compile 'codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev'
|
||||
|
||||
// compile 'org.junit.jupiter:junit-jupiter-api:5.2.0'
|
||||
// compileOnly fileTree(dir: 'libs', include: ['*.jar'])
|
||||
// compile "org.spongepowered:mixin:0.7.11-SNAPSHOT"
|
||||
// compile files('libs/SpongeMixins-1.2.0.jar')
|
||||
compile files('libs/Thaumcraft-1.7.10-4.2.3.5.jar')
|
||||
// compile files('libs/appliedenergistics2-rv3-beta-6.jar')
|
||||
// compile files('lib/fastutil-7.1.0.jar')
|
||||
// compile files('lib/fastutil-7.0.12_mojang.jar')
|
||||
// compile files('libs/ExtraCells-deobf-1.7.10-2.2.73b129.jar')
|
||||
compile 'me.towdium:PinIn:1.2.0-all'
|
||||
// compile files('libs/WirelessCraftingTerminal-1.7.10-rv3-1.8.7.4b.jar')
|
||||
// compile files('libs/ExtraCells-1.7.10-2.4.3b3.jar')
|
||||
// testCompile 'org.junit.jupiter:junit-jupiter-api:5.2.0'
|
||||
// compile('org.spongepowered:mixin:0.7.11-SNAPSHOT') {
|
||||
// Mixin includes a lot of dependencies that are too up - to - date
|
||||
// exclude module: 'launchwrapper'
|
||||
// exclude module: 'guava'
|
||||
// exclude module: 'gson'
|
||||
// exclude module: 'commons-io'
|
||||
// exclude module: 'log4j-core'
|
||||
// }
|
||||
shade 'me.towdium:PinIn:1.2.0-all'
|
||||
// shade "org.spongepowered:mixin:0.7.11-SNAPSHOT"
|
||||
|
||||
|
||||
}
|
||||
|
||||
jar {
|
||||
configurations.shade.each { dep ->
|
||||
from(project.zipTree(dep)){
|
||||
exclude 'META-INF', 'META-INF/**'
|
||||
}
|
||||
}
|
||||
|
||||
manifest {
|
||||
attributes 'Implementation-Version': project.version
|
||||
}
|
||||
|
||||
appendix project.minecraft.version
|
||||
}
|
||||
|
||||
processResources {
|
||||
// this will ensure that this task is redone when the versions change.
|
||||
inputs.property 'version', project.version
|
||||
@@ -93,7 +126,8 @@ processResources {
|
||||
include 'mcmod.info'
|
||||
|
||||
// replace version and mcversion
|
||||
expand 'version': project.version, 'mcversion': project.minecraft.version
|
||||
expand 'version': project.version,
|
||||
'mcversion': project.minecraft.version
|
||||
}
|
||||
|
||||
// copy everything else, thats not the mcmod.info
|
||||
@@ -101,3 +135,45 @@ processResources {
|
||||
exclude 'mcmod.info'
|
||||
}
|
||||
}
|
||||
|
||||
jar {
|
||||
configurations.shade.copyRecursive().setTransitive(false).each { artifact ->
|
||||
from(zipTree(artifact)) {
|
||||
exclude 'META-INF', 'META-INF/**'
|
||||
}
|
||||
|
||||
manifest.attributes(
|
||||
'FMLCorePlugin': 'net.vfyjxf.nechar.core.NechCorePlugin',
|
||||
'FMLCorePluginContainsFMLMod': 'true',
|
||||
'ForceLoadAsMod': 'true'
|
||||
)
|
||||
|
||||
|
||||
appendix project.minecraft.version
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
jar {
|
||||
from refMap
|
||||
|
||||
configurations.shade.copyRecursive().setTransitive(false).each { artifact ->
|
||||
from (zipTree(artifact)){
|
||||
exclude 'META-INF', 'META-INF/**'
|
||||
}
|
||||
from(project.zipTree(artifact)){
|
||||
include 'META-INF/services', 'META-INF/services/**'
|
||||
}
|
||||
}
|
||||
manifest.attributes(
|
||||
'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker',
|
||||
"FMLCorePlugin":'net.vfyjxf.nechar.mixins.core.MixinLoadingPlugin',
|
||||
'FMLCorePluginContainsFMLMod': 'true',
|
||||
"MixinCompatibilityLevel": "JAVA_8",
|
||||
"ForceLoadAsMod": "true",
|
||||
"MixinConfigs":yourMixinConfig
|
||||
)
|
||||
appendix project.minecraft.version
|
||||
}
|
||||
*/
|
||||
}
|
||||
+1
-1
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
|
||||
Binary file not shown.
@@ -2,6 +2,7 @@ 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
|
||||
|
||||
@@ -70,15 +70,16 @@ public class NecharSearchFilter implements ItemFilter {
|
||||
@Override
|
||||
public boolean matches(ItemStack itemStack) {
|
||||
return !invalid
|
||||
&& matchesMod(itemStack)
|
||||
&& matchesId(itemStack)
|
||||
&& matchesDict(itemStack)
|
||||
&& matchesKeywords(itemStack);
|
||||
&& matchesMod(itemStack)
|
||||
&& matchesId(itemStack)
|
||||
&& matchesDict(itemStack)
|
||||
&& matchesKeywords(itemStack);
|
||||
}
|
||||
|
||||
protected boolean matchesMod(ItemStack itemStack) {
|
||||
if (mod == null || mod.isEmpty())
|
||||
if (mod == null || mod.isEmpty()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
GameRegistry.UniqueIdentifier itemId = GameRegistry.findUniqueIdentifierFor(itemStack.getItem());
|
||||
|
||||
@@ -86,8 +87,9 @@ public class NecharSearchFilter implements ItemFilter {
|
||||
}
|
||||
|
||||
protected boolean matchesId(ItemStack itemStack) {
|
||||
if (id == null || id.isEmpty())
|
||||
if (id == null || id.isEmpty()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
String itemId = Item.itemRegistry.getNameForObject(itemStack.getItem());
|
||||
|
||||
@@ -95,28 +97,32 @@ public class NecharSearchFilter implements ItemFilter {
|
||||
}
|
||||
|
||||
protected boolean matchesDict(ItemStack itemStack) {
|
||||
if (dict == null || dict.isEmpty())
|
||||
if (dict == null || dict.isEmpty()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
int[] oreIds = OreDictionary.getOreIDs(itemStack);
|
||||
|
||||
for (int id : oreIds)
|
||||
for (int id : oreIds) {
|
||||
if (OreDictionary.getOreName(id).toLowerCase().contains(dict))
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
protected boolean matchesKeywords(ItemStack itemStack) {
|
||||
if (keywords == null || keywords.isEmpty())
|
||||
if (keywords == null || keywords.isEmpty()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
String name = ItemInfo.getSearchName(itemStack);
|
||||
|
||||
for (String keyword : keywords)
|
||||
if (!context.contains(name, keyword))
|
||||
for (String keyword : keywords) {
|
||||
if (!context.contains(name, keyword)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -1,15 +1,16 @@
|
||||
package net.moecraft.nechar;
|
||||
package net.vfyjxf.nechar;
|
||||
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
|
||||
|
||||
@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
|
||||
@@ -0,0 +1,20 @@
|
||||
package net.vfyjxf.nechar.core;
|
||||
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
import net.vfyjxf.nechar.transform.Transformer;
|
||||
import net.vfyjxf.nechar.transform.TransformerRegistry;
|
||||
|
||||
public class NechClassTransformer implements IClassTransformer {
|
||||
@SuppressWarnings("SameParameterValue")
|
||||
@Override
|
||||
public byte[] transform(String s, String s1, byte[] bytes) {
|
||||
if (NechCorePlugin.INITIALIZED) {
|
||||
for (Transformer t : TransformerRegistry.getTransformer(s)) {
|
||||
bytes = t.transform(bytes);
|
||||
}
|
||||
return bytes;
|
||||
} else {
|
||||
return bytes;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package net.vfyjxf.nechar.core;
|
||||
|
||||
import cpw.mods.fml.relauncher.IFMLCallHook;
|
||||
import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
|
||||
import net.vfyjxf.nechar.transform.TransformerRegistry;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
public class NechCorePlugin implements IFMLLoadingPlugin, IFMLCallHook {
|
||||
public static boolean INITIALIZED = false;
|
||||
|
||||
@Override
|
||||
public String[] getASMTransformerClass() {
|
||||
return new String[]{"net.vfyjxf.nechar.core.NechClassTransformer"};
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getModContainerClass() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSetupClass() {
|
||||
return "net.vfyjxf.nechar.core.NechCorePlugin";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void injectData(Map<String, Object> data) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getAccessTransformerClass() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Void call() throws Exception {
|
||||
TransformerRegistry.getTransformer("some.class");
|
||||
NechCorePlugin.INITIALIZED = true;
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,187 @@
|
||||
package net.vfyjxf.nechar.transform;
|
||||
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import net.vfyjxf.nechar.NotEnoughCharacters;
|
||||
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;
|
||||
|
||||
@SuppressWarnings("SameParameterValue")
|
||||
public interface Transformer {
|
||||
|
||||
static Optional<MethodNode> findMethod(ClassNode c, String name) {
|
||||
Optional<MethodNode> ret = c.methods.stream().filter(methodNode -> methodNode.name.equals(name))
|
||||
.findFirst();
|
||||
String s = ret.isPresent() ? "," : ", not";
|
||||
NotEnoughCharacters.logger.info("Finding method " + name + " in class " + c.name + s + " found.");
|
||||
return ret;
|
||||
}
|
||||
|
||||
static Optional<MethodNode> findMethod(ClassNode c, String name, String desc) {
|
||||
Optional<MethodNode> ret = c.methods.stream().filter(methodNode -> methodNode.name.equals(name))
|
||||
.filter(methodNode -> methodNode.desc.equals(desc)).findFirst();
|
||||
String s = ret.isPresent() ? "," : ", not";
|
||||
NotEnoughCharacters.logger.info("Finding method " + name + desc + " in class " + c.name + s + " found.");
|
||||
return ret;
|
||||
}
|
||||
|
||||
static boolean transformInvoke(
|
||||
MethodNode methodNode, String owner, String name, String newOwner, String newName,
|
||||
String id, boolean isInterface, int op, @Nullable String arg1, @Nullable String arg2) {
|
||||
NotEnoughCharacters.logger.info("Transforming invoke of " + owner + "." + name +
|
||||
" to " + newOwner + "." + newName + " in method " + methodNode.name + ".");
|
||||
|
||||
Iterator<AbstractInsnNode> iterator = methodNode.instructions.iterator();
|
||||
|
||||
boolean ret = false;
|
||||
while (iterator.hasNext()) {
|
||||
AbstractInsnNode node = iterator.next();
|
||||
if (node instanceof MethodInsnNode && (node.getOpcode() == Opcodes.INVOKEVIRTUAL ||
|
||||
node.getOpcode() == Opcodes.INVOKESPECIAL || node.getOpcode() == Opcodes.INVOKESTATIC)) {
|
||||
MethodInsnNode insnNode = ((MethodInsnNode) node);
|
||||
if (insnNode.owner.equals(owner) && insnNode.name.equals(name)) {
|
||||
methodNode.instructions.set(insnNode, new MethodInsnNode(op, newOwner, newName, id, isInterface));
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
if (node instanceof InvokeDynamicInsnNode && node.getOpcode() == Opcodes.INVOKEDYNAMIC
|
||||
&& arg1 != null && arg2 != null) {
|
||||
InvokeDynamicInsnNode insnNode = ((InvokeDynamicInsnNode) node);
|
||||
if (insnNode.bsmArgs[1] instanceof Handle) {
|
||||
Handle h = ((Handle) insnNode.bsmArgs[1]);
|
||||
if (h.getOwner().equals(owner) && h.getName().equals(name)) {
|
||||
@SuppressWarnings("deprecation") Object[] args = {Type.getType(arg1),
|
||||
new Handle(6, newOwner, newName, id), Type.getType(arg2)};
|
||||
methodNode.instructions.set(insnNode,
|
||||
new InvokeDynamicInsnNode(insnNode.name, insnNode.desc, insnNode.bsm, args));
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void transformConstruct(MethodNode methodNode, String desc, String destNew) {
|
||||
NotEnoughCharacters.logger.info("Transforming constructor of " + desc +
|
||||
" to " + destNew + " in method " + methodNode.name + ".");
|
||||
Iterator<AbstractInsnNode> i = methodNode.instructions.iterator();
|
||||
int cnt = 0;
|
||||
while (i.hasNext()) {
|
||||
AbstractInsnNode node = i.next();
|
||||
if (node.getOpcode() == Opcodes.NEW) {
|
||||
TypeInsnNode nodeNew = ((TypeInsnNode) node);
|
||||
if (nodeNew.desc.equals(desc)) {
|
||||
// JechCore.LOG.info("Transforming new " + desc);
|
||||
nodeNew.desc = destNew;
|
||||
cnt++;
|
||||
}
|
||||
} else if (node.getOpcode() == Opcodes.INVOKESPECIAL) {
|
||||
MethodInsnNode nodeNew = ((MethodInsnNode) node);
|
||||
if (nodeNew.owner.equals(desc)) {
|
||||
// JechCore.LOG.info("Transforming constructor " + desc);
|
||||
nodeNew.owner = destNew;
|
||||
}
|
||||
}
|
||||
}
|
||||
NotEnoughCharacters.logger.info("Transformed " + cnt + " occurrences.");
|
||||
}
|
||||
|
||||
static void transformHook(MethodNode methodNode, String owner, String name, String id) {
|
||||
Iterator<AbstractInsnNode> i = methodNode.instructions.iterator();
|
||||
while (i.hasNext()) {
|
||||
AbstractInsnNode node = i.next();
|
||||
if (node instanceof InsnNode && node.getOpcode() == Opcodes.RETURN) {
|
||||
methodNode.instructions.insertBefore(node, new MethodInsnNode(Opcodes.INVOKESTATIC,
|
||||
owner, name, id, false));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
boolean accepts(String name);
|
||||
|
||||
byte[] transform(byte[] bytes);
|
||||
|
||||
abstract class Default implements Transformer {
|
||||
public byte[] transform(byte[] bytes) {
|
||||
ClassNode classNode = new ClassNode();
|
||||
ClassReader classReader = new ClassReader(bytes);
|
||||
classReader.accept(classNode, 0);
|
||||
transform(classNode);
|
||||
ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
||||
classNode.accept(classWriter);
|
||||
return classWriter.toByteArray();
|
||||
}
|
||||
|
||||
protected abstract void transform(ClassNode n);
|
||||
}
|
||||
|
||||
abstract class Configurable extends Default {
|
||||
protected MethodDecoder md = new MethodDecoder();
|
||||
|
||||
protected abstract String[] getDefault();
|
||||
|
||||
protected abstract String[] getAdditional();
|
||||
|
||||
protected abstract String getName();
|
||||
|
||||
protected abstract void transform(MethodNode n);
|
||||
|
||||
@Override
|
||||
protected void transform(ClassNode c) {
|
||||
NotEnoughCharacters.logger.info("Transforming class " + c.name + " for " + getName() + ".");
|
||||
Set<String> ms = md.getMethodsForClass(c.name.replace('/', '.'));
|
||||
if (!ms.isEmpty()) c.methods.stream().filter(m -> ms.contains(m.name)).forEach(this::transform);
|
||||
else NotEnoughCharacters.logger.info("No function matched in class " + c.name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean accepts(String name) {
|
||||
return md.contains(name);
|
||||
}
|
||||
|
||||
public void reload() {
|
||||
MethodDecoder mdt = new MethodDecoder();
|
||||
mdt.addAll(getDefault());
|
||||
mdt.addAll(getAdditional());
|
||||
// mdt.removeAll(JechConfig.listMethodBlacklist);
|
||||
md = mdt;
|
||||
}
|
||||
}
|
||||
|
||||
class MethodDecoder {
|
||||
HashMultimap<String, String> methods = HashMultimap.create();
|
||||
|
||||
public static void logError(String s) {
|
||||
NotEnoughCharacters.logger.info("Invalid config syntax: " + s);
|
||||
}
|
||||
|
||||
public void addAll(String[] names) {
|
||||
for (String s : names) {
|
||||
String[] ss = s.split(":");
|
||||
if (ss.length == 2) methods.put(ss[0], ss[1]);
|
||||
else logError(s);
|
||||
}
|
||||
}
|
||||
|
||||
// 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);
|
||||
}
|
||||
|
||||
public boolean contains(String s) {
|
||||
return methods.containsKey(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package net.vfyjxf.nechar.transform;
|
||||
|
||||
import net.vfyjxf.nechar.transform.transformers.TransformerRegExp;
|
||||
import net.vfyjxf.nechar.transform.transformers.TransformerString;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class TransformerRegistry {
|
||||
public static ArrayList<Transformer.Configurable> configurables = new ArrayList<>();
|
||||
public static ArrayList<Transformer> transformers = new ArrayList<>();
|
||||
|
||||
static {
|
||||
configurables.add(new TransformerString());
|
||||
configurables.add(new TransformerRegExp());
|
||||
transformers.addAll(configurables);
|
||||
}
|
||||
|
||||
public static ArrayList<Transformer> getTransformer(String name) {
|
||||
ArrayList<Transformer> ret = new ArrayList<>();
|
||||
for (Transformer t : transformers) {
|
||||
if (t.accepts(name))
|
||||
ret.add(t);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package net.vfyjxf.nechar.transform.transformers;
|
||||
|
||||
import net.vfyjxf.nechar.transform.Transformer;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
|
||||
public class TransformerRegExp extends Transformer.Configurable {
|
||||
|
||||
public TransformerRegExp(){
|
||||
reload();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected String[] getDefault() {
|
||||
return new String[]{
|
||||
"appeng.client.me.ItemRepo:updateView",
|
||||
"net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo:updateView"
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String[] getAdditional() {
|
||||
return new String[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getName() {
|
||||
return "regular expression";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void transform(MethodNode n) {
|
||||
Transformer.transformInvoke(
|
||||
n, "java/util/regex/Pattern", "matcher",
|
||||
"net/vfyjxf/nechar/utils/Match", "matcher",
|
||||
"(Ljava/util/regex/Pattern;Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;",
|
||||
false, Opcodes.INVOKESTATIC, null, null
|
||||
);
|
||||
Transformer.transformInvoke(
|
||||
n, "java/lang/String", "matches",
|
||||
"net/vfyjxf/nechar/utils/Match", "matches",
|
||||
"(Ljava/lang/String;Ljava/lang/CharSequence;)Z",
|
||||
false, Opcodes.INVOKESTATIC, "(Ljava/lang/Object;)Z", "(Ljava/lang/String;)Z"
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package net.vfyjxf.nechar.transform.transformers;
|
||||
|
||||
import net.vfyjxf.nechar.transform.Transformer;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
|
||||
public class TransformerString extends Transformer.Configurable {
|
||||
|
||||
public TransformerString(){
|
||||
reload();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String[] getDefault() {
|
||||
return new String[]{
|
||||
"extracells.gui.GuiFluidTerminal:updateFluids",
|
||||
"extracells.gui.GuiFluidStorage:updateFluids",
|
||||
"witchinggadgets.client.ThaumonomiconIndexSearcher:buildEntryList"
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String[] getAdditional() {
|
||||
return new String[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getName() {
|
||||
return "string contains";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void transform(MethodNode n) {
|
||||
Transformer.transformInvoke(
|
||||
n, "java/lang/String", "contains",
|
||||
"net/vfyjxf/nechar/utils/Match", "contains",
|
||||
"(Ljava/lang/String;Ljava/lang/CharSequence;)Z",
|
||||
false, Opcodes.INVOKESTATIC, "(Ljava/lang/Object;)Z", "(Ljava/lang/String;)Z"
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package net.vfyjxf.nechar.utils;
|
||||
|
||||
import me.towdium.pinin.PinIn;
|
||||
import net.vfyjxf.nechar.NotEnoughCharacters;
|
||||
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class Match {
|
||||
|
||||
static final Pattern p = Pattern.compile("a");
|
||||
public static final PinIn context = new PinIn();
|
||||
|
||||
static {
|
||||
context.config().fU2V(true).commit();
|
||||
}
|
||||
|
||||
public static boolean isChinese(CharSequence s) {
|
||||
for (int i = s.length() - 1; i >= 0; i--) {
|
||||
if (isChinese(s.charAt(i))) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static boolean isChinese(char i) {
|
||||
return (0x3000 <= i && i < 0xA000) || (0xE900 <= i && i < 0xEA00);
|
||||
}
|
||||
|
||||
public static boolean contains(String s, CharSequence cs) {
|
||||
boolean b = context.contains(s, cs.toString());
|
||||
// NotEnoughCharacters.logger.info("contains(" + s + ',' + cs + ")->" + b);
|
||||
return b;
|
||||
}
|
||||
|
||||
|
||||
public static Matcher matcher(Pattern test, CharSequence name) {
|
||||
return matches(name.toString(), test.toString()) ? p.matcher("a") : test.matcher(name);
|
||||
}
|
||||
|
||||
public static boolean matches(String s1, String s2) {
|
||||
boolean start = s2.startsWith(".*");
|
||||
boolean end = s2.endsWith(".*");
|
||||
if (start && end && s2.length() < 4) end = false;
|
||||
if (start || end) s2 = s2.substring(start ? 2 : 0, s2.length() - (end ? 2 : 0));
|
||||
return contains(s1, s2);
|
||||
}
|
||||
}
|
||||
@@ -3,11 +3,11 @@
|
||||
"modid": "nechar",
|
||||
"name": "Not Enough Characters",
|
||||
"description": "Enhanced NEI search",
|
||||
"version": "${version}",
|
||||
"mcversion": "${mcversion}",
|
||||
"version": "1.1",
|
||||
"mcversion": "1.7.10",
|
||||
"url": "https://github.com/MoeNetwork/NotEnoughCharacters/",
|
||||
"updateUrl": "",
|
||||
"authorList": ["Balthild"],
|
||||
"authorList": ["Balthild,vfyjxf"],
|
||||
"credits": "",
|
||||
"logoFile": "",
|
||||
"screenshots": [],
|
||||
|
||||
Reference in new issue
Block a user