From e81d6756c717194b12bfa860dd8f486b0f0a758e Mon Sep 17 00:00:00 2001 From: rfresh2 <89827146+rfresh2@users.noreply.github.com> Date: Sat, 7 Dec 2024 14:53:06 -0800 Subject: [PATCH 1/6] loom 1.9 --- buildSrc/build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index ce2db947..75c4c71d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -12,7 +12,7 @@ repositories { dependencies { implementation("architectury-plugin:architectury-plugin.gradle.plugin:3.4-SNAPSHOT") - implementation("dev.architectury:architectury-loom:1.7-SNAPSHOT") + implementation("dev.architectury:architectury-loom:1.9-SNAPSHOT") implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.5") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72b..e2847c82 100644 --- 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.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From e86d424f0b7b435267e0d3d88eddbdd785668585 Mon Sep 17 00:00:00 2001 From: rfresh2 <89827146+rfresh2@users.noreply.github.com> Date: Sun, 8 Dec 2024 15:36:38 -0800 Subject: [PATCH 2/6] fix forge runclient --- forge/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts index 61b1b251..9e1e66c0 100644 --- a/forge/build.gradle.kts +++ b/forge/build.gradle.kts @@ -54,7 +54,7 @@ dependencies { modCompileOnly(libs.fabric.waystones) modCompileOnly(libs.embeddium) shadow(libs.sqlite) - implementation(include(libs.oldbiomes.get())!!) + forgeRuntimeLibrary(implementation(include(libs.oldbiomes.get())!!)!!) forgeRuntimeLibrary(implementation(include(libs.caffeine.get())!!)!!) forgeRuntimeLibrary(implementation(include(libs.lambdaEvents.get())!!)!!) compileOnly(project(":common")) From 8abe92565a44a862926d3fabf681887d9659f625 Mon Sep 17 00:00:00 2001 From: rfresh2 <89827146+rfresh2@users.noreply.github.com> Date: Sun, 8 Dec 2024 17:23:45 -0800 Subject: [PATCH 3/6] long waypoint initials setting --- .../mixin/client/MixinGuiAddWaypoint.java | 22 +++++++++++++++++++ .../java/xaeroplus/settings/Settings.java | 6 +++++ .../assets/xaeroplus/lang/en_us.json | 2 ++ .../assets/xaeroplus/lang/es_ar.json | 2 ++ .../assets/xaeroplus/lang/fr_ca.json | 2 ++ .../assets/xaeroplus/lang/fr_fr.json | 2 ++ .../assets/xaeroplus/lang/ja_jp.json | 2 ++ .../assets/xaeroplus/lang/pl_pl.json | 2 ++ .../assets/xaeroplus/lang/pt_pt.json | 2 ++ .../assets/xaeroplus/lang/ru_ru.json | 2 ++ .../assets/xaeroplus/lang/vi_vn.json | 2 ++ .../assets/xaeroplus/lang/zh_cn.json | 2 ++ .../assets/xaeroplus/lang/zh_tw.json | 2 ++ .../src/main/resources/xaeroplus.mixins.json | 1 + 14 files changed, 51 insertions(+) create mode 100644 common/src/main/java/xaeroplus/mixin/client/MixinGuiAddWaypoint.java diff --git a/common/src/main/java/xaeroplus/mixin/client/MixinGuiAddWaypoint.java b/common/src/main/java/xaeroplus/mixin/client/MixinGuiAddWaypoint.java new file mode 100644 index 00000000..9c0c5941 --- /dev/null +++ b/common/src/main/java/xaeroplus/mixin/client/MixinGuiAddWaypoint.java @@ -0,0 +1,22 @@ +package xaeroplus.mixin.client; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; +import xaero.common.gui.GuiAddWaypoint; +import xaeroplus.settings.Settings; + +@Mixin(value = GuiAddWaypoint.class, remap = false) +public class MixinGuiAddWaypoint { + @ModifyConstant( + method = "checkFields", + constant = @Constant( + intValue = 2 + ) + ) + public int allowLongerInitials(int original) { + return Settings.REGISTRY.longWaypointInitials.get() + ? 100 + : original; + } +} diff --git a/common/src/main/java/xaeroplus/settings/Settings.java b/common/src/main/java/xaeroplus/settings/Settings.java index 95f4f57a..8d7e1209 100644 --- a/common/src/main/java/xaeroplus/settings/Settings.java +++ b/common/src/main/java/xaeroplus/settings/Settings.java @@ -678,6 +678,12 @@ public String getTranslationKey() { "xaeroplus.setting.waypoint_eta", false), SettingLocation.MINIMAP_WAYPOINTS); + public final BooleanSetting longWaypointInitials = register( + BooleanSetting.create( + "Long Waypoint Initials", + "xaeroplus.setting.allow_longer_waypoint_initials", + false), + SettingLocation.MINIMAP_WAYPOINTS); public final BooleanSetting disableWaypointSharing = register( BooleanSetting.create( "Disable Waypoint Sharing", diff --git a/common/src/main/resources/assets/xaeroplus/lang/en_us.json b/common/src/main/resources/assets/xaeroplus/lang/en_us.json index 8072884c..3d19e788 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/en_us.json +++ b/common/src/main/resources/assets/xaeroplus/lang/en_us.json @@ -178,6 +178,8 @@ "xaeroplus.setting.waypoint_beacon_distance_min.tooltip": "Sets the minimum xz distance from the player the waypoint must be to render a beacon.", "xaeroplus.setting.waypoint_eta": "Waypoint Distance ETA", "xaeroplus.setting.waypoint_eta.tooltip": "Renders the estimated time of arrival on waypoint distance text. The ETA is based on the player's current speed and movement direction", + "xaeroplus.setting.allow_longer_waypoint_initials": "Long Waypoint Initials", + "xaeroplus.setting.allow_longer_waypoint_initials.tooltip": "Removes the 2 character size limit when editing waypoint initials", "xaeroplus.setting.disable_internet": "Disable Xaero Internet Access", "xaeroplus.setting.disable_internet.tooltip": "Disables WorldMap and Minimap mods from using the internet to check for updates and patreon subscriptions at launch.\n Xaero mods do not expose this setting in the GUI normally.\n XaeroPlus does not use the internet regardless of this setting.", "xaeroplus.setting.radar_hide_invisible_entities": "Hide Invisible Entities", diff --git a/common/src/main/resources/assets/xaeroplus/lang/es_ar.json b/common/src/main/resources/assets/xaeroplus/lang/es_ar.json index bf973c5f..37043386 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/es_ar.json +++ b/common/src/main/resources/assets/xaeroplus/lang/es_ar.json @@ -178,6 +178,8 @@ "xaeroplus.setting.waypoint_beacon_distance_min.tooltip": "Establece la distancia xz mínima desde el jugador donde el waypoint debe estar para mostrar un Beacon (faro).", "xaeroplus.setting.waypoint_eta": "Distancia del Punto de Referencia ETA", "xaeroplus.setting.waypoint_eta.tooltip": "Muestra el tiempo estimado de llegada en el texto de distancia del punto de referencia. El ETA se basa en la velocidad y dirección de movimiento actuales del jugador", + "xaeroplus.setting.allow_longer_waypoint_initials": "Iniciales de punto de referencia más largas", + "xaeroplus.setting.allow_longer_waypoint_initials.tooltip": "Elimina el límite de 2 caracteres al editar las iniciales del punto de referencia", "xaeroplus.setting.disable_internet": "Deshabilitar el acceso a Internet de Xaero", "xaeroplus.setting.disable_internet.tooltip": "Desactiva el uso de Internet de las modificaciones de WorldMap y Minimap para buscar actualizaciones y suscripciones a Patreon en el momento del lanzamiento.\n Los mods de Xaero normalmente no exponen esta configuración en la GUI.\n XaeroPlus no utiliza Internet independientemente de esta configuración.", "xaeroplus.setting.radar_hide_invisible_entities": "Ocultar entidades invisibles", diff --git a/common/src/main/resources/assets/xaeroplus/lang/fr_ca.json b/common/src/main/resources/assets/xaeroplus/lang/fr_ca.json index 11a98131..1868b927 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/fr_ca.json +++ b/common/src/main/resources/assets/xaeroplus/lang/fr_ca.json @@ -178,6 +178,8 @@ "xaeroplus.setting.waypoint_beacon_distance_min.tooltip": "Définit la distance xz minimale du joueur à laquelle le point de passage doit se trouver pour qu'une balise soit affichée.", "xaeroplus.setting.waypoint_eta": "Distance du Point de Passage ETA", "xaeroplus.setting.waypoint_eta.tooltip": "Affiche l'heure d'arrivée estimée sur le texte de distance du point de passage. L'ETA est basé sur la vitesse et la direction de déplacement actuelles du joueur", + "xaeroplus.setting.allow_longer_waypoint_initials": "Initiales de point de repère plus longues", + "xaeroplus.setting.allow_longer_waypoint_initials.tooltip": "Supprime la limite de 2 caractères lors de la modification des initiales des points de repère", "xaeroplus.setting.disable_internet": "Désactiver l'accès Internet Xaero", "xaeroplus.setting.disable_internet.tooltip": "Empêche les mods WorldMap et Minimap d'utiliser Internet pour vérifier les mises à jour et les abonnements Patreon au lancement.\n Les mods Xaero n'exposent pas normalement ce paramètre dans l'interface graphique.\n XaeroPlus n'utilise pas Internet quel que soit ce paramètre.", "xaeroplus.setting.radar_hide_invisible_entities": "Masquer les entités invisibles", diff --git a/common/src/main/resources/assets/xaeroplus/lang/fr_fr.json b/common/src/main/resources/assets/xaeroplus/lang/fr_fr.json index 11a98131..1868b927 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/fr_fr.json +++ b/common/src/main/resources/assets/xaeroplus/lang/fr_fr.json @@ -178,6 +178,8 @@ "xaeroplus.setting.waypoint_beacon_distance_min.tooltip": "Définit la distance xz minimale du joueur à laquelle le point de passage doit se trouver pour qu'une balise soit affichée.", "xaeroplus.setting.waypoint_eta": "Distance du Point de Passage ETA", "xaeroplus.setting.waypoint_eta.tooltip": "Affiche l'heure d'arrivée estimée sur le texte de distance du point de passage. L'ETA est basé sur la vitesse et la direction de déplacement actuelles du joueur", + "xaeroplus.setting.allow_longer_waypoint_initials": "Initiales de point de repère plus longues", + "xaeroplus.setting.allow_longer_waypoint_initials.tooltip": "Supprime la limite de 2 caractères lors de la modification des initiales des points de repère", "xaeroplus.setting.disable_internet": "Désactiver l'accès Internet Xaero", "xaeroplus.setting.disable_internet.tooltip": "Empêche les mods WorldMap et Minimap d'utiliser Internet pour vérifier les mises à jour et les abonnements Patreon au lancement.\n Les mods Xaero n'exposent pas normalement ce paramètre dans l'interface graphique.\n XaeroPlus n'utilise pas Internet quel que soit ce paramètre.", "xaeroplus.setting.radar_hide_invisible_entities": "Masquer les entités invisibles", diff --git a/common/src/main/resources/assets/xaeroplus/lang/ja_jp.json b/common/src/main/resources/assets/xaeroplus/lang/ja_jp.json index 022bcf9d..e0103a2b 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/ja_jp.json +++ b/common/src/main/resources/assets/xaeroplus/lang/ja_jp.json @@ -176,6 +176,8 @@ "xaeroplus.setting.waypoint_beacon_distance_min.tooltip": "ビーコンをレンダリングするために、ウェイポイントがプレイヤーからxzの最小距離を設定します。", "xaeroplus.setting.waypoint_eta": "ウェイポイント距離のETA", "xaeroplus.setting.waypoint_eta.tooltip": "プレイヤーの現在の速度と移動方向に基づいて、ウェイポイントの距離に推定到着時刻を表示します", + "xaeroplus.setting.allow_longer_waypoint_initials": "長いウェイポイントの頭文字を許可", + "xaeroplus.setting.allow_longer_waypoint_initials.tooltip": "ウェイポイントの頭文字を編集する際の2文字制限を解除します", "xaeroplus.setting.disable_internet": "Xaeroのインターネットアクセスを無効にする", "xaeroplus.setting.disable_internet.tooltip": "WorldMapとMinimapのMODが起動時にインターネットを使用してアップデートとパトロン購読をチェックするのを無効にします。\nXaeroのMODは通常GUIでこの設定を公開しません。\nXaeroPlusはこの設定に関係なくインターネットを使用しません。", "xaeroplus.setting.radar_hide_invisible_entities": "透明なエンティティを非表示", diff --git a/common/src/main/resources/assets/xaeroplus/lang/pl_pl.json b/common/src/main/resources/assets/xaeroplus/lang/pl_pl.json index 6f341e93..7266c5ce 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/pl_pl.json +++ b/common/src/main/resources/assets/xaeroplus/lang/pl_pl.json @@ -178,6 +178,8 @@ "xaeroplus.setting.waypoint_beacon_distance_min.tooltip": "Ustawia minimalny dystans na osiach xz od gracza, w której musi znajdować się punkt nawigacyjny, aby wyrenderować beacon.", "xaeroplus.setting.waypoint_eta": "ETA Dystansu do Punktu", "xaeroplus.setting.waypoint_eta.tooltip": "Wyświetla szacowany czas przybycia na tekście odległości do punktu. ETA opiera się na obecnej prędkości i kierunku ruchu gracza", + "xaeroplus.setting.allow_longer_waypoint_initials": "Dłuższe inicjały punktów orientacyjnych", + "xaeroplus.setting.allow_longer_waypoint_initials.tooltip": "Usuwa limit 2 znaków podczas edycji inicjałów punktów orientacyjnych", "xaeroplus.setting.disable_internet": "Wyłącz dostęp do Internetu Xaero", "xaeroplus.setting.disable_internet.tooltip": "Wyłącza modom WorldMap i Minimap korzystanie z Internetu w celu sprawdzania dostępności aktualizacji i subskrypcji Patreona przy uruchomieniu.\n Mody Xaero normalnie nie udostępniają tego ustawienia w GUI.\n XaeroPlus nie korzysta z Internetu niezależnie od tego ustawienia.", "xaeroplus.setting.radar_hide_invisible_entities": "Ukryj niewidzialne jednostki", diff --git a/common/src/main/resources/assets/xaeroplus/lang/pt_pt.json b/common/src/main/resources/assets/xaeroplus/lang/pt_pt.json index 7dfa80ce..3c582009 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/pt_pt.json +++ b/common/src/main/resources/assets/xaeroplus/lang/pt_pt.json @@ -178,6 +178,8 @@ "xaeroplus.setting.waypoint_beacon_distance_min.tooltip": "Define a distância xz mínima entre o jogador e a localização para renderizar o sinalizador.", "xaeroplus.setting.waypoint_eta": "ETA da Distância do Ponto de Referência", "xaeroplus.setting.waypoint_eta.tooltip": "Exibe o tempo estimado de chegada no texto de distância do ponto de referência. O ETA é baseado na velocidade e direção de movimento atuais do jogador", + "xaeroplus.setting.allow_longer_waypoint_initials": "Iniciais de ponto de referência mais longas", + "xaeroplus.setting.allow_longer_waypoint_initials.tooltip": "Remove o limite de 2 caracteres ao editar as iniciais do ponto de referência", "xaeroplus.setting.disable_internet": "Desati. Acesso à Internet ao Xaero", "xaeroplus.setting.disable_internet.tooltip": "Desativa o acesso à Internet para verificação de atualizações ou subscrição do Patreon dos mods do mapa-mundo e mini-mapa. \n Normalmente os mods Xaero não mostram esta configuração no GUI. \n O XaeroPlus não usa a Internet independentemente desta definição.", "xaeroplus.setting.radar_hide_invisible_entities": "Ocultar entidades invisíveis", diff --git a/common/src/main/resources/assets/xaeroplus/lang/ru_ru.json b/common/src/main/resources/assets/xaeroplus/lang/ru_ru.json index 900d06ac..f4dfe8aa 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/ru_ru.json +++ b/common/src/main/resources/assets/xaeroplus/lang/ru_ru.json @@ -178,6 +178,8 @@ "xaeroplus.setting.waypoint_beacon_distance_min.tooltip": "Задает минимальное расстояние xz от игрока, на котором должна находиться путевая точка для отображения маяка.", "xaeroplus.setting.waypoint_eta": "ETA расстояния до точки", "xaeroplus.setting.waypoint_eta.tooltip": "Отображает расчетное время прибытия на тексте расстояния до точки. ETA основано на текущей скорости и направлении движения игрока", + "xaeroplus.setting.allow_longer_waypoint_initials": "Более длинные инициалы путевых точек", + "xaeroplus.setting.allow_longer_waypoint_initials.tooltip": "Убирает ограничение в 2 символа при редактировании инициалов путевых точек", "xaeroplus.setting.disable_internet": "Отключить доступ Xaero в Интернет", "xaeroplus.setting.disable_internet.tooltip": "Отключает модам WorldMap и Minimap использование Интернета для проверки обновлений и подписок на Patreon при запуске.\n Моды Xaero обычно не отображают этот параметр в графическом интерфейсе.\n XaeroPlus не использует Интернет независимо от этой настройки.", "xaeroplus.setting.radar_hide_invisible_entities": "Скрыть невидимые сущности", diff --git a/common/src/main/resources/assets/xaeroplus/lang/vi_vn.json b/common/src/main/resources/assets/xaeroplus/lang/vi_vn.json index 31a3b5a4..06c8c903 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/vi_vn.json +++ b/common/src/main/resources/assets/xaeroplus/lang/vi_vn.json @@ -178,6 +178,8 @@ "xaeroplus.setting.waypoint_beacon_distance_min.tooltip": "Thiết lập khoảng cách xz tối thiểu từ người chơi mà điểm đến phải có để hiển thị đèn hiệu.", "xaeroplus.setting.waypoint_eta": "Khoảng cách đến Điểm Đường ETA", "xaeroplus.setting.waypoint_eta.tooltip": "Hiển thị thời gian đến ước tính trên văn bản khoảng cách đến điểm đường. ETA dựa trên tốc độ và hướng di chuyển hiện tại của người chơi", + "xaeroplus.setting.allow_longer_waypoint_initials": "Chữ viết tắt điểm tham chiếu dài hơn", + "xaeroplus.setting.allow_longer_waypoint_initials.tooltip": "Loại bỏ giới hạn 2 ký tự khi chỉnh sửa chữ viết tắt điểm tham chiếu", "xaeroplus.setting.disable_internet": "Vô Hiệu Hóa Truy Cập Internet Xaero", "xaeroplus.setting.disable_internet.tooltip": "Vô hiệu hóa các mod WorldMap và Minimap từ việc sử dụng internet để kiểm tra cập nhật và đăng ký patreon khi khởi động.\n Các mod Xaero không hiển thị cài đặt này trong giao diện người dùng bình thường.\n XaeroPlus không sử dụng internet bất kể cài đặt này.", "xaeroplus.setting.radar_hide_invisible_entities": "Ẩn thực thể vô hình", diff --git a/common/src/main/resources/assets/xaeroplus/lang/zh_cn.json b/common/src/main/resources/assets/xaeroplus/lang/zh_cn.json index c1265207..c558f9b7 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/zh_cn.json +++ b/common/src/main/resources/assets/xaeroplus/lang/zh_cn.json @@ -178,6 +178,8 @@ "xaeroplus.setting.waypoint_beacon_distance_min.tooltip": "设置将路径点渲染为信标所需的最短水平距离。", "xaeroplus.setting.waypoint_eta": "航点距离 ETA", "xaeroplus.setting.waypoint_eta.tooltip": "在航点距离文本上显示预计到达时间。ETA 基于玩家当前的速度和移动方向", + "xaeroplus.setting.allow_longer_waypoint_initials": "允许更长的航点缩写", + "xaeroplus.setting.allow_longer_waypoint_initials.tooltip": "移除编辑航点缩写时的2字符限制", "xaeroplus.setting.disable_internet": "禁用 Xaero 互联网访问", "xaeroplus.setting.disable_internet.tooltip": "禁止 WorldMap 和 Minimap mods 在启动时使用互联网检查更新和 patreon 订阅。\n Xaero mods 通常不会在 GUI 中公开此设置。\n 无论此设置如何，XaeroPlus 都不会使用互联网。", "xaeroplus.setting.radar_hide_invisible_entities": "隐藏隐形实体", diff --git a/common/src/main/resources/assets/xaeroplus/lang/zh_tw.json b/common/src/main/resources/assets/xaeroplus/lang/zh_tw.json index c5898939..7b89fe47 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/zh_tw.json +++ b/common/src/main/resources/assets/xaeroplus/lang/zh_tw.json @@ -178,6 +178,8 @@ "xaeroplus.setting.waypoint_beacon_distance_min.tooltip": "設定定位點必須與玩家的最小 xz 距離才能渲染信標。", "xaeroplus.setting.waypoint_eta": "航點距離 ETA", "xaeroplus.setting.waypoint_eta.tooltip": "在航點距離文本上顯示預計到達時間。ETA 基於玩家當前的速度和移動方向", + "xaeroplus.setting.allow_longer_waypoint_initials": "允許更長的航點縮寫", + "xaeroplus.setting.allow_longer_waypoint_initials.tooltip": "移除編輯航點縮寫時的2字符限制", "xaeroplus.setting.disable_internet": "停用 Xaero 網際網路存取", "xaeroplus.setting.disable_internet.tooltip": "停用世界地圖和小地圖模組在啟動時使用網際網路檢查更新和 Patreon 訂閱。\n Xaero 模組通常不會在介面中公開此設定。\n 無論此設定如何，XaeroPlus 都不会使用網際網路。", "xaeroplus.setting.radar_hide_invisible_entities": "隱藏隱形實體", diff --git a/common/src/main/resources/xaeroplus.mixins.json b/common/src/main/resources/xaeroplus.mixins.json index 1d3d5d20..bb21c4fc 100644 --- a/common/src/main/resources/xaeroplus.mixins.json +++ b/common/src/main/resources/xaeroplus.mixins.json @@ -23,6 +23,7 @@ "MixinControlsHandler", "MixinCrashHandler", "MixinDimensionHighlighterHandler", + "MixinGuiAddWaypoint", "MixinGuiEntityRadarSettings", "MixinGuiMap", "MixinGuiMinimapMain", From 73b5bc786808167040392f56603db411c03352d4 Mon Sep 17 00:00:00 2001 From: rfresh2 <89827146+rfresh2@users.noreply.github.com> Date: Sun, 8 Dec 2024 17:29:07 -0800 Subject: [PATCH 4/6] use ModifyExpressionValue instead of constant --- .../xaeroplus/mixin/client/MixinGuiAddWaypoint.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/xaeroplus/mixin/client/MixinGuiAddWaypoint.java b/common/src/main/java/xaeroplus/mixin/client/MixinGuiAddWaypoint.java index 9c0c5941..9aba905e 100644 --- a/common/src/main/java/xaeroplus/mixin/client/MixinGuiAddWaypoint.java +++ b/common/src/main/java/xaeroplus/mixin/client/MixinGuiAddWaypoint.java @@ -1,17 +1,18 @@ package xaeroplus.mixin.client; +import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.Constant; -import org.spongepowered.asm.mixin.injection.ModifyConstant; +import org.spongepowered.asm.mixin.injection.At; import xaero.common.gui.GuiAddWaypoint; import xaeroplus.settings.Settings; @Mixin(value = GuiAddWaypoint.class, remap = false) public class MixinGuiAddWaypoint { - @ModifyConstant( + @ModifyExpressionValue( method = "checkFields", - constant = @Constant( - intValue = 2 + at = @At( + value = "CONSTANT", + args = "intValue=2" ) ) public int allowLongerInitials(int original) { From c74587d19d26f26b75047e9a8aad6252fe47451c Mon Sep 17 00:00:00 2001 From: rfresh2 <89827146+rfresh2@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:21:44 -0800 Subject: [PATCH 5/6] dont tick highlight cache if session is null --- .../feature/render/highlights/ChunkHighlightSavingCache.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/java/xaeroplus/feature/render/highlights/ChunkHighlightSavingCache.java b/common/src/main/java/xaeroplus/feature/render/highlights/ChunkHighlightSavingCache.java index f2ce74eb..37d71e36 100644 --- a/common/src/main/java/xaeroplus/feature/render/highlights/ChunkHighlightSavingCache.java +++ b/common/src/main/java/xaeroplus/feature/render/highlights/ChunkHighlightSavingCache.java @@ -246,6 +246,7 @@ public int getMinimapRegionWindowSize() { @Override public void handleTick() { if (!worldCacheInitialized) return; + if (XaeroWorldMapCore.currentSession == null) return; // limit so we don't overflow if (tickCounter > 2400) tickCounter = 0; if (tickCounter++ % 30 != 0) { // run once every 1.5 seconds From fcab5b1b0f1938e3b6fd18c11d4c03a696de02d1 Mon Sep 17 00:00:00 2001 From: rfresh2 <89827146+rfresh2@users.noreply.github.com> Date: Fri, 13 Dec 2024 00:54:05 -0800 Subject: [PATCH 6/6] WM1.39.2 --- settings.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index b6d08755..40c651a9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,12 +8,12 @@ pluginManagement { } } gradle.extra.apply { - set("mod_version", "2.24.7") + set("mod_version", "2.24.8") set("minecraft_version", "1.20.1") set("parchment_version", "2023.09.03") - set("worldmap_version_fabric", "1.39.0") + set("worldmap_version_fabric", "1.39.2") set("minimap_version_fabric", "24.6.1") - set("worldmap_version_forge", "1.39.0") + set("worldmap_version_forge", "1.39.2") set("minimap_version_forge", "24.6.1") }