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

Update to 1.21.7

Browse Source
This commit is contained in:
Jonas Herzig
2025-06-14 11:00:56 +02:00
parent 926f6b6624
commit 85fb0847ee
30 changed files with 462 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/main/java/com/replaymod/simplepathing/gui/GuiKeyframeTimeline.java
View File

@@ -37,6 +37,22 @@ import static de.johni0702.minecraft.gui.versions.MCVer.popScissorState;
import static de.johni0702.minecraft.gui.versions.MCVer.pushScissorState;
import static de.johni0702.minecraft.gui.versions.MCVer.setScissorDisabled;
//#if MC>=12106
//$$ import com.replaymod.replay.mixin.DrawContextAccessor;
//$$ import com.replaymod.render.mixin.GameRendererAccessor;
//$$ import net.minecraft.client.MinecraftClient;
//$$ import net.minecraft.client.gui.ScreenRect;
//$$ import net.minecraft.client.gui.render.SpecialGuiElementRenderer;
//$$ import net.minecraft.client.gui.render.state.special.SpecialGuiElementRenderState;
//$$ import net.minecraft.client.util.ClosableFactory;
//$$ import net.minecraft.client.util.Pool;
//$$ import net.minecraft.client.render.RenderLayer;
//$$ import net.minecraft.client.render.VertexConsumerProvider;
//$$ import org.jetbrains.annotations.Nullable;
//$$ import java.util.ArrayList;
//$$ import java.util.List;
//#endif
//#if MC>=12105
//$$ import net.minecraft.client.render.RenderLayer;
//$$ import net.minecraft.client.render.VertexConsumer;
@@ -116,6 +132,10 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
renderer.bindTexture(ReplayMod.TEXTURE);
//#if MC>=12106
//$$ TimeTimelineLinesRenderState linesRenderState = new TimeTimelineLinesRenderState();
//#endif
SPTimeline timeline = mod.getCurrentTimeline();
timeline.getTimeline().getPaths().stream().flatMap(path -> path.getKeyframes().stream()).forEach(keyframe -> {
@@ -188,6 +208,12 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
// And finally another vertical bit (the timeline is already crammed enough, so only the border)
Vector2f p4 = new Vector2f(keyframeTimelineLeft + positionXKeyframeTimeline, keyframeTimelineTop + BORDER_TOP);
//#if MC>=12106
//$$ linesRenderState.color = color;
//$$ linesRenderState.line(p1, p2);
//$$ linesRenderState.line(p2, p3);
//$$ linesRenderState.line(p3, p4);
//#else
MatrixStack matrixStack = renderer.getMatrixStack();
emitLine(matrixStack, buffer, p1, p2, color);
emitLine(matrixStack, buffer, p2, p3, color);
@@ -222,10 +248,31 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
//#endif
popScissorState();
//#endif
}
}
});
//#if MC>=12106
//$$ if (!linesRenderState.lines.isEmpty()) {
//$$ MinecraftClient mc = getMinecraft();
//$$ int scale = mc.getWindow().getScaleFactor();
//$$ // MC's special rendering code has multiple issues, we'll use a size matching the screen to avoid some
//$$ linesRenderState.x1 = 0;
//$$ linesRenderState.y1 = 0;
//$$ linesRenderState.x2 = mc.getWindow().getFramebufferWidth() / scale;
//$$ linesRenderState.y2 = mc.getWindow().getFramebufferHeight() / scale;
//$$
//$$ Pool pool = ((GameRendererAccessor) mc.gameRenderer).getPool();
//$$ TimeTimelineLinesRenderer linesRenderer = pool.acquire(TimeTimelineLinesRenderer.FACTORY);
//$$ pushScissorState();
//$$ setScissorDisabled();
//$$ linesRenderer.render(linesRenderState, ((DrawContextAccessor) renderer.getContext()).getState(), scale);
//$$ popScissorState();
//$$ pool.release(TimeTimelineLinesRenderer.FACTORY, linesRenderer); // Note: Assumes we only render one per frame
//$$ }
//#endif
// Draw colored quads on spectator path segments
for (PathSegment segment : timeline.getPositionPath().getSegments()) {
if (segment.getInterpolator() == null
@@ -248,6 +295,65 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
super.drawTimelineCursor(renderer, size);
}
//#if MC>=12106
//$$ private static class TimeTimelineLinesRenderState implements SpecialGuiElementRenderState {
//$$ int x1, x2, y1, y2;
//$$ ScreenRect scissorState;
//$$
//$$ List<Pair<Vector2f, Vector2f>> lines = new ArrayList<>();
//$$ int color;
//$$
//$$ public void line(Vector2f p1, Vector2f p2) {
//$$ lines.add(Pair.of(p1, p2));
//$$ }
//$$
//$$ @Override public int x1() {return x1;}
//$$ @Override public int x2() {return x2;}
//$$ @Override public int y1() {return y1;}
//$$ @Override public int y2() {return y2;}
//$$ @Override public float comp_4133() {return 1; /* scale */}
//$$ @Override public @Nullable ScreenRect comp_4128() {return scissorState;}
//$$ @Override public @Nullable ScreenRect comp_4274() {return SpecialGuiElementRenderState.createBounds(x1, y1, x2, y2, scissorState);}
//$$ }
//$$
//$$ private static class TimeTimelineLinesRenderer extends SpecialGuiElementRenderer<TimeTimelineLinesRenderState> {
//$$ private static ClosableFactory<TimeTimelineLinesRenderer> FACTORY = new ClosableFactory<>() {
//$$ @Override
//$$ public TimeTimelineLinesRenderer create() {
//$$ return new TimeTimelineLinesRenderer(MinecraftClient.getInstance().getBufferBuilders().getEntityVertexConsumers());
//$$ }
//$$
//$$ @Override
//$$ public void close(TimeTimelineLinesRenderer object) {
//$$ object.close();
//$$ }
//$$ };
//$$
//$$ protected TimeTimelineLinesRenderer(VertexConsumerProvider.Immediate immediate) {
//$$ super(immediate);
//$$ }
//$$
//$$ @Override
//$$ public Class<TimeTimelineLinesRenderState> getElementClass() {
//$$ return TimeTimelineLinesRenderState.class;
//$$ }
//$$
//$$ @Override
//$$ protected void render(TimeTimelineLinesRenderState state, MatrixStack matrixStack) {
//$$ matrixStack.translate(-state.x2 / 2f, -state.y2, 100);
//$$ RenderSystem.lineWidth(2);
//$$ for (Pair<Vector2f, Vector2f> line : state.lines) {
//$$ emitLine(matrixStack, vertexConsumers.getBuffer(RenderLayer.LINES), line.getLeft(), line.getRight(), state.color);
//$$ }
//$$ }
//$$
//$$ @Override
//$$ protected String getName() {
//$$ return "time_timeline_lines";
//$$ }
//$$ }
//#endif
private void drawQuadOnSegment(GuiRenderer renderer, int visibleWidth, PathSegment segment, int y, int color) {
int startTime = getOffset();
int visibleTime = (int) (getZoom() * getLength());

89
src/main/java/com/replaymod/simplepathing/preview/PathPreviewRenderer.java
View File

@@ -34,6 +34,8 @@ import org.lwjgl.opengl.GL11;
//$$ import net.minecraft.client.render.RenderLayer;
//$$ import net.minecraft.client.render.VertexConsumer;
//$$ import net.minecraft.client.render.VertexConsumerProvider;
//#else
import static com.replaymod.core.versions.MCVer.bindTexture;
//#endif
//#if MC>=12102
@@ -54,7 +56,6 @@ import java.util.Comparator;
import java.util.Optional;
import static com.replaymod.core.ReplayMod.TEXTURE;
import static com.replaymod.core.versions.MCVer.bindTexture;
import static com.replaymod.core.versions.MCVer.emitLine;
import static com.replaymod.core.versions.MCVer.popMatrix;
import static com.replaymod.core.versions.MCVer.pushMatrix;
@@ -310,7 +311,9 @@ public class PathPreviewRenderer extends EventRegistrations {
private void drawPoint(Vector3f view, Vector3f pos, Keyframe keyframe) {
//#if MC<12105
bindTexture(TEXTURE);
//#endif
float posX = 80f / ReplayMod.TEXTURE_SIZE;
float posY = 0f;
@@ -332,7 +335,11 @@ public class PathPreviewRenderer extends EventRegistrations {
//#if MC>=12105
//$$ VertexConsumerProvider.Immediate immediate = mc.getBufferBuilders().getEntityVertexConsumers();
//$$ immediate.draw();
//#if MC>=12106
//$$ VertexConsumer buffer = immediate.getBuffer(RenderLayer.getTextSeeThrough(TEXTURE));
//#else
//$$ VertexConsumer buffer = immediate.getBuffer(RenderLayer.getGuiTexturedOverlay(TEXTURE));
//#endif
//#else
Tessellator tessellator = Tessellator.getInstance();
//#if MC>=12100
@@ -343,10 +350,10 @@ public class PathPreviewRenderer extends EventRegistrations {
//#endif
//#endif
buffer.vertex(minX, minY, 0).texture(posX + size, posY + size).color(255, 255, 255, 255).next();
buffer.vertex(minX, maxY, 0).texture(posX + size, posY).color(255, 255, 255, 255).next();
buffer.vertex(maxX, maxY, 0).texture(posX, posY).color(255, 255, 255, 255).next();
buffer.vertex(maxX, minY, 0).texture(posX, posY + size).color(255, 255, 255, 255).next();
vertex(buffer, minX, minY, 0, posX + size, posY + size, 255);
vertex(buffer, minX, maxY, 0, posX + size, posY, 255);
vertex(buffer, maxX, maxY, 0, posX, posY, 255);
vertex(buffer, maxX, minY, 0, posX, posY + size, 255);
pushMatrix();
@@ -378,7 +385,9 @@ public class PathPreviewRenderer extends EventRegistrations {
private void drawCamera(Vector3f view, Vector3f pos, Vector3f rot) {
//#if MC<12105
bindTexture(CAMERA_HEAD);
//#endif
pushMatrix();
@@ -434,13 +443,11 @@ public class PathPreviewRenderer extends EventRegistrations {
float cubeSize = 0.5f;
//#if MC>=12100
//$$ float r = -cubeSize/2;
//#else
double r = -cubeSize/2;
//#endif
float r = -cubeSize/2;
//#if MC>=12105
//#if MC>=12106
//$$ buffer = immediate.getBuffer(RenderLayer.getText(CAMERA_HEAD));
//#elseif MC>=12105
//$$ buffer = immediate.getBuffer(RenderLayer.getGuiTextured(CAMERA_HEAD));
//#elseif MC>=12100
//$$ buffer = tessellator.begin(net.minecraft.client.render.VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE_COLOR);
@@ -449,40 +456,40 @@ public class PathPreviewRenderer extends EventRegistrations {
//#endif
//back
buffer.vertex(r, r + cubeSize, r).texture(3 * 8 / 64f, 8 / 64f).color(255, 255, 255, 200).next();
buffer.vertex(r + cubeSize, r + cubeSize, r).texture(4*8/64f, 8/64f).color(255, 255, 255, 200).next();
buffer.vertex(r + cubeSize, r, r).texture(4*8/64f, 2*8/64f).color(255, 255, 255, 200).next();
buffer.vertex(r, r, r).texture(3*8/64f, 2*8/64f).color(255, 255, 255, 200).next();
vertex(buffer, r, r + cubeSize, r, 3 * 8 / 64f, 8 / 64f, 200);
vertex(buffer, r + cubeSize, r + cubeSize, r, 4*8/64f, 8/64f, 200);
vertex(buffer, r + cubeSize, r, r, 4*8/64f, 2*8/64f, 200);
vertex(buffer, r, r, r, 3*8/64f, 2*8/64f, 200);
//front
buffer.vertex(r + cubeSize, r, r + cubeSize).texture(2 * 8 / 64f, 2*8/64f).color(255, 255, 255, 200).next();
buffer.vertex(r + cubeSize, r + cubeSize, r + cubeSize).texture(2 * 8 / 64f, 8/64f).color(255, 255, 255, 200).next();
buffer.vertex(r, r + cubeSize, r + cubeSize).texture(8 / 64f, 8 / 64f).color(255, 255, 255, 200).next();
buffer.vertex(r, r, r + cubeSize).texture(8 / 64f, 2*8/64f).color(255, 255, 255, 200).next();
vertex(buffer, r + cubeSize, r, r + cubeSize, 2 * 8 / 64f, 2*8/64f, 200);
vertex(buffer, r + cubeSize, r + cubeSize, r + cubeSize, 2 * 8 / 64f, 8/64f, 200);
vertex(buffer, r, r + cubeSize, r + cubeSize, 8 / 64f, 8 / 64f, 200);
vertex(buffer, r, r, r + cubeSize, 8 / 64f, 2*8/64f, 200);
//left
buffer.vertex(r + cubeSize, r + cubeSize, r).texture(0, 8/64f).color(255, 255, 255, 200).next();
buffer.vertex(r + cubeSize, r + cubeSize, r + cubeSize).texture(8/64f, 8/64f).color(255, 255, 255, 200).next();
buffer.vertex(r + cubeSize, r, r + cubeSize).texture(8/64f, 2*8/64f).color(255, 255, 255, 200).next();
buffer.vertex(r+cubeSize, r, r).texture(0, 2*8/64f).color(255, 255, 255, 200).next();
vertex(buffer, r + cubeSize, r + cubeSize, r, 0, 8/64f, 200);
vertex(buffer, r + cubeSize, r + cubeSize, r + cubeSize, 8/64f, 8/64f, 200);
vertex(buffer, r + cubeSize, r, r + cubeSize, 8/64f, 2*8/64f, 200);
vertex(buffer, r+cubeSize, r, r, 0, 2*8/64f, 200);
//right
buffer.vertex(r, r + cubeSize, r + cubeSize).texture(2*8/64f, 8/64f).color(255, 255, 255, 200).next();
buffer.vertex(r, r + cubeSize, r).texture(3*8/64f, 8/64f).color(255, 255, 255, 200).next();
buffer.vertex(r, r, r).texture(3*8/64f, 2*8/64f).color(255, 255, 255, 200).next();
buffer.vertex(r, r, r + cubeSize).texture(2 * 8 / 64f, 2 * 8 / 64f).color(255, 255, 255, 200).next();
vertex(buffer, r, r + cubeSize, r + cubeSize, 2*8/64f, 8/64f, 200);
vertex(buffer, r, r + cubeSize, r, 3*8/64f, 8/64f, 200);
vertex(buffer, r, r, r, 3*8/64f, 2*8/64f, 200);
vertex(buffer, r, r, r + cubeSize, 2 * 8 / 64f, 2 * 8 / 64f, 200);
//bottom
buffer.vertex(r + cubeSize, r, r).texture(3*8/64f, 0).color(255, 255, 255, 200).next();
buffer.vertex(r + cubeSize, r, r + cubeSize).texture(3*8/64f, 8/64f).color(255, 255, 255, 200).next();
buffer.vertex(r, r, r + cubeSize).texture(2*8/64f, 8/64f).color(255, 255, 255, 200).next();
buffer.vertex(r, r, r).texture(2 * 8 / 64f, 0).color(255, 255, 255, 200).next();
vertex(buffer, r + cubeSize, r, r, 3*8/64f, 0, 200);
vertex(buffer, r + cubeSize, r, r + cubeSize, 3*8/64f, 8/64f, 200);
vertex(buffer, r, r, r + cubeSize, 2*8/64f, 8/64f, 200);
vertex(buffer, r, r, r, 2 * 8 / 64f, 0, 200);
//top
buffer.vertex(r, r + cubeSize, r).texture(8/64f, 0).color(255, 255, 255, 200).next();
buffer.vertex(r, r + cubeSize, r + cubeSize).texture(8/64f, 8/64f).color(255, 255, 255, 200).next();
buffer.vertex(r + cubeSize, r + cubeSize, r + cubeSize).texture(2*8/64f, 8/64f).color(255, 255, 255, 200).next();
buffer.vertex(r + cubeSize, r + cubeSize, r).texture(2 * 8 / 64f, 0).color(255, 255, 255, 200).next();
vertex(buffer, r, r + cubeSize, r, 8/64f, 0, 200);
vertex(buffer, r, r + cubeSize, r + cubeSize, 8/64f, 8/64f, 200);
vertex(buffer, r + cubeSize, r + cubeSize, r + cubeSize, 2*8/64f, 8/64f, 200);
vertex(buffer, r + cubeSize, r + cubeSize, r, 2 * 8 / 64f, 0, 200);
//#if MC>=12105
//$$ immediate.draw();
@@ -505,6 +512,18 @@ public class PathPreviewRenderer extends EventRegistrations {
popMatrix();
}
//#if MC>=12105
//$$ private void vertex(VertexConsumer buffer, float x, float y, float z, float u, float v, int alpha) {
//#else
private void vertex(BufferBuilder buffer, float x, float y, float z, float u, float v, int alpha) {
//#endif
//#if MC>=12106
//$$ buffer.vertex(x, y, z).color(255, 255, 255, alpha).texture(u, v).light(240, 240);
//#else
buffer.vertex(x, y, z).texture(u, v).color(255, 255, 255, alpha).next();
//#endif
}
private class KeyframeComparator implements Comparator<Pair<Keyframe, Vector3f>> {
private final Vector3f viewPos;