add mixinextras, fix property keys, add mod paths

- refactor some other things as well

build.gradle.kts

@@ -31,10 +31,13 @@ dependencies {
     compileOnly("org.apache.logging.log4j:log4j-core:3.0.0-beta2")
 
     api(libs.mixin)
+    api(libs.mixinextras)
     implementation(libs.nightconfig)
     api(libs.annotations)
 }
 
+
+
 java {
     sourceCompatibility = JavaVersion.VERSION_21
     targetCompatibility = JavaVersion.VERSION_21

gradle/libs.versions.toml

@@ -2,8 +2,9 @@
 
 thyroxine = "1.0.0-SNAPSHOT"
 nightconfig = "3.7.2"
-mixin = "0.13.4+mixin.0.8.5"
+mixin = "0.14.0+mixin.0.8.6"
 annotations = "24.1.0"
+mixinextras = "0.3.6"
 
 [libraries]
 
@@ -11,6 +12,7 @@ thyroxine = { module = "dev.frogmc:thyroxine", version.ref = "thyroxine" }
 nightconfig = { module = "com.electronwill.night-config:toml", version.ref = "nightconfig" }
 mixin = { module = "net.fabricmc:sponge-mixin", version.ref = "mixin" }
 annotations = { module = "org.jetbrains:annotations", version.ref = "annotations" }
+mixinextras = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixinextras" }
 
 [bundles]
 

src/main/java/dev/frogmc/frogloader/api/mod/ModExtensions.java

@@ -4,6 +4,7 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.util.Map;
+import java.util.Collection;
 import java.util.function.Consumer;
 
 import org.slf4j.Logger;
@@ -88,28 +89,37 @@ public final class ModExtensions {
 	 * @param action The action to run on the newly retrieved instance of the provided class
 	 * @param <T>    The type of the class
 	 */
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({"rawtypes", "unchecked"})
 	public <T> void runIfPresent(String key, Class<T> type, Consumer<T> action) {
-		String value = get(key);
+
+		Object value = get(key);
 
 		if (value == null) {
 			return;
 		}
 
-		try {
-			MethodHandle handle;
-			if (value.contains("::")) {
-				String[] parts = value.split("::");
-				handle = MethodHandles.lookup().findVirtual(Class.forName(parts[0]), parts[1], MethodType.methodType(type));
-			} else {
-				handle = MethodHandles.lookup().findConstructor(Class.forName(value), MethodType.methodType(void.class));
+		Consumer<String> c = s -> {
+			try {
+				MethodHandle handle;
+				if (s.contains("::")) {
+					String[] parts = s.split("::");
+					handle = MethodHandles.lookup().findVirtual(Class.forName(parts[0]), parts[1], MethodType.methodType(type));
+				} else {
+					handle = MethodHandles.lookup().findConstructor(Class.forName(s), MethodType.methodType(void.class));
+				}
+				T object = (T) handle.invoke();
+				if (object != null) {
+					action.accept(object);
+				}
+			} catch (Throwable e) {
+				LOGGER.warn("Failed to instantiate Extension: ", e);
 			}
-			T object = (T) handle.invoke();
-			if (object != null) {
-				action.accept(object);
-			}
-		} catch (Throwable e) {
-			LOGGER.warn("Failed to instantiate Extension: ", e);
+		};
+
+		if (value instanceof String s){
+			c.accept(s);
+		} else if (value instanceof Collection l){
+			((Collection<String>) l).forEach(c);
 		}
 	}
 

src/main/java/dev/frogmc/frogloader/api/mod/ModProperties.java

@@ -1,5 +1,6 @@
 package dev.frogmc.frogloader.api.mod;
 
+import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Map;
 
@@ -76,5 +77,10 @@ public interface ModProperties {
 	 */
 	ModExtensions extensions();
 
+	/**
+	 * Get this mod's paths
+	 * @return Where this mod is loaded from
+	 */
+	Collection<Path> paths();
 
 }

src/main/java/dev/frogmc/frogloader/impl/launch/FrogLauncher.java

@@ -6,6 +6,7 @@ import java.lang.invoke.MethodType;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.llamalad7.mixinextras.MixinExtrasBootstrap;
 import dev.frogmc.frogloader.api.env.Env;
 import dev.frogmc.frogloader.impl.mixin.FrogMixinService;
 import lombok.Getter;
@@ -18,8 +19,8 @@ public class FrogLauncher {
 	private static FrogLauncher instance;
 	@Getter
 	private final MixinClassLoader targetClassLoader;
-	@Getter
-	private final Map<IPropertyKey, Object> globalProperties = new HashMap<>();
+
+	private static final Map<IPropertyKey, Object> globalProperties = new HashMap<>();
 
 	@Getter
 	private final Env env;
@@ -41,6 +42,7 @@ public class FrogLauncher {
 
 		System.setProperty("mixin.service", FrogMixinService.class.getName());
 		MixinBootstrap.init();
+		MixinExtrasBootstrap.init();
 
 		try {
 			Class<?> clazz = targetClassLoader.findClass("dev.frogmc.frogloader.impl.FrogLoaderImpl");
@@ -55,4 +57,16 @@ public class FrogLauncher {
 	public static void run(String[] args, Env env) {
 		new FrogLauncher(args, env);
 	}
+
+	public void putProperty(IPropertyKey key, Object value){
+		globalProperties.put(key, value);
+	}
+
+	public Object getProperty(IPropertyKey key){
+		return globalProperties.get(key);
+	}
+
+	public Object getProperty(IPropertyKey key, Object defaultValue){
+		return globalProperties.getOrDefault(key, defaultValue);
+	}
 }

src/main/java/dev/frogmc/frogloader/impl/mixin/FrogGlobalPropertyService.java

@@ -12,28 +12,41 @@ public class FrogGlobalPropertyService implements IGlobalPropertyService {
 			public String toString() {
 				return name;
 			}
+
+			@Override
+			public boolean equals(Object other){
+				if (other instanceof IPropertyKey k){
+					return name.equals(k.toString());
+				}
+				return false;
+			}
+
+			@Override
+			public int hashCode(){
+				return name.hashCode();
+			}
 		};
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T getProperty(IPropertyKey key) {
-		return (T) FrogLauncher.getInstance().getGlobalProperties().get(key);
+		return (T) FrogLauncher.getInstance().getProperty(key);
 	}
 
 	@Override
 	public void setProperty(IPropertyKey key, Object value) {
-		FrogLauncher.getInstance().getGlobalProperties().put(key, value);
+		FrogLauncher.getInstance().putProperty(key, value);
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T getProperty(IPropertyKey key, T defaultValue) {
-		return (T) FrogLauncher.getInstance().getGlobalProperties().getOrDefault(key, defaultValue);
+		return (T) FrogLauncher.getInstance().getProperty(key, defaultValue);
 	}
 
 	@Override
 	public String getPropertyString(IPropertyKey key, String defaultValue) {
-		return FrogLauncher.getInstance().getGlobalProperties().getOrDefault(key, defaultValue).toString();
+		return FrogLauncher.getInstance().getProperty(key, defaultValue).toString();
 	}
 }

src/main/java/dev/frogmc/frogloader/impl/mixin/FrogMixinService.java

@@ -56,7 +56,6 @@ public class FrogMixinService implements IMixinService, IClassProvider, IClassBy
 
 	@Override
 	public void init() {
-
 	}
 
 	@Override

src/main/java/dev/frogmc/frogloader/impl/mod/JavaModProperties.java

@@ -25,7 +25,7 @@ public class JavaModProperties {
 					"",
 					Map.of(System.getProperty("java.vm.vendor"), Collections.singleton("Vendor")),
 					new ModDependencies(Collections.emptySet(), Collections.emptySet(), Collections.emptySet(), Collections.emptySet()),
-					ModExtensions.of(Collections.emptyMap()));
+					ModExtensions.of(Collections.emptyMap()), Collections.emptySet());
 		}
 		return INSTANCE;
 	}

src/main/java/dev/frogmc/frogloader/impl/mod/ModPropertiesImpl.java

@@ -1,5 +1,6 @@
 package dev.frogmc.frogloader.impl.mod;
 
+import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Map;
 
@@ -10,5 +11,5 @@ import dev.frogmc.frogloader.api.mod.SemVer;
 
 public record ModPropertiesImpl(String id, String name, String icon, SemVer version, String license,
 								Map<String, Collection<String>> credits, ModDependencies dependencies,
-								ModExtensions extensions) implements ModProperties {
+								ModExtensions extensions, Collection<Path> paths) implements ModProperties {
 }

src/main/java/dev/frogmc/frogloader/impl/mod/ModPropertiesReader.java

@@ -30,7 +30,7 @@ public class ModPropertiesReader {
 		try (FileSystem fs = FileSystems.newFileSystem(mod)) {
 			CommentedConfig props = PARSER.parse(fs.getPath(PROPERTIES_FILE_NAME), FileNotFoundAction.THROW_ERROR);
 
-			return Optional.of(readProperties(props));
+			return Optional.of(readProperties(props, Collections.singleton(mod)));
 		} catch (IOException e) {
 			LOGGER.warn("Failed to read mod properties: ", e);
 		}
@@ -38,17 +38,31 @@ public class ModPropertiesReader {
 		return Optional.empty();
 	}
 
-	public static ModProperties readFile(URL in) {
+	public static Optional<ModProperties> readFile(URL in) {
 		CommentedConfig props = PARSER.parse(in);
 
-		return readProperties(props);
+		try {
+			String url = in.toString();
+			Path source = Path.of(url.substring(url.lastIndexOf(":")+1).split("!")[0]).toAbsolutePath();
+			if (!source.getFileName().toString().endsWith(".jar")){
+				source = source.getParent();
+			} else {
+				// TODO will this result in a memory leak?
+				FileSystem fs = FileSystems.newFileSystem(source);
+				source = fs.getPath("/");
+			}
+			return Optional.of(readProperties(props, Collections.singleton(source)));
+		} catch (Exception e) {
+			LOGGER.warn("Failed to read mod properties from "+in+": ", e);
+		}
+		return Optional.empty();
 	}
 
-	private static ModProperties readProperties(UnmodifiableConfig config) {
+	private static ModProperties readProperties(UnmodifiableConfig config, Collection<Path> sources) {
 		String manifestVer = config.get("frog.format_version");
 
 		try {
-			return FormatVersion.get(manifestVer).parse(config);
+			return FormatVersion.get(manifestVer).parse(config, sources);
 		} catch (IOException e) {
 			throw new UncheckedIOException(e);
 		}
@@ -56,7 +70,7 @@ public class ModPropertiesReader {
 
 	@AllArgsConstructor
 	private enum FormatVersion {
-		V1_0_0("1.0.0", config -> {
+		V1_0_0("1.0.0", (config, sources) -> {
 			String id = config.get("frog.mod.id");
 			String name = config.get("frog.mod.name");
 			String icon = config.get("frog.mod.icon");
@@ -103,7 +117,8 @@ public class ModPropertiesReader {
 				extensionsConfig.entrySet().forEach(entry -> extensions.put(entry.getKey(), entry.getValue()));
 			}
 
-			return new ModPropertiesImpl(id, name, icon, SemVerImpl.parse(version), license, Collections.unmodifiableMap(credits), new ModDependencies(depends, breaks, suggests, provides), ModExtensions.of(extensions));
+			return new ModPropertiesImpl(id, name, icon, SemVerImpl.parse(version), license, Collections.unmodifiableMap(credits),
+					new ModDependencies(depends, breaks, suggests, provides), ModExtensions.of(extensions), sources);
 		});
 
 		private static final Map<String, Parser> versions = Arrays.stream(values()).collect(Collectors.toMap(v -> v.version, v -> v.parser));
@@ -116,7 +131,7 @@ public class ModPropertiesReader {
 
 		@FunctionalInterface
 		public interface Parser {
-			ModProperties parse(UnmodifiableConfig config) throws IOException;
+			ModProperties parse(UnmodifiableConfig config, Collection<Path> sources) throws IOException;
 		}
 	}
 }

src/main/java/dev/frogmc/frogloader/impl/plugin/game/minecraft/Minecraft.java

@@ -69,14 +69,14 @@ public class Minecraft implements FrogPlugin {
 				MinecraftSemVerImpl.get(version), "MC-EULA",
 				Map.of("Mojang AB", Collections.singleton("Author")),
 				new ModDependencies(Collections.emptySet(), Collections.emptySet(), Collections.emptySet(), Collections.emptySet()),
-				ModExtensions.of(Collections.emptyMap())));
+				ModExtensions.of(Collections.emptyMap()), Collections.emptySet()));
 
 		Collection<Path> mods = Discovery.find(loader.getModsDir(), path ->
 				version.equals(path.getFileName().toString()), path ->
 				path.getFileName().toString().endsWith(FrogLoaderImpl.MOD_FILE_EXTENSION));
 		Collection<URL> classpathMods = this.getClass().getClassLoader().resources(ModPropertiesReader.PROPERTIES_FILE_NAME).distinct().toList();
 
-		classpathMods.stream().map(ModPropertiesReader::readFile).forEachOrdered(modProperties::add);
+		classpathMods.stream().map(ModPropertiesReader::readFile).map(o -> o.orElse(null)).filter(Objects::nonNull).forEach(modProperties::add);
 		Map<Path, ModProperties> modPaths = new HashMap<>();
 		for (Path mod : new HashSet<>(mods)) {
 			findJiJMods(mod, mods, modPaths);