diff --git a/gradle.properties b/gradle.properties index e0af52d..0962040 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,16 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.4 -yarn_mappings=1.21.4+build.8 -loader_version=0.16.14 # Mod Properties mod_version=1.0 maven_group=org.walruslab archives_base_name=kepler # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.119.2+1.21.4 +minecraft_version=1.21.7 +yarn_mappings=1.21.7+build.8 +loader_version=0.16.14 +loom_version=1.11-SNAPSHOT + +# Fabric API +fabric_version=0.129.0+1.21.7 \ No newline at end of file diff --git a/src/main/java/org/walruslab/kepler/render/TrajectoryRenderer.java b/src/main/java/org/walruslab/kepler/render/TrajectoryRenderer.java index 1bf2cd1..d7180ff 100644 --- a/src/main/java/org/walruslab/kepler/render/TrajectoryRenderer.java +++ b/src/main/java/org/walruslab/kepler/render/TrajectoryRenderer.java @@ -1,15 +1,15 @@ package org.walruslab.kepler.render; +import com.mojang.blaze3d.opengl.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.VertexFormat; import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents; import net.jpountz.util.Utils; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gl.ShaderProgramKeys; -import net.minecraft.client.render.BufferRenderer; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.Tessellator; -import net.minecraft.client.render.VertexFormat; import net.minecraft.client.render.VertexFormats; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.ArrowEntity; @@ -145,12 +145,9 @@ public class TrajectoryRenderer { private static void renderLine(WorldRenderContext drawContext, List points, float r, float g, float b) { // enable z-buffer - RenderSystem.enableDepthTest(); - RenderSystem.depthFunc(GL11.GL_LEQUAL); - RenderSystem.enableBlend(); - RenderSystem.defaultBlendFunc(); - - RenderSystem.setShaderColor(r, g, b, 1.0f); + GlStateManager._enableDepthTest(); + GlStateManager._depthFunc(GL11.GL_LEQUAL); + GlStateManager._enableBlend(); var tesselator = Tessellator.getInstance(); var buf = tesselator.begin(VertexFormat.DrawMode.DEBUG_LINE_STRIP, VertexFormats.POSITION_COLOR); @@ -164,13 +161,9 @@ public class TrajectoryRenderer { float dz = (float) (point.z - playerPos.z); buf.vertex(mat, dx, dy, dz); - buf.color(r, g, b, 1.0f); } - RenderSystem.setShader(ShaderProgramKeys.POSITION_COLOR); - RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f); - - BufferRenderer.drawWithGlobalProgram(buf.end()); + RenderLayer.getDebugLineStrip(1).draw(buf.end()); } }