From 87996db73f29f27d37d8068148b01ae1846b7bee Mon Sep 17 00:00:00 2001 From: Asoji Date: Fri, 30 Jun 2023 19:46:25 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A5=20Currently=20broken=20for=201.20.?= =?UTF-8?q?1,=20fixing=20time...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 7 +++---- gradle.properties | 20 +++++++++---------- .../one/devos/nautical/succ/SuccUtils.java | 4 ++-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index ec78015..99dea7d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "org.quiltmc.loom" version "1.0.+" - id "io.github.juuxel.loom-quiltflower" version "1.+" + id "io.github.juuxel.loom-quiltflower" version "1.8.+" id "maven-publish" } archivesBaseName = project.archives_base_name @@ -22,19 +22,18 @@ dependencies { // dev environment minecraft("com.mojang:minecraft:$minecraft_version") mappings loom.layered { - it.addLayer(quiltMappings.mappings("org.quiltmc:quilt-mappings:$minecraft_version+build.$qm_build:v2")) + it.mappings("org.quiltmc:quilt-mappings:$minecraft_version+build.$qm_build:intermediary-v2") it.officialMojangMappings { setNameSyntheticMembers(false) } } modImplementation("org.quiltmc:quilt-loader:$quilt_loader") modImplementation("org.quiltmc.quilted-fabric-api:quilted-fabric-api:$quilted_fabric_api") // dev env - modLocalRuntime("maven.modrinth:lazydfu:$lazydfu_version") modLocalRuntime("maven.modrinth:suggestion-tweaker:$suggestion_tweaker_version") modLocalRuntime("me.shedaniel.cloth:cloth-config-fabric:$cloth_config_version") modLocalRuntime("curse.maven:jade-324717:$jade_file") modLocalRuntime("com.terraformersmc:modmenu:$mod_menu_version") - modLocalRuntime("dev.emi:emi:$emi_version") + modLocalRuntime("dev.emi:emi-fabric:$emi_version") } task buildOrPublish { diff --git a/gradle.properties b/gradle.properties index 7b76e65..ec4dd36 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,21 +7,19 @@ archives_base_name = succ # is replaced at compile time with either GitHub Actions build number, or 99999 if not available. version = 0.1. -minecraft_version = 1.19.2 -qm_build = 3 -quilt_loader = 0.17.2-beta.3 -quilted_fabric_api = 4.0.0-beta.7+0.59.0-1.19.2 +minecraft_version = 1.20.1 +qm_build = 7 +quilt_loader = 0.19.2-beta.5 +quilted_fabric_api = 7.0.4+0.84.0-1.20.1 # dev env mods -# https://modrinth.com/mod/lazydfu -lazydfu_version = 0.1.3 # https://modrinth.com/mod/suggestion-tweaker -suggestion_tweaker_version = 1.19.1-1.3.1+fabric +suggestion_tweaker_version = 1.20-1.4.2+fabric # https://modrinth.com/mod/cloth-config - for Suggestion Tweaker -cloth_config_version = 8.0.75 +cloth_config_version = 11.0.99 # https://www.curseforge.com/minecraft/mc-mods/jade/files/all -jade_file = 3903418 +jade_file = 4614077 # https://modrinth.com/mod/modmenu -mod_menu_version = 4.0.6 +mod_menu_version = 7.1.0 # https://modrinth.com/mod/emi -emi_version = 0.3.3+1.19 +emi_version = 1.0.5+1.20.1 diff --git a/src/main/java/one/devos/nautical/succ/SuccUtils.java b/src/main/java/one/devos/nautical/succ/SuccUtils.java index 34e132e..9bf18ca 100644 --- a/src/main/java/one/devos/nautical/succ/SuccUtils.java +++ b/src/main/java/one/devos/nautical/succ/SuccUtils.java @@ -1,13 +1,13 @@ package one.devos.nautical.succ; -import com.mojang.math.Vector3f; - import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.util.Mth; import net.minecraft.world.phys.Vec3; +import org.joml.Vector3f; + public class SuccUtils { // around Y axis public static Vec3 rotateVec(Vec3 vec, double degrees) {