From 50de43add7816eeb88b6c13836ad2445a9821c19 Mon Sep 17 00:00:00 2001 From: couyit <85477217+couyit@users.noreply.github.com> Date: Tue, 21 Mar 2023 09:24:12 +0900 Subject: [PATCH] 1.19.4 --- .../common/LightOverlayRenderer.java | 17 +++++++---------- fabric/src/main/resources/fabric.mod.json | 8 ++++---- forge/src/main/resources/META-INF/mods.toml | 8 ++++---- gradle.properties | 14 +++++++------- 4 files changed, 22 insertions(+), 25 deletions(-) diff --git a/common/src/main/java/me/shedaniel/lightoverlay/common/LightOverlayRenderer.java b/common/src/main/java/me/shedaniel/lightoverlay/common/LightOverlayRenderer.java index 09d75a8..1a53af0 100644 --- a/common/src/main/java/me/shedaniel/lightoverlay/common/LightOverlayRenderer.java +++ b/common/src/main/java/me/shedaniel/lightoverlay/common/LightOverlayRenderer.java @@ -36,7 +36,7 @@ public class LightOverlayRenderer implements Consumer { public void accept(PoseStack poses) { if (LightOverlay.enabled) { LocalPlayer playerEntity = minecraft.player; - BlockPos playerPos = new BlockPos(playerEntity.getX(), playerEntity.getY(), playerEntity.getZ()); + BlockPos playerPos = BlockPos.containing(playerEntity.getX(), playerEntity.getY(), playerEntity.getZ()); int playerPosX = playerPos.getX() >> 4; int playerPosY = playerPos.getY() >> 5; int playerPosZ = playerPos.getZ() >> 4; @@ -45,7 +45,7 @@ public class LightOverlayRenderer implements Consumer { int chunkRange = LightOverlay.getChunkRange(); if (LightOverlay.showNumber) { - renderLevels(new PoseStack(), camera, playerPos, playerPosX, playerPosY, playerPosZ, chunkRange, collisionContext); + renderLevels(poses, camera, playerPos, playerPosX, playerPosY, playerPosZ, chunkRange, collisionContext); } else { renderCrosses(poses, camera, playerPos, playerPosX, playerPosY, playerPosZ, chunkRange, collisionContext); } @@ -53,7 +53,6 @@ public class LightOverlayRenderer implements Consumer { } private void renderLevels(PoseStack poses, Camera camera, BlockPos playerPos, int playerPosX, int playerPosY, int playerPosZ, int chunkRange, CollisionContext collisionContext) { - RenderSystem.enableTexture(); RenderSystem.depthMask(true); BlockPos.MutableBlockPos mutable = new BlockPos.MutableBlockPos(); BlockPos.MutableBlockPos downMutable = new BlockPos.MutableBlockPos(); @@ -93,13 +92,12 @@ public class LightOverlayRenderer implements Consumer { float size = 0.07F; poses.scale(-size, -size, size); float float_3 = (float) (-font.width(text)) / 2.0F + 0.4f; - font.drawInBatch(text, float_3, -3.5f, level > LightOverlay.higherCrossLevel ? 0xff042404 : (LightOverlay.lowerCrossLevel >= 0 && level > LightOverlay.lowerCrossLevel ? 0xff0066ff : 0xff731111), false, poses.last().pose(), source, false, 0, 15728880); + font.drawInBatch(text, float_3, -3.5f, level > LightOverlay.higherCrossLevel ? 0xff042404 : (LightOverlay.lowerCrossLevel >= 0 && level > LightOverlay.lowerCrossLevel ? 0xff0066ff : 0xff731111), false, poses.last().pose(), source, Font.DisplayMode.NORMAL, 0, 15728880); poses.popPose(); } private void renderCrosses(PoseStack poses, Camera camera, BlockPos playerPos, int playerPosX, int playerPosY, int playerPosZ, int chunkRange, CollisionContext collisionContext) { RenderSystem.enableDepthTest(); - RenderSystem.disableTexture(); RenderSystem.disableBlend(); RenderSystem.setShader(GameRenderer::getPositionColorShader); RenderSystem.lineWidth(LightOverlay.lineWidth); @@ -133,7 +131,6 @@ public class LightOverlayRenderer implements Consumer { tesselator.end(); RenderSystem.lineWidth(1.0F); RenderSystem.enableBlend(); - RenderSystem.enableTexture(); } public void renderCross(Matrix4f pose, BufferBuilder builder, Camera camera, Level world, BlockPos pos, int color, CollisionContext collisionContext) { @@ -152,10 +149,10 @@ public class LightOverlayRenderer implements Consumer { double x = pos.getX() - cameraX; double y = pos.getY() - cameraY + blockOffset; double z = pos.getZ() - cameraZ; - builder.vertex(x + .01, y, z + .01).color(red, green, blue, 255).endVertex(); - builder.vertex(x + .99, y, z + .99).color(red, green, blue, 255).endVertex(); - builder.vertex(x + .99, y, z + .01).color(red, green, blue, 255).endVertex(); - builder.vertex(x + .01, y, z + .99).color(red, green, blue, 255).endVertex(); + builder.vertex(pose, (float)(x + .01D), (float)y, (float)(z + .01D)).color(red, green, blue, 255).endVertex(); + builder.vertex(pose, (float)(x + .99D), (float)y, (float)(z + .99D)).color(red, green, blue, 255).endVertex(); + builder.vertex(pose, (float)(x + .99D), (float)y, (float)(z + .01D)).color(red, green, blue, 255).endVertex(); + builder.vertex(pose, (float)(x + .01D), (float)y, (float)(z + .99D)).color(red, green, blue, 255).endVertex(); } public boolean isFrustumVisible(double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 24b75f2..a776235 100755 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -28,11 +28,11 @@ ], "accessWidener": "lightoverlay.accesswidener", "depends": { - "fabricloader": ">=0.14.11", + "fabricloader": ">=0.14.17", "fabric-api": "*", - "minecraft": "~1.19.3", + "minecraft": "~1.19.4", "java": ">=17", - "architectury": ">=7-", - "cloth-config2": ">=9-" + "architectury": ">=8-", + "cloth-config2": ">=10-" } } diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 5ab04b0..73e0979 100755 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[44,)" +loaderVersion = "[45,)" issueTrackerURL = "https://github.com/shedaniel/LightOverlay/issues/" #optional logoFile = "icon.png" authors = "shedaniel" @@ -15,20 +15,20 @@ To provide users with NEI-like light overlay. [[dependencies.lightoverlay]] modId = "cloth_config" mandatory = true -versionRange = "[9,)" +versionRange = "[10,)" ordering = "NONE" side = "CLIENT" [[dependencies.lightoverlay]] modId = "architectury" mandatory = true -versionRange = "[7,)" +versionRange = "[8,)" ordering = "NONE" side = "CLIENT" [[dependencies.lightoverlay]] modId = "forge" mandatory = true -versionRange = "[44.0.37,)" +versionRange = "[45.0.9,)" ordering = "NONE" side = "BOTH" diff --git a/gradle.properties b/gradle.properties index 2899479..580b455 100755 --- a/gradle.properties +++ b/gradle.properties @@ -2,15 +2,15 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false mod_version=7.0.2 -minecraft_version=1.19.3 +minecraft_version=1.19.4 -architectury_version=7.0.66 +architectury_version=8.1.73 # fabric -fabric_loader_version=0.14.12 -fabric_api_version=0.70.0+1.19.3 -cloth_config_version=9.0.94 -modmenu_version=5.0.2 +fabric_loader_version=0.14.17 +fabric_api_version=0.76.0+1.19.4 +cloth_config_version=10.0.96 +modmenu_version=6.1.0-rc.4 # forge -forge_version=44.0.37 \ No newline at end of file +forge_version=45.0.9 \ No newline at end of file -- 2.44.0