Added 'Offset Model' feature

README.md

@@ -42,6 +42,7 @@ Snapshots are [here](https://github.com/xTracr/RealCamera/actions/workflows/buil
   * Customizable Player Models
 * Compatible:
   * most camera mods
+  * Player Animation Lib
   * Not Enough Animations[^1]
   * First Person Model
   * Pehkui

README_ZH.md

@@ -42,6 +42,7 @@
   * Customizable Player Models
 * 兼容:
   * 大多数摄像头模组
+  * Player Animation Lib
   * Not Enough Animations[^1]
   * First Person Model
   * Pehkui

common/src/main/java/com/xtracr/realcamera/RealCameraCore.java

@@ -70,8 +70,8 @@ public static boolean isActive() {
     }
 
     public static void computeCamera(MinecraftClient client, float tickDelta) {
-        if (config.isClassic()) return;
         modelOffset = Vec3d.ZERO;
+        if (config.isClassic()) return;
 
         // GameRenderer.renderWorld
         MatrixStack matrixStack = new MatrixStack();

common/src/main/java/com/xtracr/realcamera/config/ConfigScreen.java

@@ -92,6 +92,11 @@ public static Screen create(Screen parent) {
                 .setTooltip(Text.translatable(TOOLTIP + "adjustOffset"))
                 .setSaveConsumer(b -> config.binding.adjustOffset = b)
                 .build());
+        binding.addEntry(entryBuilder.startBooleanToggle(Text.translatable(OPTION + "offsetModel"), config.binding.offsetModel)
+                .setDefaultValue(false)
+                .setTooltip(Text.translatable(TOOLTIP + "offsetModel"))
+                .setSaveConsumer(b -> config.binding.offsetModel = b)
+                .build());
         SubCategoryBuilder bindingCameraOffset = entryBuilder.startSubCategory(Text.translatable(CATEGORY + "cameraOffset"))
                 .setTooltip(Text.translatable(TOOLTIP + "bindingOffset"), Text.translatable(TOOLTIP + "bindingOffset_n"));
         bindingCameraOffset.add(entryBuilder.startDoubleField(Text.translatable(OPTION + "cameraOffset", "X"), config.binding.cameraX)

common/src/main/java/com/xtracr/realcamera/config/ModConfig.java

@@ -87,6 +87,10 @@ public boolean isAdjustingOffset() {
         return binding.adjustOffset;
     }
 
+    public boolean doOffsetModel() {
+        return binding.offsetModel;
+    }
+
     public double getBindingX() {
         return binding.cameraX;
     }
@@ -300,6 +304,7 @@ private void clamp() {
     public static class Binding {
         public VanillaModelPart vanillaModelPart = VanillaModelPart.head;
         public boolean adjustOffset = true;
+        public boolean offsetModel = false;
         public double cameraX = 3.25D;
         public double cameraY = 2.0D;
         public double cameraZ = 0.0D;

common/src/main/java/com/xtracr/realcamera/mixins/MixinCamera.java

@@ -67,8 +67,10 @@ public abstract class MixinCamera {
                 Box box = focusedEntity.getBoundingBox();
                 double restrictedY = MathHelper.clamp(prevPos.getY(), box.minY + 0.1D, box.maxY - 0.1D);
                 startVec = new Vec3d(pos.getX(), restrictedY, pos.getZ());
-                setPos(prevPos);
-                realCamera$clipToSpace(startVec);
+                if (!config.doOffsetModel()) {
+                    setPos(prevPos);
+                    realCamera$clipToSpace(startVec);
+                }
                 RealCameraCore.setModelOffset(pos.subtract(prevPos));
                 setRotation(config.isYawingBound() ? RealCameraCore.getYaw() : yaw - config.getBindingYaw(),
                         config.isPitchingBound() ? RealCameraCore.getPitch() : pitch + config.getBindingPitch());

common/src/main/java/com/xtracr/realcamera/mixins/MixinEntityRenderDispatcher.java

@@ -0,0 +1,24 @@
+package com.xtracr.realcamera.mixins;
+
+import com.xtracr.realcamera.RealCameraCore;
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.math.Vec3d;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
+@Mixin(EntityRenderDispatcher.class)
+public abstract class MixinEntityRenderDispatcher {
+    @ModifyVariable(method = "render", at = @At("STORE"), ordinal = 0)
+    private <E extends Entity> Vec3d realCamera$modifyOffset(Vec3d vec, E entity, double x, double y, double z,
+            float yaw, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light) {
+        if (entity instanceof ClientPlayerEntity && RealCameraCore.isActive()) {
+            vec = vec.add(RealCameraCore.getModelOffset());
+        }
+        return vec;
+    }
+}

common/src/main/java/com/xtracr/realcamera/mixins/MixinGameRenderer.java

@@ -68,7 +68,7 @@ public abstract class MixinGameRenderer {
 
     @Inject(method = "renderWorld", at = @At(value = "INVOKE",
             target = "Lnet/minecraft/client/render/Camera;update(Lnet/minecraft/world/BlockView;Lnet/minecraft/entity/Entity;ZZF)V"))
-    private void realCamera$onBeforeCameraUpdate(float tickDelta, long limitTime, MatrixStack matrixStack, CallbackInfo cInfo) {
+    private void realCamera$onBeforeCameraUpdate(float tickDelta, long limitTime, MatrixStack matrices, CallbackInfo cInfo) {
         if (RealCameraCore.isActive()) {
             RealCameraCore.computeCamera(client, tickDelta);
         }

common/src/main/java/com/xtracr/realcamera/mixins/MixinPlayerEntityRenderer.java

@@ -1,6 +1,5 @@
 package com.xtracr.realcamera.mixins;
 
-import com.xtracr.realcamera.RealCameraCore;
 import com.xtracr.realcamera.api.VirtualRenderer;
 import com.xtracr.realcamera.utils.Flags;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
@@ -11,12 +10,10 @@
 import net.minecraft.client.render.entity.PlayerEntityRenderer;
 import net.minecraft.client.render.entity.model.PlayerEntityModel;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.math.Vec3d;
 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;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(PlayerEntityRenderer.class)
 public abstract class MixinPlayerEntityRenderer
@@ -38,14 +35,6 @@ public MixinPlayerEntityRenderer(Context ctx, PlayerEntityModel<AbstractClientPl
         Flags.isRenderingClientPlayer = false;
     }
 
-    @Inject(method = "getPositionOffset*", at = @At("RETURN"), cancellable = true)
-    private void realCamera$translateModel(AbstractClientPlayerEntity abstractClientPlayerEntity, float f, CallbackInfoReturnable<Vec3d> cInfo) {
-        if (RealCameraCore.isActive() && abstractClientPlayerEntity instanceof ClientPlayerEntity) {
-            Vec3d returnVec = cInfo.getReturnValue().add(RealCameraCore.getModelOffset());
-            cInfo.setReturnValue(returnVec);
-        }
-    }
-
     @Inject(method = "setModelPose", at = @At("RETURN"))
     private void realCamera$onSetModelPoseRETURN(AbstractClientPlayerEntity player, CallbackInfo cInfo) {
         if (VirtualRenderer.shouldDisableRender("head")) model.head.visible = false;

common/src/main/resources/assets/realcamera/lang/en_us.json

@@ -44,6 +44,7 @@
 
     "config.option.xtracr_realcamera_vanillaModelPart": "Vanilla Model part",
     "config.option.xtracr_realcamera_adjustOffset": "Adjust Camera Offset",
+    "config.option.xtracr_realcamera_offsetModel": "Offset Model",
     "config.option.xtracr_realcamera_bindPitching": "Bind Pitching",
     "config.option.xtracr_realcamera_bindYawing": "Bind Yawing",
     "config.option.xtracr_realcamera_bindRolling": "Bind Rolling",
@@ -60,7 +61,6 @@
     "config.option.xtracr_realcamera_useModModel": "Mod Model Compat",
     "config.option.xtracr_realcamera_modelModID": "Model Mod ID",
     "config.option.xtracr_realcamera_modModelPart": "Mod Model Part",
-    "config.option.xtracr_realcamera_doABarrelRoll": "Do A Barrel Roll",
     "config.option.xtracr_realcamera_pehkui": "Pehkui",
     "config.option.xtracr_realcamera_physicsMod": "Physics Mod",
 
@@ -87,6 +87,7 @@
 
     "config.tooltip.xtracr_realcamera_vanillaModelPart": "Model part to bind camera to",
     "config.tooltip.xtracr_realcamera_adjustOffset": "When pressing the adjustment key, adjust the offset or rotation of camera",
+    "config.tooltip.xtracr_realcamera_offsetModel": "Move the model to camera to keep the camera position constant. Compatibility with other mods may become better when turned on",
 
     "config.tooltip.xtracr_realcamera_classicAdjustMode": "Determine which to adjust when pressing the adjustment key",
 

common/src/main/resources/assets/realcamera/lang/zh_cn.json

@@ -44,6 +44,7 @@
 
     "config.option.xtracr_realcamera_vanillaModelPart": "原版模型部位",
     "config.option.xtracr_realcamera_adjustOffset": "调整摄像头偏移",
+    "config.option.xtracr_realcamera_offsetModel": "偏移模型",
     "config.option.xtracr_realcamera_bindPitching": "绑定俯仰",
     "config.option.xtracr_realcamera_bindYawing": "绑定偏航",
     "config.option.xtracr_realcamera_bindRolling": "绑定翻滚",
@@ -60,7 +61,6 @@
     "config.option.xtracr_realcamera_useModModel": "模组模型兼容",
     "config.option.xtracr_realcamera_modelModID": "模型模组ID",
     "config.option.xtracr_realcamera_modModelPart": "模组模型部位",
-    "config.option.xtracr_realcamera_doABarrelRoll": "Do A Barrel Roll",
     "config.option.xtracr_realcamera_pehkui": "Pehkui",
     "config.option.xtracr_realcamera_physicsMod": "Physics Mod",
 
@@ -87,6 +87,7 @@
 
     "config.tooltip.xtracr_realcamera_vanillaModelPart": "摄像头绑定的模型部位",
     "config.tooltip.xtracr_realcamera_adjustOffset": "当前按下调整键时是调整摄像头的偏移还是旋转",
+    "config.tooltip.xtracr_realcamera_offsetModel": "使模型移动到摄像头上以保持摄像头位置不变，开启时与其它模组的兼容性可能会变好",
 
     "config.tooltip.xtracr_realcamera_classicAdjustMode": "决定当前按下调整键时调整哪一个",
 

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

@@ -8,6 +8,7 @@
   "client": [
     "MixinCamera",
     "MixinClientPlayerEntity",
+    "MixinEntityRenderDispatcher",
     "MixinEntityRenderer",
     "MixinGameRenderer",
     "MixinInGameHud",