From a1f3300a8ac9d92dba9aa8e2dfd938d803717406 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Thu, 23 Nov 2023 09:50:47 -0500 Subject: [PATCH] More ClientOnlyMixin Related: #297 --- .../common/mixin/bugfix/world_leaks/MinecraftMixin.java | 2 ++ .../modernfix/fabric/mixin/core/ClientPlayNetHandlerMixin.java | 2 ++ .../embeddedt/modernfix/fabric/mixin/core/MCMixin_Fabric.java | 2 ++ .../modernfix/fabric/mixin/feature/branding/GuiMixin.java | 2 ++ .../file_dialog_title/WorldGenSettingsComponentMixin.java | 2 ++ 5 files changed, 10 insertions(+) diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_leaks/MinecraftMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_leaks/MinecraftMixin.java index d3708ff8..876bbaa9 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_leaks/MinecraftMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_leaks/MinecraftMixin.java @@ -5,6 +5,7 @@ import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.world.level.chunk.LevelChunk; import net.minecraft.world.level.lighting.LevelLightEngine; import org.embeddedt.modernfix.ModernFix; +import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.jetbrains.annotations.Nullable; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Mixin; @@ -16,6 +17,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import java.util.concurrent.atomic.AtomicReferenceArray; @Mixin(Minecraft.class) +@ClientOnlyMixin public class MinecraftMixin { @Shadow @Nullable public ClientLevel level; diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/ClientPlayNetHandlerMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/ClientPlayNetHandlerMixin.java index cd825dcf..ec503e82 100644 --- a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/ClientPlayNetHandlerMixin.java +++ b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/ClientPlayNetHandlerMixin.java @@ -2,12 +2,14 @@ package org.embeddedt.modernfix.fabric.mixin.core; import net.minecraft.client.multiplayer.ClientPacketListener; import org.embeddedt.modernfix.ModernFixClientFabric; +import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(value = ClientPacketListener.class, priority = 1500) +@ClientOnlyMixin public class ClientPlayNetHandlerMixin { @Inject(method = "handleUpdateRecipes", at = @At("RETURN")) private void signalRecipes(CallbackInfo ci) { diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/MCMixin_Fabric.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/MCMixin_Fabric.java index 2fb3ba16..15c003d1 100644 --- a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/MCMixin_Fabric.java +++ b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/MCMixin_Fabric.java @@ -2,12 +2,14 @@ package org.embeddedt.modernfix.fabric.mixin.core; import net.minecraft.client.Minecraft; import org.embeddedt.modernfix.ModernFixClient; +import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Minecraft.class) +@ClientOnlyMixin public class MCMixin_Fabric { @Inject(method = "tick", at = @At("RETURN")) private void onRenderTickEnd(CallbackInfo ci) { diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/feature/branding/GuiMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/feature/branding/GuiMixin.java index 64ac1037..47d3f1da 100644 --- a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/feature/branding/GuiMixin.java +++ b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/feature/branding/GuiMixin.java @@ -2,6 +2,7 @@ package org.embeddedt.modernfix.fabric.mixin.feature.branding; import net.minecraft.client.gui.components.DebugScreenOverlay; import org.embeddedt.modernfix.ModernFixClientFabric; +import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyVariable; @@ -9,6 +10,7 @@ import org.spongepowered.asm.mixin.injection.ModifyVariable; import java.util.List; @Mixin(DebugScreenOverlay.class) +@ClientOnlyMixin public class GuiMixin { @ModifyVariable(method = "getSystemInformation", at = @At("STORE"), ordinal = 0, require = 0) private List addModernFix(List list) { diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/file_dialog_title/WorldGenSettingsComponentMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/file_dialog_title/WorldGenSettingsComponentMixin.java index c273d3eb..0f75f8b5 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/file_dialog_title/WorldGenSettingsComponentMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/file_dialog_title/WorldGenSettingsComponentMixin.java @@ -1,11 +1,13 @@ package org.embeddedt.modernfix.forge.mixin.bugfix.file_dialog_title; import net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent; +import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyArg; @Mixin(WorldGenSettingsComponent.class) +@ClientOnlyMixin public class WorldGenSettingsComponentMixin { /** * @author embeddedt