From 4cdf5e6b3da09f429a06356e07738b554cda00a7 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sat, 22 Jul 2023 15:35:36 -0400 Subject: [PATCH] Fix missing ClientOnly annotations --- .../mixin/bugfix/concurrency/RenderTypeEqualsStrategyMixin.java | 2 ++ .../forge/mixin/safety/EntityRenderDispatcherMixin.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/concurrency/RenderTypeEqualsStrategyMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/concurrency/RenderTypeEqualsStrategyMixin.java index c3afbe3d..0cb10be7 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/concurrency/RenderTypeEqualsStrategyMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/concurrency/RenderTypeEqualsStrategyMixin.java @@ -1,6 +1,7 @@ package org.embeddedt.modernfix.common.mixin.bugfix.concurrency; import net.minecraft.client.renderer.RenderType; +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.Redirect; @@ -8,6 +9,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; import java.util.Objects; @Mixin(targets = { "net/minecraft/client/renderer/RenderType$CompositeRenderType$EqualsStrategy"}) +@ClientOnlyMixin public class RenderTypeEqualsStrategyMixin { @Redirect(method = "equals(Lnet/minecraft/client/renderer/RenderType$CompositeRenderType;Lnet/minecraft/client/renderer/RenderType$CompositeRenderType;)Z", at = @At(value = "INVOKE", target = "Ljava/util/Objects;equals(Ljava/lang/Object;Ljava/lang/Object;)Z", ordinal = 0)) private boolean alsoCheckName(Object a, Object b, RenderType.CompositeRenderType type1, RenderType.CompositeRenderType type2) { diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/safety/EntityRenderDispatcherMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/safety/EntityRenderDispatcherMixin.java index 421919f4..66bcf7ce 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/safety/EntityRenderDispatcherMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/safety/EntityRenderDispatcherMixin.java @@ -10,6 +10,7 @@ import net.minecraftforge.fml.client.registry.IRenderFactory; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.embeddedt.modernfix.ModernFix; +import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mutable; @@ -23,6 +24,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @Mixin(value = EntityRenderDispatcher.class, priority = 1500) +@ClientOnlyMixin public class EntityRenderDispatcherMixin { @Shadow @Final @Mutable private Map, EntityRenderer> renderers;