From b1f7d849565bd18643bd60e12b9ec5764f49da19 Mon Sep 17 00:00:00 2001 From: KrLite <68179735+KrLite@users.noreply.github.com> Date: Fri, 12 Jul 2024 11:16:59 +0800 Subject: [PATCH] maintenance --- build.gradle.kts | 2 +- gradle/libs.versions.toml | 8 ++++---- src/main/java/band/kessokuteatime/flash/Flash.java | 2 +- .../java/band/kessokuteatime/flash/FlashRenderer.java | 9 ++++----- .../kessokuteatime/flash/mixin/GameRendererMixin.java | 3 ++- src/main/resources/fabric.mod.json | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2eaa2f4..9589fef 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -74,7 +74,7 @@ publisher { versionType.set("release") projectVersion.set(project.version.toString()) - gameVersions.set(listOf("1.20.5", "1.20.6")) + gameVersions.set(listOf("1.21")) loaders.set(listOf("fabric", "quilt")) curseEnvironment.set("client") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index eb1c158..12c8fd1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,10 +4,10 @@ archives-name = "flash" mod = "2.1.0" loader = "fabric" -minecraft = "1.20.5" -yarn = "1.20.5+build.1" +minecraft = "1.21" +yarn = "1.21+build.9" fabric-loader = "0.16.0" -fabric-api = "0.97.8+1.20.5" +fabric-api = "0.100.6+1.21" fabric-loom = "1.6-SNAPSHOT" modpublisher = "2.1.0" @@ -20,7 +20,7 @@ id-curseforge = "998416" # display display-name = "Flash" display-loader = "Fabric" -display-version = "1.20.5~1.20.6" +display-version = "1.21+" [libraries] minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" } diff --git a/src/main/java/band/kessokuteatime/flash/Flash.java b/src/main/java/band/kessokuteatime/flash/Flash.java index 6977abe..d576438 100644 --- a/src/main/java/band/kessokuteatime/flash/Flash.java +++ b/src/main/java/band/kessokuteatime/flash/Flash.java @@ -61,7 +61,7 @@ static void listenInput(MinecraftClient client) { } public static class Sounds { - public static final SoundEvent CAMERA_SHUTTER = SoundEvent.of(new Identifier(ID, "camera_shutter")); + public static final SoundEvent CAMERA_SHUTTER = SoundEvent.of(Identifier.of(ID, "camera_shutter")); static void register() { Registry.register(Registries.SOUND_EVENT, CAMERA_SHUTTER.getId(), CAMERA_SHUTTER); diff --git a/src/main/java/band/kessokuteatime/flash/FlashRenderer.java b/src/main/java/band/kessokuteatime/flash/FlashRenderer.java index 31d22b5..701a6ba 100644 --- a/src/main/java/band/kessokuteatime/flash/FlashRenderer.java +++ b/src/main/java/band/kessokuteatime/flash/FlashRenderer.java @@ -34,13 +34,12 @@ public static void render(DrawContext context, IntBuffer intBuffer) { context.getMatrices().translate(0, height * Flash.drop(), 0); context.getMatrices().scale(scalar, scalar, scalar); - BufferBuilder builder = Tessellator.getInstance().getBuffer(); Matrix4f matrix = context.getMatrices().peek().getPositionMatrix(); // Background RenderSystem.setShader(GameRenderer::getPositionColorProgram); - builder.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR); + BufferBuilder builder = Tessellator.getInstance().begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR); color(builder, matrix, -(width / 2 + Flash.BORDER), -(minHeight / 2 + Flash.BORDER), borderColor); // Top left color(builder, matrix, -(minWidth / 2 + Flash.BORDER), height / 2 + Flash.BORDER, borderColor); // Bottom left @@ -53,7 +52,7 @@ public static void render(DrawContext context, IntBuffer intBuffer) { RenderSystem.setShader(GameRenderer::getPositionTexColorProgram); RenderSystem.setShaderTexture(0, textureId); - builder.begin(VertexFormat.DrawMode.TRIANGLE_STRIP, VertexFormats.POSITION_TEXTURE_COLOR); + builder = Tessellator.getInstance().begin(VertexFormat.DrawMode.TRIANGLE_STRIP, VertexFormats.POSITION_TEXTURE_COLOR); for (int y = 0; y < height; y++) { textureColor( @@ -78,10 +77,10 @@ public static void render(DrawContext context, IntBuffer intBuffer) { } private static void textureColor(BufferBuilder builder, Matrix4f matrix, float x, float y, float u, float v, AccurateColor color) { - builder.vertex(matrix, x, y, 0).texture(u, v).color(color.redAsFloat(), color.greenAsFloat(), color.blueAsFloat(), color.opacityAsFloat()).next(); + builder.vertex(matrix, x, y, 0).texture(u, v).color(color.redAsFloat(), color.greenAsFloat(), color.blueAsFloat(), color.opacityAsFloat()); } private static void color(BufferBuilder builder, Matrix4f matrix, float x, float y, AccurateColor color) { - builder.vertex(matrix, x, y, 0).color(color.redAsFloat(), color.greenAsFloat(), color.blueAsFloat(), color.opacityAsFloat()).next(); + builder.vertex(matrix, x, y, 0).color(color.redAsFloat(), color.greenAsFloat(), color.blueAsFloat(), color.opacityAsFloat()); } } diff --git a/src/main/java/band/kessokuteatime/flash/mixin/GameRendererMixin.java b/src/main/java/band/kessokuteatime/flash/mixin/GameRendererMixin.java index 0b1d0fd..7b60eff 100644 --- a/src/main/java/band/kessokuteatime/flash/mixin/GameRendererMixin.java +++ b/src/main/java/band/kessokuteatime/flash/mixin/GameRendererMixin.java @@ -5,6 +5,7 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.GameRenderer; +import net.minecraft.client.render.RenderTickCounter; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @@ -37,7 +38,7 @@ private DrawContext getMatrixStack(DrawContext context) { shift = At.Shift.AFTER ) ) - private void renderScreenshotFlash(float tickDelta, long startTime, boolean tick, CallbackInfo ci) { + private void renderScreenshotFlash(RenderTickCounter renderTickCounter, boolean bl, CallbackInfo ci) { if ( MinecraftClient.getInstance().world != null && MinecraftClient.getInstance().currentScreen == null && !MinecraftClient.getInstance().skipGameRender diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9ea775f..d446d6f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,7 +32,7 @@ "fabricloader": "*", "fabric-api": "*", "fabric-key-binding-api-v1": "*", - "minecraft": ["~1.20.5", "~1.20.6"] + "minecraft": "1.21.x" }, "suggests": { }