Update to 26.1

This commit is contained in:
Jonas Herzig
2026-03-29 11:20:59 +02:00
parent b72fad4055
commit 27d5432fff
40 changed files with 667 additions and 58 deletions

View File

@@ -8,13 +8,9 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.Camera;
import net.minecraft.client.render.ChunkRenderingDataPreparer;
import net.minecraft.client.render.Frustum;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.render.LightmapTextureManager;
import net.minecraft.client.render.WorldRenderer;
import net.minecraft.client.render.chunk.ChunkBuilder;
import net.minecraft.client.render.chunk.ChunkRendererRegionBuilder;
import net.minecraft.client.util.math.MatrixStack;
import org.joml.Matrix4f;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@@ -27,6 +23,11 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
//#if MC >= 26.1
//$$ import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
//$$ import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
//#endif
@Mixin(WorldRenderer.class)
public abstract class Mixin_ForceChunkLoading implements IForceChunkLoading {
private ForceChunkLoadingHook replayModRender_hook;
@@ -46,7 +47,8 @@ public abstract class Mixin_ForceChunkLoading implements IForceChunkLoading {
@Shadow @Final private ChunkRenderingDataPreparer field_45615;
//#if MC>=12109
//#if MC >= 26.1
//#elseif MC>=12109
//$$ @Shadow protected abstract void method_74752(Camera par1, Frustum par2, boolean par3);
//#else
@Shadow protected abstract void setupTerrain(Camera par1, Frustum par2, boolean par3, boolean par4);
@@ -60,6 +62,10 @@ public abstract class Mixin_ForceChunkLoading implements IForceChunkLoading {
@Shadow protected abstract void applyFrustum(Frustum par1);
//#if MC >= 26.1
//$$ @WrapMethod(method = "update")
//$$ private void forceAllChunks(Camera camera, Operation<Void> original) {
//#else
@Inject(method = "render", at = @At(value = "INVOKE", target = SETUP_TERRAIN))
private void forceAllChunks(
CallbackInfo ci,
@@ -68,10 +74,11 @@ public abstract class Mixin_ForceChunkLoading implements IForceChunkLoading {
//#endif
@Local(argsOnly = true) Camera camera
) {
if (replayModRender_hook == null) {
return;
}
if (FlawlessFrames.hasSodium()) {
//#endif
if (replayModRender_hook == null || FlawlessFrames.hasSodium()) {
//#if MC >= 26.1
//$$ original.call(camera);
//#endif
return;
}
@@ -85,7 +92,9 @@ public abstract class Mixin_ForceChunkLoading implements IForceChunkLoading {
boolean areWeDoneYet = true;
// Determine which chunks shall be visible
//#if MC>=12109
//#if MC >= 26.1
//$$ original.call(camera);
//#elseif MC>=12109
//$$ method_74752(camera, frustum, this.client.player.isSpectator());
//#else
setupTerrain(camera, this.frustum, this.capturedFrustum != null, this.client.player.isSpectator());
@@ -106,11 +115,13 @@ public abstract class Mixin_ForceChunkLoading implements IForceChunkLoading {
}
}
//#if MC < 26.1
// If that async processing did change the chunk graph, we need to re-apply the frustum (otherwise this is
// only done in the next setupTerrain call, which not happen this frame)
if (renderingData.method_52836()) {
this.applyFrustum((new Frustum(frustum)).coverBoxAroundSetPosition(8)); // call based on the one in setupTerrain
}
//#endif
// Schedule all chunks which need rebuilding (we schedule even important rebuilds because we wait for
// all of them anyway and this way we can take advantage of threading)

View File

@@ -31,8 +31,23 @@ public abstract class MixinRenderManager {
copy.blockPos = org.blockPos;
copy.pos = org.pos;
copy.initialized = org.initialized;
//#if MC < 26.1
copy.entityPos = org.entityPos;
//#endif
copy.orientation.lookAlong((float) dx, (float) dy, (float) dz, 0f, 1f, 0f);
//#if MC >= 26.1
//$$ copy.xRot = org.xRot;
//$$ copy.yRot = org.yRot;
//$$ copy.isPanoramicMode = org.isPanoramicMode;
//$$ copy.cullFrustum.set(org.cullFrustum);
//$$ copy.fogType = org.fogType;
//$$ copy.fogData = org.fogData;
//$$ copy.hudFov = org.hudFov;
//$$ copy.depthFar = org.depthFar;
//$$ copy.projectionMatrix.set(org.projectionMatrix);
//$$ copy.viewRotationMatrix.set(org.viewRotationMatrix);
//$$ copy.entityRenderState = org.entityRenderState;
//#endif
cameraRenderStateRef.set(copy);
}
}

View File

@@ -5,11 +5,14 @@ import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.llamalad7.mixinextras.sugar.Local;
import com.mojang.blaze3d.textures.GpuTexture;
import net.minecraft.client.gl.FramebufferManager;
import net.minecraft.client.gl.GlResourceManager;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
@Mixin(GlResourceManager.class)
//#if MC >= 26.1
//$$ @Mixin(targets = "com.mojang.blaze3d.opengl.GlCommandEncoder")
//#else
@Mixin(net.minecraft.client.gl.GlResourceManager.class)
//#endif
public class Mixin_FixCopyTextureToBuffer_DepthTexture {
@WrapOperation(
//#if MC>=12111

0
versions/26.1/.gitkeep Normal file
View File

View File

@@ -0,0 +1,14 @@
package com.replaymod.core.mixin;
import net.minecraft.CrashReport;
import net.minecraft.util.thread.BlockableEventLoop;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.function.Supplier;
@Mixin(BlockableEventLoop.class)
public interface BlockableEventLoopAccessor {
@Accessor
Supplier<CrashReport> getDelayedCrash();
}

View File

@@ -0,0 +1,121 @@
package com.replaymod.render.mixin;
import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.replaymod.render.hooks.ForceChunkLoadingHook;
import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
import net.minecraft.client.renderer.chunk.SectionRenderDispatcher;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
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.callback.CallbackInfo;
import java.util.Map;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
@Mixin(SectionRenderDispatcher.class)
public abstract class Mixin_BlockOnChunkRebuilds implements ForceChunkLoadingHook.IBlockOnChunkRebuilds {
@Unique
private final ReentrantLock newMainThreadWorkLock = new ReentrantLock();
@Unique
private final Condition newMainThreadWork = newMainThreadWorkLock.newCondition();
@Unique
private long scheduledTasks = 0;
@Unique
private long doneTasks = 0;
@Inject(method = "schedule", at = @At(value = "INVOKE", target = "Lnet/minecraft/TracingExecutor;execute(Ljava/lang/Runnable;)V"))
private void incrementScheduledTasks(CallbackInfo ci) {
newMainThreadWorkLock.lock();
try {
scheduledTasks++;
} finally {
newMainThreadWorkLock.unlock();
}
}
@WrapMethod(method = "runTask")
private void incrementDoneTasks(Operation<Void> original) {
try {
original.call();
} finally {
newMainThreadWorkLock.lock();
try {
doneTasks++;
newMainThreadWork.signalAll();
} finally {
newMainThreadWorkLock.unlock();
}
}
}
@Unique
private long prevTotalDoneTasks;
@Override
public boolean uploadEverythingBlocking() {
while (true) {
long doneTasksAtStartOfLoop;
boolean allTasksDone;
newMainThreadWorkLock.lock();
try {
doneTasksAtStartOfLoop = doneTasks;
allTasksDone = scheduledTasks == doneTasks;
} finally {
newMainThreadWorkLock.unlock();
}
// Upload any buffers that may still be pending
uploadAllStagedAllocations();
// If there were no tasks still running, everything should be uploaded now.
if (allTasksDone) {
break;
}
// Otherwise we need to wait for more work to come in
newMainThreadWorkLock.lock();
try {
while (doneTasksAtStartOfLoop == doneTasks) {
newMainThreadWork.awaitUninterruptibly();
}
} finally {
newMainThreadWorkLock.unlock();
}
}
boolean doneAnything = doneTasks != prevTotalDoneTasks;
prevTotalDoneTasks = doneTasks;
return doneAnything;
}
@Unique
private void uploadAllStagedAllocations() {
copyLock.lock();
try {
// MC will only allow one buffer resize per frame (presumably to avoid lag spikes), so we'll simply call
// the method as often as there are buffers (there's only a fixed amount of 3, one per ChunkSectionLayer)
for (int i = 0; i < chunkUberBuffers.size(); i++) {
uploadGlobalGeomBuffersToGPU();
}
} finally {
copyLock.unlock();
}
}
@Shadow
@Final
private ReentrantLock copyLock;
@Shadow
public abstract void uploadGlobalGeomBuffersToGPU();
@Shadow
@Final
private Map<ChunkSectionLayer, ?> chunkUberBuffers;
}

View File

@@ -0,0 +1,14 @@
package com.replaymod.render.mixin;
import com.replaymod.core.versions.MCVer;
import com.replaymod.render.hooks.EntityRendererHandler;
import net.minecraft.client.renderer.entity.player.AvatarRenderer;
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(AvatarRenderer.class)
public abstract class Mixin_HideNameTags_PlayerEntity {
// 1.21.11 and below
}

View File

@@ -0,0 +1,10 @@
package com.replaymod.render.mixin;
import net.minecraft.client.renderer.GameRenderer;
import org.spongepowered.asm.mixin.Mixin;
@Mixin(GameRenderer.class)
public abstract class Mixin_Omnidirectional_Camera {
// Now handled by Camera.enablePanoramicMode
// 1.21.11 and below
}

View File

@@ -0,0 +1,99 @@
package com.replaymod.render.mixin;
import com.replaymod.render.capturer.CubicOpenGlFrameCapturer;
import com.replaymod.render.hooks.EntityRendererHandler;
import net.minecraft.client.Camera;
import org.joml.Quaternionf;
import org.joml.Vector3f;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
//#if MC>=12005
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import org.joml.Matrix4f;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
//#endif
//#if MC>=11500
//#else
//$$ import org.lwjgl.opengl.GL11;
//#endif
import static com.replaymod.core.versions.MCVer.getMinecraft;
import static org.joml.Math.PI_OVER_2_f;
import static org.joml.Math.PI_f;
@Mixin(Camera.class)
public abstract class Mixin_Omnidirectional_Rotation {
@Shadow
@Final
private static Vector3f FORWARDS;
@Shadow
@Final
private static Vector3f UP;
@Shadow
@Final
private static Vector3f LEFT;
@Shadow
@Final
private Quaternionf rotation;
@Shadow
@Final
private Vector3f forwards;
@Shadow
@Final
private Vector3f up;
@Shadow
@Final
private Vector3f left;
@Shadow
private int matrixPropertiesDirty;
@Inject(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;alignWithEntity(F)V", shift = At.Shift.AFTER))
private void replayModRender_setupCubicFrameRotation(CallbackInfo ci) {
if (getHandler() == null || !(getHandler().data instanceof CubicOpenGlFrameCapturer.Data)) return;
CubicOpenGlFrameCapturer.Data data = (CubicOpenGlFrameCapturer.Data) getHandler().data;
switch (data) {
case FRONT:
break;
case RIGHT:
this.rotation.rotateY(-PI_OVER_2_f);
break;
case BACK:
this.rotation.rotateY(PI_f);
break;
case LEFT:
this.rotation.rotateY(PI_OVER_2_f);
break;
case TOP:
this.rotation.rotateX(PI_OVER_2_f);
break;
case BOTTOM:
this.rotation.rotateX(-PI_OVER_2_f);
break;
}
// From setRotation
FORWARDS.rotate(this.rotation, this.forwards);
UP.rotate(this.rotation, this.up);
LEFT.rotate(this.rotation, this.left);
this.matrixPropertiesDirty |= 3;
}
@Unique
private EntityRendererHandler getHandler() {
return ((EntityRendererHandler.IEntityRenderer) getMinecraft().gameRenderer).replayModRender_getHandler();
}
}

View File

@@ -0,0 +1,50 @@
package com.replaymod.render.mixin;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.replaymod.render.RenderSettings;
import com.replaymod.render.hooks.EntityRendererHandler;
import com.replaymod.replay.camera.CameraEntity;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.level.Level;
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.callback.CallbackInfo;
import static com.replaymod.core.versions.MCVer.*;
//#if MC>=11400
import net.minecraft.client.Camera;
//#else
//$$ import net.minecraft.client.renderer.EntityRenderer;
//#endif
@Mixin(value = Camera.class)
public abstract class Mixin_StabilizeCamera {
@WrapOperation(method = "alignWithEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;setRotation(FF)V"))
private void replayModRender_stabilizeCamera(Camera instance, float yRot, float xRot, Operation<Void> original) {
if (getHandler() != null) {
RenderSettings settings = getHandler().getSettings();
if (settings.isStabilizeYaw()) {
yRot = 0f;
}
if (settings.isStabilizePitch()) {
xRot = 0f;
}
// Roll handled in MixinCamera
}
original.call(instance, yRot, xRot);
}
@Unique
private EntityRendererHandler getHandler() {
return ((EntityRendererHandler.IEntityRenderer) getMinecraft().gameRenderer).replayModRender_getHandler();
}
}

View File

@@ -0,0 +1,32 @@
package com.replaymod.render.mixin;
import com.replaymod.render.capturer.StereoscopicOpenGlFrameCapturer;
import com.replaymod.render.hooks.EntityRendererHandler;
import net.minecraft.client.Camera;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
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.callback.CallbackInfo;
import static com.replaymod.core.versions.MCVer.getMinecraft;
@Mixin(Camera.class)
public abstract class Mixin_Stereoscopic_Camera {
@Shadow
protected abstract void move(float forwards, float up, float right);
@Inject(method = "alignWithEntity", at = @At("RETURN"))
private void replayModRender_setupStereoscopicProjection(CallbackInfo ci) {
if (getHandler() == null || !(getHandler().data instanceof StereoscopicOpenGlFrameCapturer.Data)) return;
StereoscopicOpenGlFrameCapturer.Data data = (StereoscopicOpenGlFrameCapturer.Data) getHandler().data;
move(0f, 0f, 0.1f * (data == StereoscopicOpenGlFrameCapturer.Data.LEFT_EYE ? -1 : 1));
}
@Unique
private EntityRendererHandler getHandler() {
return ((EntityRendererHandler.IEntityRenderer) getMinecraft().gameRenderer).replayModRender_getHandler();
}
}

View File

@@ -0,0 +1,30 @@
package com.replaymod.replay.mixin;
import com.replaymod.render.hooks.EntityRendererHandler;
import com.replaymod.replay.camera.CameraEntity;
import net.minecraft.client.Camera;
import net.minecraft.world.entity.Entity;
import org.jspecify.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import static com.replaymod.core.versions.MCVer.getMinecraft;
@Mixin(Camera.class)
public class MixinCamera {
@Shadow
private @Nullable Entity entity;
@ModifyArg(method = "setRotation", at = @At(value = "INVOKE", target = "Lorg/joml/Quaternionf;rotationYXZ(FFF)Lorg/joml/Quaternionf;"), index = 2)
private float applyRoll(float rotZ) {
Entity entity = this.entity;
if (!(entity instanceof CameraEntity)) return rotZ;
EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) getMinecraft().gameRenderer).replayModRender_getHandler();
if (handler != null && handler.getSettings().isStabilizeRoll()) return rotZ;
return rotZ - ((CameraEntity) entity).roll * (float) Math.PI / 180f;
}
}

View File

@@ -0,0 +1,57 @@
{
"schemaVersion": 1,
"id": "replaymod",
"version": "${version}",
"name": "Replay Mod",
"description": "A Mod which allows you to record, replay and share your Minecraft experience.",
"authors": [
"CrushedPixel",
"johni0702"
],
"contact": {
"homepage": "https://replaymod.com/",
"sources": "https://github.com/ReplayMod/ReplayMod"
},
"license": "GPL-3.0-or-later",
"icon": "assets/replaymod/favicon_logo.png",
"environment": "client",
"entrypoints": {
"client": [
"com.replaymod.core.ReplayModBackend"
],
"modmenu": [
"com.replaymod.core.gui.ModMenuApiImpl"
],
"frex_flawless_frames": [
"com.replaymod.render.utils.FlawlessFrames::registerConsumer"
],
"preLaunch": [
"com.replaymod.core.DummyChainLoadEntryPoint",
"com.replaymod.core.MixinExtrasInit"
],
"mm:early_risers": [
"com.replaymod.core.ReplayModMMLauncher"
]
},
"mixins": [
"mixins.jgui.json",
"mixins.nonmmlauncher.replaymod.json"
],
"depends": {
"fabricloader": ">=0.18.5",
"fabric-networking-api-v1": "*",
"fabric-key-mapping-api-v1": "*",
"fabric-resource-loader-v0": "*"
},
"custom": {
"mm:early_risers": [
"com.replaymod.core.ReplayModMMLauncher"
],
"modmenu:clientsideOnly": true
}
}

View File

@@ -0,0 +1,32 @@
net.minecraft.client.Minecraft delayCrash() setCrashReportSupplier()
net.minecraft.client.gui.components.ChatComponent addClientSystemMessage() addMessage()
net.minecraft.client.renderer.state.gui.GuiRenderState reset() clear()
net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState net.minecraft.client.gui.render.state.special.SpecialGuiElementRenderState
net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState x0() x1()
net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState x1() x2()
net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState y0() y1()
net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState y1() y2()
net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState scissorArea() comp_4128()
net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState scale() comp_4133()
net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState getBounds() createBounds()
net.minecraft.client.renderer.state.level.QuadParticleRenderState net.minecraft.client.particle.BillboardParticleSubmittable
com.mojang.blaze3d.platform.WindowEventHandler resizeGui() onResolutionChanged()
net.minecraft.client.renderer.LevelRenderer lambda$addSkyPass$0() method_62215()
net.minecraft.client.renderer.state.gui.GuiRenderState net.minecraft.client.gui.render.state.GuiRenderState
net.minecraft.client.renderer.state.level.CameraRenderState net.minecraft.client.render.state.CameraRenderState
net.minecraft.client.gui.Gui extractRenderState() render()
net.minecraft.client.gui.Gui extractItemHotbar() renderHotbar()
net.minecraft.client.gui.GuiGraphicsExtractor net.minecraft.client.gui.DrawContext
net.minecraft.client.gui.GuiGraphicsExtractor guiRenderState state
net.minecraft.client.gui.components.AbstractButton extractContents() drawIcon()
net.minecraft.client.gui.components.Renderable extractRenderState() render()
net.minecraft.client.gui.screens.Screen extractRenderStateWithTooltipAndSubtitles() renderWithTooltip()
net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry
net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry clientboundPlay()Lnet/fabricmc/fabric/api/networking/v1/PayloadTypeRegistry; playS2C()
net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry clientboundConfiguration()Lnet/fabricmc/fabric/api/networking/v1/PayloadTypeRegistry; configurationS2C()
net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper
net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper registerKeyMapping() registerKeyBinding(Lnet/minecraft/client/option/KeyBinding;)Lnet/minecraft/client/option/KeyBinding;
net.fabricmc.fabric.api.client.screen.v1.Screens net.fabricmc.fabric.api.client.screen.v1.Screens
net.fabricmc.fabric.api.client.screen.v1.Screens getWidgets() getButtons(Lnet/minecraft/client/gui/screen/Screen;)Ljava/util/List;