Implement Player Effect Synchronization and Address Critical Issues

fabric/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.11.7"
+    id("fabric-loom") version "1.14-SNAPSHOT"
     id("spectatorplus.platform")
 }
 
@@ -22,6 +22,20 @@ loom {
         }
     }
 
+    runs {
+        getByName("client") {
+            client()
+            ideConfigGenerated(true)
+            runDir("run/client")
+        }
+
+        getByName("server") {
+            server()
+            ideConfigGenerated(true)
+            runDir("run")
+        }
+    }
+
     accessWidenerPath = file("src/main/resources/spectatorplus.accesswidener")
 }
 
@@ -32,7 +46,6 @@ dependencies {
         officialMojangMappings()
         parchment("org.parchmentmc.data:parchment-${property("parchment_minecraft_version")}:${property("parchment_version")}@zip")
     })
-
     modImplementation("net.fabricmc.fabric-api:fabric-api:${property("fabric_version")}")
 
     include(modImplementation("me.lucko:fabric-permissions-api:${property("fabric_permissions_api_version")}")!!)

fabric/gradle.properties

@@ -1,13 +1,13 @@
-minecraft_version=1.21.10
-yarn_mappings=1.21.10+build.1
-loader_version=0.17.2
+minecraft_version=1.21.11
+yarn_mappings=1.21.11+build.3
+loader_version=0.18.4
 
 # Fabric API
-fabric_version=0.138.3+1.21.10
+fabric_version=0.140.2+1.21.11
 
-parchment_minecraft_version=1.21.10
-parchment_version=2025.10.12
+parchment_minecraft_version=1.21.11
+parchment_version=2025.12.20
 
-fabric_permissions_api_version=0.4.0
-cloth_config_version=19.0.147
-modmenu_version=16.0.0-rc.1
+fabric_permissions_api_version=0.6.1
+cloth_config_version=21.11.153
+modmenu_version=17.0.0-beta.1

fabric/src/client/java/com/hpfxd/spectatorplus/fabric/client/SpectatorKeybinds.java

@@ -7,7 +7,7 @@
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.ChatFormatting;
-import net.minecraft.Util;
+import net.minecraft.util.Util;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.spectator.SpectatorGui;

fabric/src/client/java/com/hpfxd/spectatorplus/fabric/client/mixin/GameRendererMixin.java

@@ -16,8 +16,10 @@
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.level.GameType;
 import net.minecraft.world.phys.Vec3;
 import org.joml.Matrix4f;
+import org.joml.Matrix4fc;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -45,12 +47,24 @@ public abstract class GameRendererMixin {
     @Unique private float xBobO;
     @Unique private float yBobO;
 
+//    @Redirect(method = "renderItemInHand", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/PoseStack;mulPose(Lorg/joml/Matrix4fc;)V", ordinal = 0))
+//    private void redirectMulPose(PoseStack poseStack, Matrix4fc matrix) {
+//        // In spectator mode, the projection matrix contains rotation data from the spectated player,
+//        // while arm rendering calculations are based on the localPlayer's viewpoint.
+//        // We must skip this mulPose operation when spectating to avoid rendering arms with incorrect orientation.
+//        if (this.minecraft.player == null
+//                || this.minecraft.player.gameMode() != GameType.SPECTATOR
+//                || !this.minecraft.options.getCameraType().isFirstPerson()) {
+//            poseStack.mulPose(matrix);
+//        }
+//    }
+
     @Inject(method = "renderItemInHand", at = @At(value = "INVOKE", target = "Lorg/joml/Matrix4fStack;popMatrix()Lorg/joml/Matrix4fStack;", remap = false))
     public void spectatorplus$renderItemInHand(float partialTicks, boolean sleeping, Matrix4f projectionMatrix, CallbackInfo ci, @Local PoseStack poseStackIn) {
         if (SpectatorClientMod.config.renderArms && this.minecraft.player != null && this.minecraft.options.getCameraType().isFirstPerson() && !this.minecraft.options.hideGui) {
             final AbstractClientPlayer spectated = SpecUtil.getCameraPlayer(this.minecraft);
             if (spectated != null && !spectated.isSpectator()) {
-                this.lightTexture.turnOnLightLayer();
+                //this.lightTexture.turnOnLightLayer();
 
                 float attackAnim = spectated.getAttackAnim(partialTicks);
                 final InteractionHand interactionHand = MoreObjects.firstNonNull(spectated.swingingArm, InteractionHand.MAIN_HAND);
@@ -67,7 +81,7 @@ public abstract class GameRendererMixin {
 
                 if (handRenderSelection.renderMainHand) {
                     final float swingProgress = interactionHand == InteractionHand.MAIN_HAND ? attackAnim : 0.0F;
-                    final float equippedProgress = 1F - Mth.lerp(partialTicks, accessor.getOMainHandHeight(), accessor.getMainHandHeight());
+                    final float equippedProgress = accessor.getItemModelResolver().swapAnimationScale(accessor.getMainHandItem()) * (1F - Mth.lerp(partialTicks, accessor.getOMainHandHeight(), accessor.getMainHandHeight()));
 
                         accessor.invokeRenderArmWithItem(spectated, partialTicks,
                             pitch, InteractionHand.MAIN_HAND, swingProgress, accessor.getMainHandItem(), equippedProgress,
@@ -76,14 +90,15 @@ public abstract class GameRendererMixin {
 
                 if (handRenderSelection.renderOffHand) {
                     final float swingProgress = interactionHand == InteractionHand.OFF_HAND ? attackAnim : 0.0F;
-                    final float equippedProgress = 1F - Mth.lerp(partialTicks, accessor.getOOffHandHeight(), accessor.getOffHandHeight());
+                    final float equippedProgress = accessor.getItemModelResolver().swapAnimationScale(accessor.getOffHandItem()) * (1F - Mth.lerp(partialTicks, accessor.getOOffHandHeight(), accessor.getOffHandHeight()));
 
                         accessor.invokeRenderArmWithItem(spectated, partialTicks,
                             pitch, InteractionHand.OFF_HAND, swingProgress, accessor.getOffHandItem(), equippedProgress,
                             poseStackIn, submitNodeCollector, packedLightCoords);
                 }
 
-                this.lightTexture.turnOffLightLayer();
+                //this.lightTexture.turnOffLightLayer();
+                this.minecraft.gameRenderer.getFeatureRenderDispatcher().renderAllFeatures();
                 this.renderBuffers.bufferSource().endBatch();
             }
         }
@@ -161,25 +176,4 @@ private static ItemInHandRenderer.HandRenderSelection evaluateWhichHandsToRender
         if (minecraft.getCameraEntity() == this.minecraft.player) return instance.getInterpolatedBob(partialTick);
         return Mth.lerp(partialTick, this.bobO, this.bob);
     }
-
-    @ModifyExpressionValue(method = "pick(F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;blockInteractionRange()D"))
-    private double spectatorplus$modifyBlockInteractionRange(double original) {
-        final AbstractClientPlayer spectated = SpecUtil.getCameraPlayer(this.minecraft);
-        if (spectated != null) {
-            return spectated.blockInteractionRange();
-        }
-
-        return original;
-    }
-
-    @ModifyExpressionValue(method = "pick(F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;entityInteractionRange()D"))
-    private double spectatorplus$modifyEntityInteractionRange(double original) {
-        final AbstractClientPlayer spectated = SpecUtil.getCameraPlayer(this.minecraft);
-        if (spectated != null) {
-            return spectated.entityInteractionRange();
-        }
-
-        return original;
-    }
-
 }

fabric/src/client/java/com/hpfxd/spectatorplus/fabric/client/mixin/GuiMixin.java

@@ -40,7 +40,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.modify.LocalVariableDiscriminator.Context.Local;
 
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.core.Holder;
 
 @Mixin(Gui.class)
@@ -54,15 +54,15 @@ public abstract class GuiMixin {
     @Shadow @Final private SpectatorGui spectatorGui;
 
 
-    // Use correct ResourceLocations for vanilla empty armor slot icons from the GUI atlas
-    private static final ResourceLocation EMPTY_ARMOR_SLOT_HELMET = ResourceLocation.withDefaultNamespace("container/slot/helmet");
-    private static final ResourceLocation EMPTY_ARMOR_SLOT_CHESTPLATE = ResourceLocation.withDefaultNamespace("container/slot/chestplate");
-    private static final ResourceLocation EMPTY_ARMOR_SLOT_LEGGINGS = ResourceLocation.withDefaultNamespace("container/slot/leggings");
-    private static final ResourceLocation EMPTY_ARMOR_SLOT_BOOTS = ResourceLocation.withDefaultNamespace("container/slot/boots");
-    private static final ResourceLocation EFFECT_BACKGROUND_AMBIENT_SPRITE = ResourceLocation.withDefaultNamespace("hud/effect_background_ambient");
-    private static final ResourceLocation EFFECT_BACKGROUND_SPRITE = ResourceLocation.withDefaultNamespace("hud/effect_background");
+    // Use correct Identifiers for vanilla empty armor slot icons from the GUI atlas
+    private static final Identifier EMPTY_ARMOR_SLOT_HELMET = Identifier.withDefaultNamespace("container/slot/helmet");
+    private static final Identifier EMPTY_ARMOR_SLOT_CHESTPLATE = Identifier.withDefaultNamespace("container/slot/chestplate");
+    private static final Identifier EMPTY_ARMOR_SLOT_LEGGINGS = Identifier.withDefaultNamespace("container/slot/leggings");
+    private static final Identifier EMPTY_ARMOR_SLOT_BOOTS = Identifier.withDefaultNamespace("container/slot/boots");
+    private static final Identifier EFFECT_BACKGROUND_AMBIENT_SPRITE = Identifier.withDefaultNamespace("hud/effect_background_ambient");
+    private static final Identifier EFFECT_BACKGROUND_SPRITE = Identifier.withDefaultNamespace("hud/effect_background");
 
-    private static final ResourceLocation[] TEXTURE_EMPTY_SLOTS = new ResourceLocation[]{
+    private static final Identifier[] TEXTURE_EMPTY_SLOTS = new Identifier[]{
         EMPTY_ARMOR_SLOT_BOOTS, EMPTY_ARMOR_SLOT_LEGGINGS, EMPTY_ARMOR_SLOT_CHESTPLATE, EMPTY_ARMOR_SLOT_HELMET
     };
 
@@ -178,20 +178,19 @@ public abstract class GuiMixin {
                     int effectBaseY = baseY + slots.length * (itemHeight + spacing) + spacing; // start below armor
 
                     // Render all active effect icons down the right side below armor
-                    LocalPlayer player = this.minecraft.player;
-                    if (player != null && player.getActiveEffects() != null && !player.getActiveEffects().isEmpty()) {
+                    if (ClientSyncController.syncData.effects != null && !ClientSyncController.syncData.effects.isEmpty()) {
                         int effectIndex = 0;
-                        for (var effectInstance : player.getActiveEffects()) {
+                        for (var effectInstance : ClientSyncController.syncData.effects) {
                             int y = effectBaseY + effectIndex * (itemWidth + spacing);
 
                             // Draw vanilla effect background
                             guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, EFFECT_BACKGROUND_SPRITE, baseX, y, itemWidth, itemHeight);
 
-                            ResourceLocation effectIcon = Gui.getMobEffectSprite(effectInstance.getEffect());
+                            Identifier effectIcon = GuiMixin.getEffectIcon(effectInstance.effectKey);
                             guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, effectIcon, baseX + 2, y + 2, itemWidth - 4, itemHeight - 4);
 
                             // Draw effect level as a small white number on the top right of the icon
-                            int level = effectInstance.getAmplifier() + 1;
+                            int level = effectInstance.amplifier + 1;
                             String levelText = String.valueOf(level);
                             int levelTextWidth = this.minecraft.font.width(levelText);
                             int levelTextX = baseX + itemWidth - (int)(levelTextWidth * 0.4F) - 3; // right-align inside top-right corner
@@ -202,7 +201,7 @@ public abstract class GuiMixin {
                             guiGraphics.pose().popMatrix();
 
                             // Draw duration bar (1px wide) to the left of the effect icon, color changes with percent
-                            int duration = effectInstance.getDuration();
+                            int duration = effectInstance.duration;
                             int maxDuration = 3600; // 3 minutes, adjust as needed
                             float percent = maxDuration > 0 ? (duration / (float)maxDuration) : 1.0F;
                             int maxBarHeight = itemHeight - 2;
@@ -365,8 +364,8 @@ public abstract class GuiMixin {
         }
         return instance;
     }
-    // Map EffectType to vanilla effect icon ResourceLocation
-    private static ResourceLocation getEffectIcon(String effectKey) {
+    // Map EffectType to vanilla effect icon Identifier
+    private static Identifier getEffectIcon(String effectKey) {
         // If effectKey contains a namespace (e.g., minecraft:nausea), strip it
         String key = effectKey;
         int colonIdx = key.indexOf(":");
@@ -375,7 +374,7 @@ private static ResourceLocation getEffectIcon(String effectKey) {
         }
         // Vanilla effect icons are in the GUI atlas as effect/<effectKey>
         // The effectKey should be lowercase, matching the registry name
-        return ResourceLocation.withDefaultNamespace("mob_effect/" + key.toLowerCase());
+        return Identifier.withDefaultNamespace("mob_effect/" + key.toLowerCase());
     }
 
 }

fabric/src/client/java/com/hpfxd/spectatorplus/fabric/client/mixin/ItemInHandRendererAccessor.java

@@ -4,6 +4,7 @@
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.renderer.ItemInHandRenderer;
 import net.minecraft.client.renderer.SubmitNodeCollector;
+import net.minecraft.client.renderer.item.ItemModelResolver;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
@@ -35,6 +36,9 @@ void invokeRenderArmWithItem(AbstractClientPlayer player, float partialTick, flo
     @Accessor
     ItemStack getOffHandItem();
 
+    @Accessor
+    ItemModelResolver getItemModelResolver();
+
     @Invoker("isChargedCrossbow")
     static boolean invokeIsChargedCrossbow(ItemStack stack) {
         throw new AssertionError();

fabric/src/client/java/com/hpfxd/spectatorplus/fabric/client/mixin/ItemInHandRendererMixin.java

@@ -55,8 +55,10 @@ public abstract class ItemInHandRendererMixin {
 
             if (this.spectated == spectated) {
                 float f = spectated.getAttackStrengthScale(1.0F);
-                this.mainHandHeight += Mth.clamp((this.mainHandItem == mainHandItem ? f * f * f : 0.0F) - this.mainHandHeight, -0.4F, 0.4F);
-                this.offHandHeight += Mth.clamp((float) (this.offHandItem == offHandItem ? 1 : 0) - this.offHandHeight, -0.4F, 0.4F);
+                float g = this.mainHandItem != mainHandItem ? 0.0F : f * f * f;
+                float h = this.offHandItem != offHandItem ? 0.0F : 1.0F;
+                this.mainHandHeight = this.mainHandHeight + Mth.clamp(g - this.mainHandHeight, -0.4F, 0.4F);
+                this.offHandHeight = this.offHandHeight + Mth.clamp(h - this.offHandHeight, -0.4F, 0.4F);
 
                 if (this.mainHandHeight < 0.1F) {
                     this.mainHandItem = mainHandItem;

fabric/src/client/java/com/hpfxd/spectatorplus/fabric/client/mixin/LivingEntityAccessor.java

@@ -0,0 +1,16 @@
+package com.hpfxd.spectatorplus.fabric.client.mixin;
+
+import net.minecraft.core.Holder;
+import net.minecraft.world.effect.MobEffect;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.entity.LivingEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.Map;
+
+@Mixin(LivingEntity.class)
+public interface LivingEntityAccessor {
+    @Accessor("activeEffects")
+    Map<Holder<MobEffect>, MobEffectInstance> spectatorplus$getActiveEffects();
+}

fabric/src/client/java/com/hpfxd/spectatorplus/fabric/client/mixin/LivingEntityMixin.java

@@ -1,29 +1,27 @@
 package com.hpfxd.spectatorplus.fabric.client.mixin;
 
+import com.hpfxd.spectatorplus.fabric.client.util.EffectUtil;
 import com.hpfxd.spectatorplus.fabric.client.util.SpecUtil;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.core.Holder;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.effect.MobEffectInstance;
-import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.HitResult;
-
-import java.util.Collection;
-
-import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Map;
 
 @Mixin(LivingEntity.class)
 public abstract class LivingEntityMixin extends Entity {
@@ -52,6 +50,20 @@ private boolean isLookingAtBlock() {
             return false;
         }
 
-        return ((GameRendererAccessor) Minecraft.getInstance().gameRenderer).invokePick(this, player.blockInteractionRange(), player.entityInteractionRange(), 1F).getType() == HitResult.Type.BLOCK;
+        var spectated = SpecUtil.getCameraPlayer(Minecraft.getInstance());
+        var blockRange = spectated == null ? player.blockInteractionRange() : spectated.blockInteractionRange();
+        var entityRange = spectated == null ? player.entityInteractionRange() : spectated.entityInteractionRange();
+        return LocalPlayerAccessor.invokePick(this, blockRange, entityRange, 1F).getType() == HitResult.Type.BLOCK;
     }
+
+    @Redirect(method = {"hasEffect", "getEffect", "getActiveEffects", "tickEffects"},
+            at = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/LivingEntity;activeEffects:Ljava/util/Map;"))
+    private Map<Holder<MobEffect>, MobEffectInstance> spectatorplus$redirectActiveEffects(LivingEntity instance) {
+        // 只对玩家且满足条件时才重定向
+        if (instance.level().isClientSide() && instance instanceof Player && EffectUtil.shouldUseSpectatorData()) {
+            return EffectUtil.getActiveEffectsMap();
+        }
+        return ((LivingEntityAccessor) instance).spectatorplus$getActiveEffects();
+    }
+
 }

fabric/src/client/java/com/hpfxd/spectatorplus/fabric/client/mixin/LocalPlayerAccessor.java

@@ -0,0 +1,15 @@
+package com.hpfxd.spectatorplus.fabric.client.mixin;
+
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.phys.HitResult;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(LocalPlayer.class)
+public interface LocalPlayerAccessor {
+    @Invoker
+    static HitResult invokePick(Entity cameraEntity, double blockRange, double entityRange, float partialTick) {
+        throw new AssertionError();
+    }
+}