Well, this works

KrLite · Jul 11, 2024 · 22b67c9 · 22b67c9
1 parent 785f5e8
commit 22b67c9
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 36 deletions.
diff --git a/Math/src/main/java/net/krlite/equator/render/frame/FrameInfo.java b/Math/src/main/java/net/krlite/equator/render/frame/FrameInfo.java
@@ -10,10 +10,6 @@
  * Provides access to the screen and window properties.
  */
 public class FrameInfo {
-	public static float tickDelta() {
-		return MinecraftClient.getInstance().getTickDelta();
-	}
-
 	public static Box scaled() {
 		return new Box(Vector.fromCartesian(MinecraftClient.getInstance().getWindow().getScaledWidth(), MinecraftClient.getInstance().getWindow().getScaledHeight()));
 	}

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,11 +7,11 @@ archives-animation-name = "equator-animation"
 archives-math-name = "equator-math"
 archives-visual-name = "equator-visual"
 
-minecraft = "1.20"
-yarn = "1.20+build.1"
+minecraft = "1.21"
+yarn = "1.21+build.7"
 fabric-loader = "0.15.7"
-fabric-api = "0.83.0+1.20"
-fabric-loom = "1.5-SNAPSHOT"
+fabric-api = "0.100.4+1.21"
+fabric-loom = "1.6-SNAPSHOT"
 
 mixbox = "2.0.0"
 word-wrap = "0.1.12"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/jitpack.yml b/jitpack.yml
@@ -1,2 +1,2 @@
 jdk:
-  - openjdk17
+  - openjdk21
diff --git a/src/main/java/net/krlite/equator/render/frame/FrameInfo.java b/src/main/java/net/krlite/equator/render/frame/FrameInfo.java
@@ -10,10 +10,6 @@
  * Provides access to the screen and window properties.
  */
 public class FrameInfo {
-	public static float tickDelta() {
-		return MinecraftClient.getInstance().getTickDelta();
-	}
-
 	public static Box scaled() {
 		return new Box(Vector.fromCartesian(MinecraftClient.getInstance().getWindow().getScaledWidth(), MinecraftClient.getInstance().getWindow().getScaledHeight()));
 	}

diff --git a/src/main/java/net/krlite/equator/render/renderer/Flat.java b/src/main/java/net/krlite/equator/render/renderer/Flat.java
@@ -265,7 +265,7 @@ private enum State {
 			UNABLE(null, null),
 			COLOR(VertexFormats.POSITION_COLOR, GameRenderer::getPositionColorProgram),
 			TEXTURE(VertexFormats.POSITION_TEXTURE, GameRenderer::getPositionTexProgram),
-			COLOR_TEXTURE(VertexFormats.POSITION_COLOR_TEXTURE, GameRenderer::getPositionColorTexProgram);
+			TEXTURE_COLOR(VertexFormats.POSITION_TEXTURE_COLOR, GameRenderer::getPositionTexColorProgram);
 
 			private final @Nullable VertexFormat vertexFormat;
 			private final @Nullable Supplier<ShaderProgram> shaderProgram;
@@ -307,7 +307,7 @@ private AccurateColor assertColor(AccurateColor color) {
 
 		private State state() {
 			if (hasColor() && hasTexture())
-				return State.COLOR_TEXTURE;
+				return State.TEXTURE_COLOR;
 			else if (hasColor())
 				return State.COLOR;
 			else if (hasTexture())
@@ -321,15 +321,12 @@ else if (hasTexture())
 		private void renderVertex(BufferBuilder builder, Matrix4f matrix, Vector vertex, Vector uv, AccurateColor color, float z) {
 			switch (state()) {
 				case COLOR -> builder.vertex(matrix, (float) vertex.x(), (float) vertex.y(), z)
-									  .color(color.redAsFloat(), color.greenAsFloat(), color.blueAsFloat(), color.opacityAsFloat())
-									  .next();
+						.color(color.redAsFloat(), color.greenAsFloat(), color.blueAsFloat(), color.opacityAsFloat());
 				case TEXTURE -> builder.vertex(matrix, (float) vertex.x(), (float) vertex.y(), z)
-										.texture((float) uv.x(), (float) uv.y())
-										.next();
-				case COLOR_TEXTURE -> builder.vertex(matrix, (float) vertex.x(), (float) vertex.y(), z)
-											  .color(color.redAsFloat(), color.greenAsFloat(), color.blueAsFloat(), color.opacityAsFloat())
-											  .texture((float) uv.x(), (float) uv.y())
-											  .next();
+						.texture((float) uv.x(), (float) uv.y());
+				case TEXTURE_COLOR -> builder.vertex(matrix, (float) vertex.x(), (float) vertex.y(), z)
+						.texture((float) uv.x(), (float) uv.y())
+						.color(color.redAsFloat(), color.greenAsFloat(), color.blueAsFloat(), color.opacityAsFloat());
 			}
 		}
 
@@ -346,10 +343,8 @@ private void renderNormal() {
 				RenderSystem.setShaderTexture(0, Objects.requireNonNull(texture()).identifier());
 			}
 
-			BufferBuilder builder = Tessellator.getInstance().getBuffer();
 			Matrix4f matrix = matrixStack().peek().getPositionMatrix();
-
-			builder.begin(VertexFormat.DrawMode.TRIANGLE_STRIP, state().vertexFormat());
+			BufferBuilder builder = Tessellator.getInstance().begin(VertexFormat.DrawMode.TRIANGLE_STRIP, state().vertexFormat());
 
 			double xDelta, yDelta;
 
@@ -1352,8 +1347,7 @@ public double eccentricity() {
 
 		private void renderVertex(BufferBuilder builder, Matrix4f matrix, Vector vertex, AccurateColor color, float z) {
 			builder.vertex(matrix, (float) vertex.x(), (float) vertex.y(), z)
-					.color(color.redAsFloat(), color.greenAsFloat(), color.blueAsFloat(), color.opacityAsFloat())
-					.next();
+					.color(color.redAsFloat(), color.greenAsFloat(), color.blueAsFloat(), color.opacityAsFloat());
 		}
 
 		private void renderInnerVertex(BufferBuilder builder, Matrix4f matrix, double offset, AccurateColor color, float z) {
@@ -1402,15 +1396,15 @@ public void render() {
 			RenderSystem.setShader(GameRenderer::getPositionColorProgram);
 			RenderSystem.disableCull(); // Prevents triangles from being culled
 
-			BufferBuilder builder = Tessellator.getInstance().getBuffer();
+			BufferBuilder builder;
 			Matrix4f matrix = matrixStack().peek().getPositionMatrix();
 
 			if (outline() == VertexProvider.NONE) { // Full circle
-				builder.begin(VertexFormat.DrawMode.TRIANGLE_FAN, VertexFormats.POSITION_COLOR);
+				builder = Tessellator.getInstance().begin(VertexFormat.DrawMode.TRIANGLE_FAN, VertexFormats.POSITION_COLOR);
 
 				renderVertex(builder, matrix, box().center(), colorCenter(), z());
 			} else { // Ring
-				builder.begin(VertexFormat.DrawMode.TRIANGLE_STRIP, VertexFormats.POSITION_COLOR);
+				builder = Tessellator.getInstance().begin(VertexFormat.DrawMode.TRIANGLE_STRIP, VertexFormats.POSITION_COLOR);
 			}
 
 			for (

diff --git a/src/main/java/net/krlite/equator/render/vanilla/VanillaWidgets.java b/src/main/java/net/krlite/equator/render/vanilla/VanillaWidgets.java
@@ -10,6 +10,7 @@
 import net.minecraft.client.util.math.MatrixStack;
 
 public class VanillaWidgets {
+	/*
 	public static class Button {
 		public enum State implements Cyclic.Enum<State> {
 			UNAVAILABLE,
@@ -35,6 +36,8 @@ public static void render(DrawContext context, Box box, State state) {
 		}
 	}
 
+	 */
+
 	public static class Tooltip {
 		public static void render(DrawContext context, Box box) {
 			Box bleed = box.expand(-1);

diff --git a/src/main/java/net/krlite/equator/test/CanvasScreen.java b/src/main/java/net/krlite/equator/test/CanvasScreen.java
@@ -109,7 +109,7 @@ protected void init() {
 
 	@Override
 	public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-		renderBackground(context);
+		renderBackground(context, mouseX, mouseY, delta);
 
 		//VanillaWidgets.Tooltip.render(context, box);
 

diff --git a/src/main/java/net/krlite/equator/visual/texture/Texture.java b/src/main/java/net/krlite/equator/visual/texture/Texture.java
@@ -19,11 +19,11 @@ public static Texture fromIdentifier(Identifier texture) {
 	}
 
 	public static Texture fromNamespacePath(String namespace, String... paths) {
-		return new Texture(new Identifier(namespace, combinePaths(paths)));
+		return new Texture(Identifier.of(namespace, combinePaths(paths)));
 	}
 
 	public static Texture fromPath(String... paths) {
-		return new Texture(new Identifier(combinePaths(paths)));
+		return new Texture(Identifier.of(combinePaths(paths)));
 	}
 
 	protected Texture(Identifier identifier, Box uvBox, boolean flippedX, boolean flippedY) {

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -29,7 +29,7 @@
   "depends": {
     "fabricloader": "*",
     "fabric-api": "*",
-    "minecraft": "1.20.x"
+    "minecraft": "1.21.x"
   },
   "suggests": {
     "immediatelyfast": "*"