From e056b936b894cbd5e471dfd7aeeaeeeb9d7caedb Mon Sep 17 00:00:00 2001 From: PriestOfFerns Date: Mon, 15 Apr 2024 20:40:37 +0300 Subject: [PATCH] :art: De-marvinization 2 --- common/build.gradle | 2 +- .../items/ShipAssemblerItem.kt | 11 +++++----- .../rendering/SelectionZoneRenderer.kt | 21 ++++++++++--------- fabric/build.gradle | 2 +- forge/build.gradle | 2 +- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index a9b7682..1d6912a 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -51,7 +51,7 @@ dependencies { compileOnly("org.valkyrienskies.core:util:${rootProject.vs_core_version}") compileOnly("org.valkyrienskies.core:impl:${rootProject.vs_core_version}") - api "com.github.M-Marvin:LIBRARY-UnifiedVectors:$univec_version" + //api "com.github.M-Marvin:LIBRARY-UnifiedVectors:$univec_version" api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10" diff --git a/common/src/main/kotlin/io/github/priestoffern/vs_ship_assembler/items/ShipAssemblerItem.kt b/common/src/main/kotlin/io/github/priestoffern/vs_ship_assembler/items/ShipAssemblerItem.kt index fe256ad..e779c9d 100644 --- a/common/src/main/kotlin/io/github/priestoffern/vs_ship_assembler/items/ShipAssemblerItem.kt +++ b/common/src/main/kotlin/io/github/priestoffern/vs_ship_assembler/items/ShipAssemblerItem.kt @@ -1,6 +1,6 @@ package io.github.priestoffern.vs_ship_assembler.items -import de.m_marvin.univec.impl.Vec3d + import io.github.priestoffern.vs_ship_assembler.rendering.Renderer import io.github.priestoffern.vs_ship_assembler.rendering.RenderingData import io.github.priestoffern.vs_ship_assembler.rendering.SelectionZoneRenderer @@ -91,8 +91,9 @@ class ShipAssemblerItem(properties: Properties): Item(properties) { if (SelectionZone!=null) Renderer.removeRenderOfType(SelectionZone!!) SelectionZone = null; - val SZ = SelectionZoneRenderer(Vec3d(firstPosition!!.x.toDouble(), - firstPosition!!.y.toDouble(), firstPosition!!.z.toDouble()),Vec3d(res.blockPos.x.toDouble(),res.blockPos.y.toDouble(),res.blockPos.z.toDouble()), Color.GREEN); + val SZ = SelectionZoneRenderer(Vector3d(firstPosition!!.x.toDouble(), + firstPosition!!.y.toDouble(), firstPosition!!.z.toDouble()), + Vector3d(res.blockPos.x.toDouble(),res.blockPos.y.toDouble(),res.blockPos.z.toDouble()), Color.GREEN); SelectionZone = Renderer.addRender(SZ) } else { player.sendMessage(TextComponent("Selected position is invalid").withStyle(ChatFormatting.RED), Util.NIL_UUID) @@ -140,11 +141,11 @@ class ShipAssemblerItem(properties: Properties): Item(properties) { val SZ = SelectionZoneRenderer( - Vec3d( + Vector3d( otherPos!!.x.toDouble(), otherPos.y.toDouble(), otherPos.z.toDouble() ), - Vec3d(res.blockPos.x.toDouble(), res.blockPos.y.toDouble(), res.blockPos.z.toDouble()), + Vector3d(res.blockPos.x.toDouble(), res.blockPos.y.toDouble(), res.blockPos.z.toDouble()), Color.GREEN ); SelectionZone = Renderer.addRender(SZ) diff --git a/common/src/main/kotlin/io/github/priestoffern/vs_ship_assembler/rendering/SelectionZoneRenderer.kt b/common/src/main/kotlin/io/github/priestoffern/vs_ship_assembler/rendering/SelectionZoneRenderer.kt index 2f719aa..c26dda1 100644 --- a/common/src/main/kotlin/io/github/priestoffern/vs_ship_assembler/rendering/SelectionZoneRenderer.kt +++ b/common/src/main/kotlin/io/github/priestoffern/vs_ship_assembler/rendering/SelectionZoneRenderer.kt @@ -3,21 +3,22 @@ package io.github.priestoffern.vs_ship_assembler.rendering import com.mojang.blaze3d.systems.RenderSystem import com.mojang.blaze3d.vertex.* import com.mojang.math.Matrix4f -import de.m_marvin.univec.impl.Vec3d import net.minecraft.client.Camera import net.minecraft.client.renderer.GameRenderer +import org.joml.Vector3d import org.lwjgl.opengl.GL11 import java.awt.Color + class SelectionZoneRenderer() : RenderingData { - var point0 = Vec3d(); - var point1 = Vec3d(); + var point0 = Vector3d(0.0,0.0, 0.0); + var point1 = Vector3d(0.0,0.0, 0.0); var color: Color = Color(0) override var Id: Long = 0 override var type: String = "Ship_Assembler_Selection_Zone" constructor( - point0: Vec3d, - point1: Vec3d, + point0: Vector3d, + point1: Vector3d, color: Color, ): this() { this.point0 = point0 @@ -47,11 +48,11 @@ class SelectionZoneRenderer() : RenderingData { val cameraPos = camera.position - val Add1 = Vec3d(if (point0.x>=point1.x) 1.0 else 0.0, if (point0.y>=point1.y) 1.0 else 0.0, if (point0.z>=point1.z) 1.0 else 0.0) - val Add2 = Vec3d(if (point1.x>point0.x) 1.0 else 0.0, if (point1.y>point0.y) 1.0 else 0.0, if (point1.z>point0.z) 1.0 else 0.0) + val Add1 = Vector3d(if (point0.x>=point1.x) 1.0 else 0.0, if (point0.y>=point1.y) 1.0 else 0.0, if (point0.z>=point1.z) 1.0 else 0.0) + val Add2 = Vector3d(if (point1.x>point0.x) 1.0 else 0.0, if (point1.y>point0.y) 1.0 else 0.0, if (point1.z>point0.z) 1.0 else 0.0) - val tpos1 = Vec3d(point0.x-cameraPos.x,point0.y-cameraPos.y,point0.z-cameraPos.z).add(Add1) - val tpos2 = Vec3d(point1.x-cameraPos.x,point1.y-cameraPos.y,point1.z-cameraPos.z).add(Add2) + val tpos1 = Vector3d(point0.x-cameraPos.x,point0.y-cameraPos.y,point0.z-cameraPos.z).add(Add1) + val tpos2 = Vector3d(point1.x-cameraPos.x,point1.y-cameraPos.y,point1.z-cameraPos.z).add(Add2) val matrix = poseStack.last().pose() makeBox( @@ -70,7 +71,7 @@ class SelectionZoneRenderer() : RenderingData { fun tof(n: Double) = n.toFloat() fun makeBox(buf: VertexConsumer, matrix: Matrix4f, r: Int, g: Int, b: Int, a: Int, lightmapUV: Int, - A: Vec3d, B:Vec3d + A: Vector3d, B:Vector3d ) { buf.vertex(matrix, tof(A.x), tof(A.y), tof(A.z)).color(r, g, b, a).uv2(lightmapUV).endVertex() buf.vertex(matrix, tof(A.x), tof(A.y), tof(B.z)).color(r, g, b, a).uv2(lightmapUV).endVertex() diff --git a/fabric/build.gradle b/fabric/build.gradle index 870ec02..6997931 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -69,7 +69,7 @@ dependencies { common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } - include(api "com.github.M-Marvin:LIBRARY-UnifiedVectors:$univec_version") + //include(api "com.github.M-Marvin:LIBRARY-UnifiedVectors:$univec_version") } processResources { diff --git a/forge/build.gradle b/forge/build.gradle index d30d88b..1d2cd7b 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -90,7 +90,7 @@ dependencies { // Kotlin for Forge implementation "thedarkcolour:kotlinforforge:$forge_kotlin_version" - include(forgeRuntimeLibrary "com.github.M-Marvin:LIBRARY-UnifiedVectors:$univec_version") + //include(forgeRuntimeLibrary "com.github.M-Marvin:LIBRARY-UnifiedVectors:$univec_version") }