Refactor voxelmap integration from reflection to mixins

mod/common/build.gradle

@@ -9,7 +9,8 @@ dependencies {
 	modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
 	// https://modrinth.com/mod/voxelmap-updated/version/1.21.11-1.15.13
-	modCompileOnly("maven.modrinth:voxelmap-updated:tRdGJKGE")
+	// Don't forget to update the version in the fabric version
+	modCompileOnly("maven.modrinth:voxelmap-updated:At2wqJfr")
 	// https://modrinth.com/mod/journeymap/version/1.21.11-6.0.0-beta.56+fabric
 	modCompileOnly("maven.modrinth:journeymap:OSpjUIEM")
 	// https://modrinth.com/mod/xaeros-world-map/version/fabric-1.21.11-1.40.11

mod/common/src/main/java/gjum/minecraft/mapsync/common/MixinManager.java

@@ -0,0 +1,86 @@
+package gjum.minecraft.mapsync.common;
+
+import java.util.List;
+import java.util.Set;
+import net.fabricmc.loader.api.FabricLoader;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.objectweb.asm.tree.ClassNode;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+import org.spongepowered.asm.service.MixinService;
+
+public final class MixinManager implements IMixinConfigPlugin {
+	private String mixinPackage = "";
+	private boolean isVoxelMapLoaded;
+
+	@Override
+	public void onLoad(
+		final @NotNull String mixinPackage
+	) {
+		this.mixinPackage = mixinPackage;
+		this.isVoxelMapLoaded = hasClass("com.mamiyaotaru.voxelmap.VoxelConstants");
+	}
+
+	/// This could be replaced with a [FabricLoader#isModLoaded(String)] if this was a fabric-only mod but alas, no.
+	private static boolean hasClass(
+		final @NotNull String className
+	) {
+		try {
+			MixinService.getService().getClassProvider().findClass(className, false);
+			return true;
+		}
+		catch (final ClassNotFoundException e) {
+			return false;
+		}
+	}
+
+	@Override
+	public boolean shouldApplyMixin(
+		final @NotNull String targetClassName,
+		final @NotNull String mixinClassName
+	) {
+		if (mixinClassName.startsWith(this.mixinPackage + ".voxelmap.")) {
+			return this.isVoxelMapLoaded;
+		}
+		return true;
+	}
+
+	@Override
+	public @Nullable String getRefMapperConfig() {
+		return null;
+	}
+
+	@Override
+	public void acceptTargets(
+		final @NotNull Set<@NotNull String> myTargets,
+		final @NotNull Set<@NotNull String> otherTargets
+	) {
+
+	}
+
+	@Override
+	public @Nullable List<@NotNull String> getMixins() {
+		return null;
+	}
+
+	@Override
+	public void preApply(
+		final @NotNull String targetClassName,
+		final @NotNull ClassNode targetClass,
+		final @NotNull String mixinClassName,
+		final @NotNull IMixinInfo mixinInfo
+	) {
+
+	}
+
+	@Override
+	public void postApply(
+		final @NotNull String targetClassName,
+		final @NotNull ClassNode targetClass,
+		final @NotNull String mixinClassName,
+		final @NotNull IMixinInfo mixinInfo
+	) {
+
+	}
+}

mod/common/src/main/java/gjum/minecraft/mapsync/common/RenderQueue.java

@@ -1,9 +1,9 @@
 package gjum.minecraft.mapsync.common;
 
 import gjum.minecraft.mapsync.common.data.ChunkTile;
-import gjum.minecraft.mapsync.common.integration.JourneyMapHelper;
-import gjum.minecraft.mapsync.common.integration.VoxelMapHelper;
-import gjum.minecraft.mapsync.common.integration.XaerosWorldMapHelper;
+import gjum.minecraft.mapsync.common.integrations.journeymap.JourneyMapHelper;
+import gjum.minecraft.mapsync.common.integrations.voxelmap.VoxelMapHelper;
+import gjum.minecraft.mapsync.common.integrations.xaerosmap.XaerosWorldMapHelper;
 import net.minecraft.client.Minecraft;
 import org.jetbrains.annotations.NotNull;
 
@@ -57,7 +57,7 @@ private void renderLoop() {
 				}
 
 				if (!JourneyMapHelper.isJourneyMapNotAvailable && !JourneyMapHelper.isMapping()
-						|| !VoxelMapHelper.isVoxelMapNotAvailable && !VoxelMapHelper.isMapping()
+						|| VoxelMapHelper.isModAvailable && !VoxelMapHelper.isMapping()
 						|| !XaerosWorldMapHelper.isXaerosWorldMapNotAvailable && !XaerosWorldMapHelper.isMapping()
 				) {
 					debugLog("render is waiting til map mod is ready");

mod/common/src/main/java/gjum/minecraft/mapsync/common/integration/JourneyMapHelper.java → mod/common/src/main/java/gjum/minecraft/mapsync/common/integrations/journeymap/JourneyMapHelper.java

@@ -1,4 +1,4 @@
-package gjum.minecraft.mapsync.common.integration;
+package gjum.minecraft.mapsync.common.integrations.journeymap;
 
 import java.util.regex.Pattern;
 

mod/common/src/main/java/gjum/minecraft/mapsync/common/integration/JourneyMapHelperReal.java → mod/common/src/main/java/gjum/minecraft/mapsync/common/integrations/journeymap/JourneyMapHelperReal.java

@@ -1,4 +1,4 @@
-package gjum.minecraft.mapsync.common.integration;
+package gjum.minecraft.mapsync.common.integrations.journeymap;
 
 import gjum.minecraft.mapsync.common.data.BlockColumn;
 import gjum.minecraft.mapsync.common.data.BlockInfo;

mod/common/src/main/java/gjum/minecraft/mapsync/common/integrations/voxelmap/VoxelMapHelper.java

@@ -0,0 +1,20 @@
+package gjum.minecraft.mapsync.common.integrations.voxelmap;
+
+import gjum.minecraft.mapsync.common.data.ChunkTile;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+public final class VoxelMapHelper {
+	@ApiStatus.Internal
+	public static boolean isModAvailable = false;
+
+	public static boolean isMapping() {
+		return isModAvailable && VoxelMapInternals.isMapping();
+	}
+
+	public static boolean updateWithChunkTile(
+		final @NotNull ChunkTile chunkTile
+	) {
+		return isModAvailable && VoxelMapInternals.updateWithChunkTile(chunkTile);
+	}
+}