From b45ee9d8e58bcaa032d017088b1b12f7be42e5f8 Mon Sep 17 00:00:00 2001 From: Roman Danilov Date: Tue, 13 Aug 2024 14:45:33 +0500 Subject: [PATCH] Where Is It Revert (Chest Tracker Support) --- README.md | 2 -- build.gradle | 8 +++++--- gradle.properties | 7 +++---- src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java | 4 ++++ .../features/modules/integrations/WhereIsIt.java | 9 +++++++++ .../meteorplus/mixin/whereisit/RenderingMixin.java | 2 +- 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index b4ef305c..eedd3e99 100644 --- a/README.md +++ b/README.md @@ -69,10 +69,8 @@ ## Integrations with mods | Mod | Integrated | |---------------------------------------------------------------------------|---------------------------------------------------------| -| **[Journey Map](https://modrinth.com/mod/journeymap)** | **Goto from Baritone for map context menu** | | **[Xaero's World Map](https://modrinth.com/mod/xaeros-world-map)** | **Goto, Elytra fly from Baritone for map context menu** | | **[Chest Tracker](https://modrinth.com/mod/chest-tracker)** | **Color support** | -| **[Litematica](https://www.curseforge.com/minecraft/mc-mods/litematica)** | **Printer (Auto block placer)** | # Installation Guide 1. Install [minecraft](https://www.minecraft.net) diff --git a/build.gradle b/build.gradle index e7ab45b4..9b1e23e2 100644 --- a/build.gradle +++ b/build.gradle @@ -33,6 +33,11 @@ repositories { maven { url = uri("https://maven.isxander.dev/releases") } + // YACL Snapshots + maven { + name = "Xander Snapshot Maven" + url = uri("https://maven.isxander.dev/snapshots") + } // Where Is It, JackFredLib maven { url = uri("https://maven.jackf.red/releases/") @@ -74,9 +79,6 @@ dependencies { // Chest Tracker modImplementation("red.jackf:whereisit:${project.where_is_it_version}") - - // Boze - modImplementation "dev.boze:boze-api:${project.boze_api_version}" } loom { diff --git a/gradle.properties b/gradle.properties index 30d1be8d..576d0a72 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,11 +30,10 @@ litematica_fileid=4946471 litematica_projectid=308892 # Where Is It (https://modrinth.com/mod/where-is-it/versions) -where_is_it_version=2.3.4+1.20.4 +where_is_it_version=2.4.3+1.20.6 +# YetAnotherConfigLib (https://github.com/JackFred2/WhereIsIt/blob/1.20.6/gradle.properties) +yacl_version=3.3.2+1.20.4+update.1.20.5-SNAPSHOT+update.1.20.5-SNAPSHOT # MaLiLib (https://www.curseforge.com/minecraft/mc-mods/malilib/files/all?page=1&pageSize=20) malilib_fileid=4946328 malilib_projectid=303119 - - -boze_api_version=1.2.0+1.20.4 diff --git a/src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java b/src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java index 49d1e01d..2bee7608 100644 --- a/src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java +++ b/src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java @@ -9,6 +9,7 @@ import nekiplay.meteorplus.features.commands.*; import nekiplay.meteorplus.features.modules.combat.*; import nekiplay.meteorplus.features.modules.combat.velocity.VelocityPlus; +import nekiplay.meteorplus.features.modules.integrations.WhereIsIt; import nekiplay.meteorplus.features.modules.misc.*; import nekiplay.meteorplus.features.modules.movement.*; import nekiplay.meteorplus.features.modules.movement.elytrafly.ElytraFlyPlus; @@ -195,6 +196,9 @@ public void onInitialize() { modules.add(new MapIntegration()); } } + if (isWhereIsIt) { + modules.add(new WhereIsIt()); + } LOG.info(METEOR_LOGPREFIX + " Loaded modules"); //endregion diff --git a/src/main/java/nekiplay/meteorplus/features/modules/integrations/WhereIsIt.java b/src/main/java/nekiplay/meteorplus/features/modules/integrations/WhereIsIt.java index abfb3f91..19bbe694 100644 --- a/src/main/java/nekiplay/meteorplus/features/modules/integrations/WhereIsIt.java +++ b/src/main/java/nekiplay/meteorplus/features/modules/integrations/WhereIsIt.java @@ -45,4 +45,13 @@ public WhereIsIt() { .sliderRange(-15, 15) .build() ); + + public final Setting text_scale = defaultGroup.add(new DoubleSetting.Builder() + .name("text_scale") + .defaultValue(1) + .max(15) + .min(0) + .sliderRange(0, 15) + .build() + ); } diff --git a/src/main/java/nekiplay/meteorplus/mixin/whereisit/RenderingMixin.java b/src/main/java/nekiplay/meteorplus/mixin/whereisit/RenderingMixin.java index e4837392..e9c3cee9 100644 --- a/src/main/java/nekiplay/meteorplus/mixin/whereisit/RenderingMixin.java +++ b/src/main/java/nekiplay/meteorplus/mixin/whereisit/RenderingMixin.java @@ -40,7 +40,7 @@ private static void renderLabel(Vec3d pos, Text name, MatrixStack pose, Camera c pose.translate(pos.x, pos.y + whereIsIt.y_offset.get(), pos.z); pose.multiply(camera.getRotation()); - var factor = 0.025f * 1; + var factor = 0.025f * whereIsIt.text_scale.get().floatValue(); pose.scale(-factor, -factor, factor); var matrix4f = pose.peek().getPositionMatrix();