Fixed mod compatibility with Xaeros Minimap

Author: RaphiMC

common/src/main/java/net/raphimc/immediatelyfast/injection/ImmediatelyFastMixinPlugin.java

@@ -78,7 +78,7 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
             return false;
         } else if (packageName.startsWith("hud_batching.compat.journeymap") && PlatformCode.getModVersion("journeymap").isEmpty()) { // https://github.com/RaphiMC/ImmediatelyFast/issues/316
             return false;
-        } else if (packageName.startsWith("hud_batching.compat.sodiumextras") && PlatformCode.getModVersion("sodiumextras").isEmpty()) { // https://github.com/RaphiMC/ImmediatelyFast/issues/319
+        } else if (packageName.startsWith("hud_batching.compat.xaerominimap") && PlatformCode.getModVersion("xaerominimap").isEmpty()) { // https://github.com/RaphiMC/ImmediatelyFast/issues/319
             return false;
         } else if (packageName.startsWith("hud_batching.compat.ftbchunks") && PlatformCode.getModVersion("ftbchunks").isEmpty()) { // https://github.com/RaphiMC/ImmediatelyFast/issues/318
             return false;

…MixinSodiumExtras_DebugOverlayEvent.java …map/MixinXaerosMinimap_ClientEvents.javaneoforge/src/main/java/net/raphimc/immediatelyfast/neoforge/injection/mixins/hud_batching/compat/sodiumextras/MixinSodiumExtras_DebugOverlayEvent.java renamed to common/src/main/java/net/raphimc/immediatelyfast/injection/mixins/hud_batching/compat/xaerominimap/MixinXaerosMinimap_ClientEvents.java neoforge/src/main/java/net/raphimc/immediatelyfast/neoforge/injection/mixins/hud_batching/compat/sodiumextras/MixinSodiumExtras_DebugOverlayEvent.java renamed to common/src/main/java/net/raphimc/immediatelyfast/injection/mixins/hud_batching/compat/xaerominimap/MixinXaerosMinimap_ClientEvents.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.raphimc.immediatelyfast.neoforge.injection.mixins.hud_batching.compat.sodiumextras;
+package net.raphimc.immediatelyfast.injection.mixins.hud_batching.compat.xaerominimap;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.client.gui.DrawContext;
@@ -27,12 +27,12 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @SuppressWarnings("UnresolvedMixinReference")
-@Mixin(targets = "toni.sodiumextras.foundation.fps.DebugOverlayEvent", remap = false)
+@Mixin(targets = "xaero.common.events.ClientEvents", remap = false)
 @Pseudo
-public abstract class MixinSodiumExtras_DebugOverlayEvent {
+public abstract class MixinXaerosMinimap_ClientEvents {
 
-    @Inject(method = "renderFPSChar", at = @At("RETURN"))
-    private static void forceDrawBatch(CallbackInfo ci, @Local(argsOnly = true) DrawContext drawContext) {
+    @Inject(method = "handleRenderGameOverlayEventPre", at = @At("HEAD"))
+    private void forceDrawBatch(CallbackInfo ci, @Local(argsOnly = true) DrawContext drawContext) {
         if (ImmediatelyFast.runtimeConfig.hud_batching) {
             drawContext.draw();
         }

common/src/main/resources/immediatelyfast-common.mixins.json

@@ -27,6 +27,7 @@
     "hud_batching.compat.MixinDrawContext",
     "hud_batching.compat.MixinRenderSystem",
     "hud_batching.compat.journeymap.MixinJourneyMap_MiniMap",
+    "hud_batching.compat.xaerominimap.MixinXaerosMinimap_ClientEvents",
     "hud_batching.consumer.MixinDrawContext",
     "map_atlas_generation.MixinMapRenderer",
     "map_atlas_generation.MixinMapRenderer_MapTexture",

neoforge/src/main/resources/immediatelyfast-neoforge.mixins.json

@@ -9,7 +9,6 @@
     "hud_batching.MixinGuiLayerManager",
     "hud_batching.compat.appleskin.MixinAppleSkin_HUDOverlayHandler",
     "hud_batching.compat.ftbchunks.MixinFTBChunks_FTBChunksClient",
-    "hud_batching.compat.sodiumextras.MixinSodiumExtras_DebugOverlayEvent",
     "screen_batching.MixinClientHooks"
   ],
   "injectors": {