minor tweaks

Author: Devan-Kerman

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '0.2.6-SNAPSHOT'
+    id 'fabric-loom' version '0.2.7-SNAPSHOT'
     id 'maven-publish'
 }
 

gradle.properties

@@ -6,7 +6,7 @@ minecraft_version=1.15.2
 yarn_mappings=1.15.2+build.15
 loader_version=0.8.2+build.194
 # Mod Properties
-mod_version=1.2
+mod_version=1.4
 maven_group=net.devtech
 archives_base_name=nanoevents
 # Dependencies

src/main/java/net/devtech/nanoevents/Finder.java

@@ -27,23 +27,13 @@ public static Map<Id, List<String>> parseListeners() {
 		Map<Id, List<String>> listeners = new HashMap<>();
 		forVal("nano:lst", (m, c) -> {
 			Path path = m.getPath(c);
-			try {
-				Properties properties = new Properties();
-				properties.load(Files.newBufferedReader(path));
-				for (Map.Entry<Object, Object> entry : properties.entrySet()) {
-					String listener = (String) entry.getKey();
-					String eventId = (String) entry.getValue();
-					int colonIndex = eventId.indexOf(':');
-					if (colonIndex == -1) {
-						LOGGER.severe("Invalid identifier: " + eventId + " in " + c + " in " + m.getMetadata().getId());
-					} else {
-						listeners.computeIfAbsent(new Id(eventId.substring(0, colonIndex), eventId.substring(colonIndex + 1)), i -> new ArrayList<>()).add(listener);
-					}
+			if (Files.isDirectory(path)) {
+				try {
+					Files.list(path).forEach(v -> parse(listeners, v, m, v.toString()));
+				} catch (IOException e) {
+					throw new RuntimeException(e);
 				}
-			} catch (IOException e) {
-				LOGGER.severe("error in reading listneers in " + path + " in mod " + m.getMetadata().getId());
-				e.printStackTrace();
-			}
+			} else parse(listeners, path, m, c);
 		});
 		return listeners;
 	}
@@ -55,7 +45,7 @@ private static void forVal(String val, BiConsumer<ModContainer, String> consumer
 		for (ModContainer mod : FabricLoader.getInstance().getAllMods()) {
 			ModMetadata metadata = mod.getMetadata();
 			CustomValue value = metadata.getCustomValue(val);
-			if(value != null) {
+			if (value != null) {
 				if (value.getType() == CustomValue.CvType.STRING) consumer.accept(mod, value.getAsString());
 				else if (value.getType() == CustomValue.CvType.ARRAY) for (CustomValue customValue : value.getAsArray()) {
 					if (customValue.getType() == CustomValue.CvType.STRING) consumer.accept(mod, customValue.getAsString());
@@ -65,6 +55,26 @@ else if (value.getType() == CustomValue.CvType.ARRAY) for (CustomValue customVal
 		}
 	}
 
+	private static void parse(Map<Id, List<String>> listeners, Path path, ModContainer mod, String file) {
+		try {
+			Properties properties = new Properties();
+			properties.load(Files.newBufferedReader(path));
+			for (Map.Entry<Object, Object> entry : properties.entrySet()) {
+				String listener = (String) entry.getKey();
+				String eventId = (String) entry.getValue();
+				int colonIndex = eventId.indexOf(':');
+				if (colonIndex == -1) {
+					LOGGER.severe("Invalid identifier: " + eventId + " in " + file + " in " + mod.getMetadata().getId());
+				} else {
+					listeners.computeIfAbsent(new Id(eventId.substring(0, colonIndex), eventId.substring(colonIndex + 1)), i -> new ArrayList<>()).add(listener);
+				}
+			}
+		} catch (IOException e) {
+			LOGGER.severe("error in reading listneers in " + path + " in mod " + mod.getMetadata().getId());
+			e.printStackTrace();
+		}
+	}
+
 	/**
 	 * find all the events declared in each mod
 	 */

src/main/java/net/devtech/nanoevents/asm/NanoTransformer.java

@@ -15,6 +15,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -28,9 +29,9 @@ public class NanoTransformer implements Runnable {
 	private static final String LISTENER_INVOKER_TYPE = 'L' + Type.getInternalName(ListenerInvoker.class) + ';';
 
 	private static final Logger LOGGER = Logger.getLogger("NanoTransformer");
+
 	static {
-		if(DEBUG_TRANSFORMER)
-			LOGGER.info("Transformer debugging is enabled!");
+		if (DEBUG_TRANSFORMER) LOGGER.info("Transformer debugging is enabled!");
 	}
 
 	@Override
@@ -40,7 +41,11 @@ public void run() {
 			Id id = evt.getId();
 			List<String> listeners = NanoEvents.LISTENERS.get(id);
 			String invokerType = invoker.replace('.', '/');
-			ClassTinkerers.addTransformation(invokerType, node -> transformClass(listeners, node, id, find(listeners, node, id)));
+			ClassTinkerers.addTransformation(invokerType, node -> {
+				List<String> list = listeners;
+				if (list == null) list = Collections.emptyList();
+				transformClass(list, node, id, find(list, node, id));
+			});
 		}
 	}
 
@@ -64,21 +69,21 @@ public static void transformClass(List<String> listeners, ClassNode node, Id id,
 		MethodNode listenerInvoker = nodes.get("listener_invoker");
 
 		String desc = listenerInvoker == null ? invokerMethod.desc : listenerInvoker.desc;
-		if(single == null) {
+		if (single == null) {
 			String name = listenerInvoker == null ? invokerMethod.name : listenerInvoker.name;
 			transform(listeners, invokerMethod.instructions, name, desc, node.name);
 		}
 
 		// single transformation
-		if(single != null) {
+		if (single != null) {
 			String name = listenerInvoker == null ? single.name : listenerInvoker.name;
 			invokerMethod.instructions = replace(single.instructions, name, node.name, desc, listeners.get(0));
 		}
 
-		if(DEBUG_TRANSFORMER) {
+		if (DEBUG_TRANSFORMER) {
 			File file = new File("nano_debug/" + node.name + ".class");
 			File parent = file.getParentFile();
-			if(!parent.exists()) parent.mkdirs();
+			if (!parent.exists()) parent.mkdirs();
 			try (FileOutputStream output = new FileOutputStream(file)) {
 				ClassWriter writer = new ClassWriter(0);
 				node.accept(writer);
@@ -141,7 +146,6 @@ private static void transform(Collection<String> listeners, InsnList insns, Stri
 	}
 
 
-
 	/**
 	 * replace all of shallow recursive call with a listener reference in a newly copied list
 	 *
@@ -159,14 +163,14 @@ private static InsnList replace(InsnList list, String nodeName, String nodeOwner
 				// check if method call is the right one
 				if (replacementNode.name.equals(nodeName) && replacementNode.owner.equals(nodeOwner) && replacementNode.desc.equals(nodeDescriptor)) {
 					// parse the listener reference
-					int classIndex = listenerReference.indexOf('#');
+					int classIndex = listenerReference.indexOf("::");
 					if (classIndex == -1) {
 						LOGGER.severe("Bad method signature " + listenerReference);
 						replacementNode.owner = "null";
 						replacementNode.name = "READ_THE_LOGS";
 					} else {
 						replacementNode.owner = listenerReference.substring(0, classIndex).replace('.', '/');
-						replacementNode.name = listenerReference.substring(classIndex + 1);
+						replacementNode.name = listenerReference.substring(classIndex + 2);
 					}
 				}
 			}