DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to 26.1

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/replaymod/render/blend/Util.java
View File

@@ -185,6 +185,8 @@ public class Util {
}
}
//#if MC >= 26.1
//#else
public static String getTileEntityId(BlockEntity tileEntity) {
//#if MC>=12006
//$$ return net.minecraft.block.entity.BlockEntityType.getId(tileEntity.getType()).toString();
@@ -202,6 +204,7 @@ public class Util {
return nbt.getString("id");
//#endif
}
//#endif
public interface IOCallable<R> {
R call() throws IOException;

8
src/main/java/com/replaymod/render/gui/progress/VirtualWindow.java
View File

@@ -7,6 +7,10 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gl.Framebuffer;
import net.minecraft.client.util.Window;
//#if MC >= 26.1
//$$ import com.mojang.blaze3d.systems.RenderSystem;
//#endif
//#if MC>=11700
//$$ import net.minecraft.client.gl.WindowFramebuffer;
//#endif
@@ -88,7 +92,9 @@ public class VirtualWindow implements Closeable {
guiFramebuffer.draw(framebufferWidth, framebufferHeight);
//#endif
//#if MC>=12102
//#if MC >= 26.1
//$$ RenderSystem.flipFrame(null);
//#elseif MC>=12102
//$$ window.swapBuffers(null);
//#elseif MC>=11500
window.swapBuffers();

19
src/main/java/com/replaymod/render/hooks/EntityRendererHandler.java
View File

@@ -14,7 +14,7 @@ import de.johni0702.minecraft.gui.utils.EventRegistrations;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.Screen;
//#if MC>=12111
//#if MC>=12111 && MC < 26.1
//$$ import net.minecraft.client.render.CameraOverride;
//$$ import org.joml.Vector3f;
//#endif
@@ -93,7 +93,8 @@ public class EntityRendererHandler extends EventRegistrations implements WorldRe
GameRendererAccessor gameRenderer = (GameRendererAccessor) mc.gameRenderer;
Screen orgScreen = mc.currentScreen;
boolean orgPauseOnLostFocus = mc.options.pauseOnLostFocus;
//#if MC>=12106
//#if MC >= 26.1
//#elseif MC>=12106
//$$ boolean orgRenderHand = mc.gameRenderer.isRenderingPanorama();
//#else
boolean orgRenderHand = gameRenderer.getRenderHand();
@@ -103,7 +104,9 @@ public class EntityRendererHandler extends EventRegistrations implements WorldRe
mc.options.pauseOnLostFocus = false; // do not want the pause menu to open if the window is unfocused
if (omnidirectional) {
// makes no sense, we wouldn't even know where to put it
//#if MC>=12111
//#if MC >= 26.1
//$$ mc.gameRenderer.getMainCamera().enablePanoramicMode();
//#elseif MC>=12111
//$$ mc.gameRenderer.setCameraOverride(new CameraOverride(new Vector3f(mc.gameRenderer.getCamera().getHorizontalPlane())));
//#elseif MC>=12106
//$$ mc.gameRenderer.setRenderingPanorama(false);
@@ -112,7 +115,11 @@ public class EntityRendererHandler extends EventRegistrations implements WorldRe
//#endif
}
//#if MC>=12100
//#if MC >= 26.1
//$$ mc.gameRenderer.update(mc.getDeltaTracker(), true);
//$$ mc.gameRenderer.extract(mc.getDeltaTracker(), true);
//$$ mc.gameRenderer.render(mc.getDeltaTracker(), true);
//#elseif MC>=12100
//$$ mc.gameRenderer.render(mc.getRenderTickCounter(), true);
//#elseif MC>=11400
mc.gameRenderer.render(partialTicks, finishTimeNano, true);
@@ -127,7 +134,9 @@ public class EntityRendererHandler extends EventRegistrations implements WorldRe
} finally {
mc.currentScreen = orgScreen;
mc.options.pauseOnLostFocus = orgPauseOnLostFocus;
//#if MC>=12111
//#if MC >= 26.1
//$$ mc.gameRenderer.getMainCamera().disablePanoramicMode();
//#elseif MC>=12111
//$$ mc.gameRenderer.setCameraOverride(null);
//#elseif MC>=12106
//$$ mc.gameRenderer.setRenderingPanorama(orgRenderHand);

8
src/main/java/com/replaymod/render/mixin/GameRendererAccessor.java
View File

@@ -6,7 +6,6 @@ import org.spongepowered.asm.mixin.gen.Accessor;
//#if MC>=12106
//$$ import net.minecraft.client.gui.render.GuiRenderer;
//$$ import net.minecraft.client.gui.render.state.GuiRenderState;
//$$ import net.minecraft.client.render.fog.FogRenderer;
//$$ import net.minecraft.client.util.Pool;
//#endif
@@ -25,8 +24,13 @@ public interface GameRendererAccessor {
//$$ Pool getPool();
//$$ @Accessor
//$$ GuiRenderer getGuiRenderer();
//#if MC >= 26.1
//$$ @Accessor
//$$ GuiRenderState getGuiState();
//$$ net.minecraft.client.renderer.state.GameRenderState getGameRenderState();
//#else
//$$ @Accessor
//$$ net.minecraft.client.gui.render.state.GuiRenderState getGuiState();
//#endif
//$$ @Accessor
//$$ FogRenderer getFogRenderer();
//#endif

4
src/main/java/com/replaymod/render/mixin/Mixin_HideNameTags.java
View File

@@ -10,7 +10,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(EntityRenderer.class)
public abstract class Mixin_HideNameTags {
//#if MC>=11500
//#if MC >= 26.1
//$$ @Inject(method = "submitNameDisplay(Lnet/minecraft/client/renderer/entity/state/EntityRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/state/level/CameraRenderState;I)V", at = @At("HEAD"), cancellable = true)
//#elseif MC>=11500
@Inject(method = "renderLabelIfPresent", at = @At("HEAD"), cancellable = true)
//#else
//#if MC>=11400

27
src/main/java/com/replaymod/render/rendering/VideoRenderer.java
View File

@@ -40,6 +40,10 @@ import net.minecraft.util.crash.CrashException;
import net.minecraft.sound.SoundCategory;
import org.lwjgl.glfw.GLFW;
//#if MC >= 26.1
//$$ import net.minecraft.client.renderer.state.WindowRenderState;
//#endif
//#if MC>=12109
//$$ import net.minecraft.client.gui.screen.Overlay;
//#endif
@@ -289,11 +293,15 @@ public class VideoRenderer implements RenderInfo {
//#if MC>=11600
int elapsedTicks =
//#endif
//#if MC >= 26.1
//$$ timer.advanceGameTime(
//#else
timer.beginRenderTick(
//#endif
//#if MC>=11400
MCVer.milliTime()
//#endif
//#if MC>=12100
//#if MC>=12100 && MC < 26.1
//$$ , true
//#endif
);
@@ -525,6 +533,9 @@ public class VideoRenderer implements RenderInfo {
if (GLFW.glfwWindowShouldClose(window.getHandle()) || ((MinecraftAccessor) mc).getCrashReporter() != null) {
return false;
}
//#if MC >= 26.1
//$$ RenderSystem.pollEvents();
//#endif
pushMatrix();
//#if MC>=12105
@@ -630,7 +641,11 @@ public class VideoRenderer implements RenderInfo {
//#if MC>=12106
//$$ GameRendererAccessor gameRenderer = (GameRendererAccessor) mc.gameRenderer;
//#if MC >= 26.1
//$$ GuiRenderState guiRenderState = gameRenderer.getGameRenderState().guiRenderState;
//#else
//$$ GuiRenderState guiRenderState = gameRenderer.getGuiState();
//#endif
//$$ guiRenderState.clear();
//#if MC>=12111
//$$ DrawContext drawContext = new DrawContext(mc, guiRenderState, mouseX, mouseY);
@@ -641,6 +656,16 @@ public class VideoRenderer implements RenderInfo {
//$$ DrawContext drawContext = new DrawContext(mc, mc.getBufferBuilders().getEntityVertexConsumers());
//#endif
//#if MC >= 26.1
//$$ WindowRenderState windowRenderState = gameRenderer.getGameRenderState().windowRenderState;
//$$ windowRenderState.width = window.getWidth();
//$$ windowRenderState.height = window.getHeight();
//$$ windowRenderState.guiScale = window.getGuiScale();
//$$ windowRenderState.appropriateLineWidth = window.getAppropriateLineWidth();
//$$ windowRenderState.isMinimized = window.isMinimized();
//$$ windowRenderState.isResized = false;
//#endif
if (mc.getOverlay() != null) {
Screen orgScreen = mc.currentScreen;
try {