From b9b038620f982c3a825d703fcd4838c1a596c64e Mon Sep 17 00:00:00 2001 From: qouteall Date: Sun, 16 Jul 2023 10:15:18 +0800 Subject: [PATCH] 3.1.1 --- build.gradle | 70 ++----------------- gradle.properties | 2 +- .../context_management/RenderStates.java | 5 -- .../wand/ClientPortalWandPortalDrag.java | 10 +-- src/main/resources/fabric.mod.json | 2 +- 5 files changed, 12 insertions(+), 77 deletions(-) diff --git a/build.gradle b/build.gradle index f7959c181..67a1f62d6 100644 --- a/build.gradle +++ b/build.gradle @@ -58,10 +58,10 @@ allprojects { url = "https://maven.parchmentmc.org" } - // for cardinal components that fusions gravity api uses + // for cardinal components that gravity api uses maven { - name = 'Ladysnake Mods' - url = 'https://ladysnake.jfrog.io/artifactory/mods' + name = 'Ladysnake' + url = 'https://maven.ladysnake.org/releases' } // geckolib, for testing with portal gun @@ -150,16 +150,11 @@ allprojects { // implementation 'io.github.douira:glsl-transformer:2.0.0-pre13' // for iris // implementation 'org.antlr:antlr4-runtime:4.11.1' // for iris - modImplementation("com.github.qouteall:GravityChanger:74c7676f") { + modImplementation("com.github.qouteall:GravityChanger:v1.0.2-mc1.20.1") { transitive = false exclude(group: "net.fabricmc.fabric-api") } -// modImplementation("qouteall:Gravity-Api:1.0.2-mc1.20.1") { -// transitive = false -// exclude(group: "net.fabricmc.fabric-api") -// } - modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-base:5.2.1" modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-entity:5.2.1" modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-world:5.2.1" @@ -310,61 +305,4 @@ task printClasspath { } } -//task additionalCopy(type: Copy) { -// dependsOn(remapJar) -// from file("${project.buildDir}/libs/$archivesBaseName-${version}-mc${project.minecraft_version}-fabric.jar") -// into file("${project.buildDir}/to_upload") -// rename { n -> "$archivesBaseName-${version}-mc${project.minecraft_version}-fabric.jar" } -//} - - -// modrinth - -//modrinth { -// token = System.getenv("MODRINTH") -// // This is the default. Remember to have the MODRINTH_TOKEN environment variable set or else this will fail, or set it to whatever you want - just make sure it stays private! -// projectId = "zJpHMkdD" -// versionNumber = "${project.version}-${project.minecraft_version}" -// // You don't need to set this manually. Will fail if Modrinth has this version already -// versionType = "alpha" // This is the default -- can also be `beta` or `alpha` -// uploadFile = remapJar -// gameVersions = ["${project.minecraft_version}"] // Must be an array, even with only one version -// loaders = ["fabric"] // Must also be an array - no need to specify this if you're using Loom or ForgeGradle -// dependencies { // A special DSL for creating dependencies -// // scope.type -// // The scope can be `required`, `optional`, or `incompatible` -// // The type can either be `project` or `version` -// required.project "P7dR8mSH" // Creates a new required dependency on Fabric API -// } -//} - -//curseforge { -// if (System.getenv().CURSEFORGE_API_KEY) { -// apiKey = System.getenv().CURSEFORGE_API_KEY -//// System.out.println("Curseforge api key found") -// } else { -//// System.out.println("Curseforge api key not found") -// } -// -// project { -// id = "332273" -// changelog = "No changelog provided" -// releaseType = "beta" -// addGameVersion "1.19.4" -// addGameVersion "Fabric" -// -// mainArtifact(remapJar) { -// displayName = "${project.version}-mc${project.minecraft_version}" -// } -// -// afterEvaluate { -// uploadTask.dependsOn("remapJar") -// } -// } -// -// options { -// forgeGradleIntegration = false -// } -//} - // Enable ZGC: -XX:+UseZGC diff --git a/gradle.properties b/gradle.properties index 3098b1581..4dbfd696d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=false # Mod Properties -mod_version=3.1.0 +mod_version=3.1.1 maven_group=qouteall archives_base_name=immersive-portals diff --git a/imm_ptl_core/src/main/java/qouteall/imm_ptl/core/render/context_management/RenderStates.java b/imm_ptl_core/src/main/java/qouteall/imm_ptl/core/render/context_management/RenderStates.java index 85f77ae78..d848f4a58 100644 --- a/imm_ptl_core/src/main/java/qouteall/imm_ptl/core/render/context_management/RenderStates.java +++ b/imm_ptl_core/src/main/java/qouteall/imm_ptl/core/render/context_management/RenderStates.java @@ -64,8 +64,6 @@ public class RenderStates { public static Camera originalCamera; - public static int originalCameraLightPacked; - public static String debugText; public static boolean isLaggy = false; @@ -108,9 +106,6 @@ public static void updatePreRenderInfo( basicProjectionMatrix = null; originalCamera = MyRenderHelper.client.gameRenderer.getMainCamera(); - originalCameraLightPacked = MyRenderHelper.client.getEntityRenderDispatcher() - .getPackedLightCoords(MyRenderHelper.client.cameraEntity, getPartialTick()); - updateIsLaggy(); debugText = ""; diff --git a/src/main/java/qouteall/imm_ptl/peripheral/wand/ClientPortalWandPortalDrag.java b/src/main/java/qouteall/imm_ptl/peripheral/wand/ClientPortalWandPortalDrag.java index 1c75f8089..6b553238d 100644 --- a/src/main/java/qouteall/imm_ptl/peripheral/wand/ClientPortalWandPortalDrag.java +++ b/src/main/java/qouteall/imm_ptl/peripheral/wand/ClientPortalWandPortalDrag.java @@ -434,7 +434,9 @@ else if (selectsVerticalEdge) { ); } else { - Component planeText = Component.translatable("imm_ptl.wand.on_plane", planeInfo.getSecond()); + Component planeText = Component.translatable( + "imm_ptl.wand.on_plane", planeInfo.getSecond().withStyle(ChatFormatting.GOLD) + ); ImmPtlCustomOverlay.putText( Component.translatable( @@ -530,7 +532,7 @@ else if (sphere != null) { Component.literal("") : Component.translatable( "imm_ptl.wand.on_plane", - draggingContext.planeText().withStyle(ChatFormatting.GOLD) + draggingContext.planeText() ); MutableComponent undoPrompt = Component.literal("\n").append(Component.translatable( @@ -662,7 +664,7 @@ private static void startDragging() { plane, null, draggingInfo, - info.getSecond(), + info.getSecond().withStyle(ChatFormatting.GOLD), portal.getPortalState() ); } @@ -975,7 +977,7 @@ public static void renderRect( } private static double getLockExtraScale(UnilateralPortalState rect) { - return Math.sqrt(rect.width() * rect.height()) * 0.1; + return Math.sqrt(rect.width() * rect.height()) * 0.2; } private static void renderWidthHeightLock( diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c558af09b..8b9fea30f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -34,7 +34,7 @@ "depends": { "fabricloader": ">=0.7.4", "fabric-api": ">=0.28.1", - "minecraft": "1.20.1", + "minecraft": ["1.20.1", "1.20"], "imm_ptl_core": "*", "q_misc_util": "*" },