MixinExtras modernization

build.gradle

@@ -25,7 +25,6 @@ repositories {
 		name = "jitpack.io"
 		url = "https://jitpack.io"
 	}
-	jcenter()
 	mavenLocal()
 }
 
@@ -42,6 +41,7 @@ afterEvaluate {
 	loom.runs.configureEach {
 		// https://fabricmc.net/wiki/tutorial:mixin_hotswaps
 		vmArg "-javaagent:${ configurations.compileClasspath.find { it.name.contains("sponge-mixin") } }"
+//		vmArg("-Dmixin.debug.export=true")
 	}
 }
 
@@ -57,20 +57,20 @@ dependencies {
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
 	jarLibs 'com.github.ben-manes.caffeine:caffeine:3.1.8'
-	jarLibs "com.github.collarmc:pounce:0e8492b68e"
+	implementation(include "net.lenni0451:LambdaEvents:2.4.0")
 	jarLibs 'org.xerial:sqlite-jdbc:3.44.1.0'
 
 	modImplementation "maven.modrinth:xaeros-world-map:${worldmap_version}_Fabric_1.20"
 	modImplementation "maven.modrinth:xaeros-minimap:${minimap_version}_Fabric_1.20"
 	modCompileOnly files("libs/BetterPvP_${minimap_version}_Fabric_1.20.jar")
-	modImplementation files("libs/baritone-api-fabric-1.20.1-elytra-beta-v1.jar")
-	modImplementation "maven.modrinth:waystones:14.0.2+fabric-1.20"
-	modImplementation "maven.modrinth:balm:7.1.4+fabric-1.20.1"
+	modCompileOnly files("libs/baritone-api-fabric-1.20.1-elytra-beta-v1.jar")
+	modCompileOnly "maven.modrinth:waystones:14.0.2+fabric-1.20"
+	modCompileOnly "maven.modrinth:balm:7.1.4+fabric-1.20.1"
 	modCompileOnly "maven.modrinth:fwaystones:3.1.3+mc1.20"
-	modRuntimeOnly "maven.modrinth:owo-lib:0.11.2+1.20"
-	runtimeOnly "blue.endless:jankson:1.2.3"
-	modRuntimeOnly "maven.modrinth:auth-me:7.0.2+1.20"
-	modRuntimeOnly "maven.modrinth:cloth-config:11.1.106+fabric"
+//	modRuntimeOnly "maven.modrinth:owo-lib:0.11.2+1.20"
+//	runtimeOnly "blue.endless:jankson:1.2.3"
+//	modRuntimeOnly "maven.modrinth:auth-me:7.0.2+1.20"
+//	modRuntimeOnly "maven.modrinth:cloth-config:11.1.106+fabric"
 }
 
 processResources {
@@ -125,7 +125,6 @@ shadowJar {
 	exclude 'org/sqlite/native/Windows/aarch64/**'
 	exclude 'org/sqlite/native/Windows/armv7/**'
 	exclude 'org/slf4j/**'
-	relocate "com.collarmc.pounce", "xaeroplus.com.collarmc.pounce.shadow"
 	relocate "com.github.benmanes.caffeine", "xaeroplus.com.github.benmanes.caffeine.shadow"
 }
 

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.parallel=false
 # check these on https://fabricmc.net/develop
 minecraft_version=1.20.1
 yarn_mappings=1.20.1+build.10
-loader_version=0.14.22
+loader_version=0.15.2
 # Mod Properties
 mod_version=1.20.1
 maven_group=xaeroplus

src/main/java/xaeroplus/Globals.java

@@ -3,6 +3,7 @@
 import com.google.common.base.Suppliers;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.util.Identifier;
@@ -38,6 +39,7 @@ public class Globals {
     public static int minimapScalingFactor = 1;
     public static boolean shouldResetFBO = false;
     public static String LOCK_ID = UUID.randomUUID().toString();
+    public static DrawContext minimapDrawContext = null;
     public static RegistryKey<World> getCurrentDimensionId() {
         try {
             var dim = XaeroWorldMapCore.currentSession.getMapProcessor().getMapWorld().getCurrentDimensionId();

src/main/java/xaeroplus/XaeroPlus.java

@@ -1,11 +1,12 @@
 package xaeroplus;
 
-import com.collarmc.pounce.EventBus;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.SemanticVersion;
 import net.fabricmc.loader.api.VersionParsingException;
+import net.lenni0451.lambdaevents.LambdaManager;
+import net.lenni0451.lambdaevents.generator.LambdaMetaFactoryGenerator;
 import net.minecraft.client.option.KeyBinding;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,7 +19,7 @@
 
 public class XaeroPlus implements ClientModInitializer {
 	public static final Logger LOGGER = LoggerFactory.getLogger("XaeroPlus");
-	public static final EventBus EVENT_BUS = new EventBus(Runnable::run);
+	public static final LambdaManager EVENT_BUS = LambdaManager.basic(new LambdaMetaFactoryGenerator());
 	public static AtomicBoolean initialized = new AtomicBoolean(false);
 	public static void initialize() {
 		if (initialized.compareAndSet(false, true)) {

src/main/java/xaeroplus/event/ChunkDataEvent.java

@@ -1,8 +1,6 @@
 package xaeroplus.event;
 
-import com.collarmc.pounce.EventInfo;
 import net.minecraft.world.chunk.WorldChunk;
 
-@EventInfo()
 public record ChunkDataEvent(WorldChunk chunk) {
 }

src/main/java/xaeroplus/event/ClientTickEvent.java

@@ -1,8 +1,5 @@
 package xaeroplus.event;
 
-import com.collarmc.pounce.EventInfo;
-
-@EventInfo
 public class ClientTickEvent {
     public static class Pre extends ClientTickEvent {
         public static Pre INSTANCE = new Pre();

src/main/java/xaeroplus/event/PacketReceivedEvent.java

@@ -1,7 +1,5 @@
 package xaeroplus.event;
 
-import com.collarmc.pounce.EventInfo;
 import net.minecraft.network.packet.Packet;
 
-@EventInfo
 public record PacketReceivedEvent(Packet<?> packet) { }

src/main/java/xaeroplus/event/XaeroWorldChangeEvent.java

@@ -1,6 +1,3 @@
 package xaeroplus.event;
 
-import com.collarmc.pounce.EventInfo;
-
-@EventInfo
 public record XaeroWorldChangeEvent(String worldId, String dimId, String mwId) { }