update to 1.21

common/src/main/java/dev/boxadactle/coordinatesdisplay/CoordinatesDisplay.java

@@ -14,10 +14,7 @@
 import dev.boxadactle.coordinatesdisplay.hud.Hud;
 import dev.boxadactle.coordinatesdisplay.config.ModConfig;
 import dev.boxadactle.coordinatesdisplay.hud.renderer.*;
-import dev.boxadactle.coordinatesdisplay.hud.visibility.AlwaysVisibility;
-import dev.boxadactle.coordinatesdisplay.hud.visibility.HoldCompassVisibility;
-import dev.boxadactle.coordinatesdisplay.hud.visibility.NeverVisibility;
-import dev.boxadactle.coordinatesdisplay.hud.visibility.OwnCompassVisibility;
+import dev.boxadactle.coordinatesdisplay.hud.visibility.*;
 import dev.boxadactle.coordinatesdisplay.position.Position;
 
 public class CoordinatesDisplay {
@@ -73,6 +70,8 @@ public static void init() {
 		CoordinatesHuds.registerVisibilityFilter(NeverVisibility.class);
 		CoordinatesHuds.registerVisibilityFilter(HoldCompassVisibility.class);
 		CoordinatesHuds.registerVisibilityFilter(OwnCompassVisibility.class);
+		CoordinatesHuds.registerVisibilityFilter(HoldMapVisibility.class);
+		CoordinatesHuds.registerVisibilityFilter(OwnMapVisibility.class);
 
 		LOGGER.info("Registering client commands");
 		BCommandManager.register(CoordinatesCommand.create());

common/src/main/java/dev/boxadactle/coordinatesdisplay/ModUtil.java

@@ -20,6 +20,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.text.DecimalFormat;
+import java.util.Objects;
 
 @SuppressWarnings("unchecked")
 public class ModUtil {
@@ -39,13 +40,13 @@ public static String parseText(String text, Position pos) {
 
         String direction = getDirectionFromYaw(Mth.wrapDegrees(c.cameraEntity.getXRot()));
 
-        Pair[] supported = new Pair[]{
+        Pair<String, ?>[] supported = new Pair[]{
                 new Pair<>("dimension", pos.world.getDimension(true)),
                 new Pair<>("x", x),
                 new Pair<>("y", y),
                 new Pair<>("z", z),
                 new Pair<>("direction", direction),
-                new Pair<>("name", c.player.getDisplayName().getString())
+                new Pair<>("name", Objects.requireNonNull(c.player.getDisplayName()).getString())
         };
         for (Pair<?, ?> pair : supported) {
             newTextComponent = newTextComponent.replaceAll("\\{" + pair.getFirst() + "}", (String) pair.getSecond());
@@ -210,10 +211,6 @@ public static <T> boolean not(T val, T ...compare) {
         return toReturn;
     }
 
-    public static BlockPos toBlockPos(Vec3<Integer> pos) {
-        return new BlockPos(pos.getX(), pos.getY(), pos.getZ());
-    }
-
     public static Vec3i doubleVecToIntVec(net.minecraft.world.phys.Vec3 vec) {
         return new Vec3i((int)Math.round(vec.x), (int)Math.round(vec.y), (int)Math.round(vec.z));
     }

common/src/main/java/dev/boxadactle/coordinatesdisplay/hud/renderer/SpawnpointRenderer.java

@@ -35,10 +35,10 @@
 )
 public class SpawnpointRenderer implements HudRenderer {
 
-    public static ResourceLocation SOUTH = new ResourceLocation("textures/item/compass_00.png");
-    public static ResourceLocation WEST = new ResourceLocation("textures/item/compass_07.png");
-    public static ResourceLocation NORTH = new ResourceLocation("textures/item/compass_16.png");
-    public static ResourceLocation EAST = new ResourceLocation("textures/item/compass_25.png");
+    public static ResourceLocation SOUTH = ResourceLocation.withDefaultNamespace("textures/item/compass_00.png");
+    public static ResourceLocation WEST = ResourceLocation.withDefaultNamespace("textures/item/compass_07.png");
+    public static ResourceLocation NORTH = ResourceLocation.withDefaultNamespace("textures/item/compass_16.png");
+    public static ResourceLocation EAST = ResourceLocation.withDefaultNamespace("textures/item/compass_25.png");
 
     // unfortunately, I don't think you can access the player's
     // spawnpoint unless your mod is server-side
@@ -199,7 +199,7 @@ private ResourceLocation resolveCompassTexture(double d) {
             };
 
             String texture = "textures/" + textures[(int) (range1 * textures.length)] + ".png";
-            return new ResourceLocation("minecraft", texture);
+            return ResourceLocation.withDefaultNamespace(texture);
         }
 
         @Override

common/src/main/java/dev/boxadactle/coordinatesdisplay/hud/visibility/HoldMapVisibility.java

@@ -0,0 +1,17 @@
+package dev.boxadactle.coordinatesdisplay.hud.visibility;
+
+import dev.boxadactle.boxlib.util.WorldUtils;
+import dev.boxadactle.coordinatesdisplay.hud.HudVisibility;
+import dev.boxadactle.coordinatesdisplay.hud.HudVisibilityFilter;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+
+@HudVisibility("hold_map")
+public class HoldMapVisibility implements HudVisibilityFilter {
+    @Override
+    public boolean isVisible() {
+        ItemStack p = WorldUtils.getPlayer().getInventory().getSelected();
+
+        return p.is(Items.MAP) || p.is(Items.FILLED_MAP);
+    }
+}

common/src/main/java/dev/boxadactle/coordinatesdisplay/hud/visibility/OwnMapVisibility.java

@@ -0,0 +1,22 @@
+package dev.boxadactle.coordinatesdisplay.hud.visibility;
+
+import dev.boxadactle.boxlib.util.WorldUtils;
+import dev.boxadactle.coordinatesdisplay.hud.HudVisibility;
+import dev.boxadactle.coordinatesdisplay.hud.HudVisibilityFilter;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.item.Items;
+
+@HudVisibility("own_map")
+public class OwnMapVisibility implements HudVisibilityFilter {
+    @Override
+    public boolean isVisible() {
+        Inventory inventory = WorldUtils.getPlayer().getInventory();
+
+        return inventory.contains((itemStack -> {
+            if (itemStack.isEmpty()) {
+                return false;
+            }
+            return itemStack.is(Items.MAP) || itemStack.is(Items.FILLED_MAP);
+        }));
+    }
+}

common/src/main/resources/assets/coordinatesdisplay/lang/en_us.json

@@ -96,6 +96,8 @@
   "hud.coordinatesdisplay.filter.never": "Never",
   "hud.coordinatesdisplay.filter.hold_compass": "Holding a Compass",
   "hud.coordinatesdisplay.filter.own_compass": "Have a Compass",
+  "hud.coordinatesdisplay.filter.hold_map": "Holding a Map",
+  "hud.coordinatesdisplay.filter.own_map": "Have a Map",
 
   "screen.coordinatesdisplay.config": "Config for %s",
   "screen.coordinatesdisplay.confirmreset": "Confirm Reset to Default",

common/src/main/resources/assets/coordinatesdisplay/lang/es_es.json

@@ -1,5 +1,4 @@
 {
-  "key.coordinatesdisplay.visible": "Conmutar el HUD",
   "key.coordinatesdisplay.coordinatesgui": "Abrir GUI de coordenadas",
   "key.coordinatesdisplay.copypos": "Copiar la posición actual al portapapel",
   "key.coordinatesdisplay.sendpos": "Enviar la posición actual en chat",
@@ -93,6 +92,13 @@
   "hud.coordinatesdisplay.direction.positive": "%s positivo",
   "hud.coordinatesdisplay.direction.negative": "%s negativo",
 
+  "hud.coordinatesdisplay.filter.always": "Siempre",
+  "hud.coordinatesdisplay.filter.never": "Nunca",
+  "hud.coordinatesdisplay.filter.hold_compass": "Sostener una brújula",
+  "hud.coordinatesdisplay.filter.own_compass": "Tener una brújula",
+  "hud.coordinatesdisplay.filter.hold_map": "Sostener un mapa",
+  "hud.coordinatesdisplay.filter.own_map": "Tener un mapa",
+
   "screen.coordinatesdisplay.config": "Configuración de %s",
   "screen.coordinatesdisplay.confirmreset": "Confirme que desea restaurar la configurción por defecto",
   "screen.coordinatesdisplay.render": "Configuración de renderizado de %s",
@@ -108,7 +114,6 @@
   "button.coordinatesdisplay.colorconfig": "Colores...",
   "button.coordinatesdisplay.deathpos": "Posición de muerte...",
   "button.coordinatesdisplay.text": "Ajustes de texto...",
-  "button.coordinatesdisplay.visible": "Activado: %s",
   "button.coordinatesdisplay.decimalPlaces": "Cantidad de decimales: %s",
   "button.coordinatesdisplay.decimalPlaces.block_pos": "posición de bloque",
   "button.coordinatesdisplay.displayMode": "Modo: %s",
@@ -171,7 +176,6 @@
 
   "command.coordinatesdisplay.emptyArgs": "Error: por favor envia un subcomando válido",
   "command.coordinatesdisplay.internalError": "Un error interno se ha ocurrido",
-  "command.coordinatesdisplay.togglemessage": "¡El hud se ha conmutado!",
   "command.coordinatesdisplay.position.copy": "La posición se ha copiado al portapapel.",
   "command.coordinatesdisplay.position.copytp": "La posición se ha copiado como un comando de /tp",
   "command.coordinatesdisplay.config.reload": "¡Refrescó la configuración!",
@@ -184,6 +188,5 @@
   "command.coordinatesdisplay.help": "Help: Mostrar esta lista.",
   "command.coordinatesdisplay.mode": "Mode: Seleccionar el modo de visualizaciòn que quieres renderizar en la pantalla.",
   "command.coordinatesdisplay.movehud": "Movehud: Abrir el menù donde se puede mover el superposiciòn.",
-  "command.coordinatesdisplay.position": "Position: Hacer cosas con su posiciòn, como enviar en el chat, y copiando al portapapeles.",
-  "command.coordinatesdisplay.toggle": "Toggle: Conmutar activado/desactivado el superposiciòn."
+  "command.coordinatesdisplay.position": "Position: Hacer cosas con su posiciòn, como enviar en el chat, y copiando al portapapeles."
 }

common/src/main/resources/assets/coordinatesdisplay/lang/ja_jp.json

@@ -1,5 +1,4 @@
 {
-  "key.coordinatesdisplay.visible": "HUDの切り替え",
   "key.coordinatesdisplay.coordinatesgui": "座標GUIを開く",
   "key.coordinatesdisplay.copypos": "現在の位置をクリップボードにコピー",
   "key.coordinatesdisplay.sendpos": "現在の位置をチャットで送信",
@@ -93,6 +92,13 @@
   "hud.coordinatesdisplay.direction.positive": "positive %s",
   "hud.coordinatesdisplay.direction.negative": "negative %s",
 
+  "hud.coordinatesdisplay.filter.always": "Always",
+  "hud.coordinatesdisplay.filter.never": "Never",
+  "hud.coordinatesdisplay.filter.hold_compass": "Holding a Compass",
+  "hud.coordinatesdisplay.filter.own_compass": "Have a Compass",
+  "hud.coordinatesdisplay.filter.hold_map": "Holding a Map",
+  "hud.coordinatesdisplay.filter.own_map": "Have a Map",
+
   "screen.coordinatesdisplay.config": "%sの設定",
   "screen.coordinatesdisplay.confirmreset": "デフォルトにリセットを確認",
   "screen.coordinatesdisplay.render": "%sの描画設定",
@@ -108,7 +114,6 @@
   "button.coordinatesdisplay.colorconfig": "色設定...",
   "button.coordinatesdisplay.deathpos": "死亡位置設定...",
   "button.coordinatesdisplay.text": "テキスト設定...",
-  "button.coordinatesdisplay.visible": "表示: %s",
   "button.coordinatesdisplay.decimalPlaces": "小数点以下桁数: %s",
   "button.coordinatesdisplay.decimalPlaces.block_pos": "ブロック位置",
   "button.coordinatesdisplay.displayMode": "表示モード: %s",
@@ -171,7 +176,6 @@
 
   "command.coordinatesdisplay.emptyArgs": "エラー: 有効なサブコマンドを入力してください",
   "command.coordinatesdisplay.internalError": "内部エラーが発生しました。",
-  "command.coordinatesdisplay.togglemessage": "HUDの切り替えが完了しました！",
   "command.coordinatesdisplay.position.copy": "位置をクリップボードにコピーしました！",
   "command.coordinatesdisplay.position.copytp": "/tpコマンドとして位置をコピーしました",
   "command.coordinatesdisplay.config.reload": "設定をリロードしました！",
@@ -184,6 +188,5 @@
   "command.coordinatesdisplay.help": "Help: このリストを表示します。",
   "command.coordinatesdisplay.mode": "Mode: 画面に表示される表示モードを選択します。",
   "command.coordinatesdisplay.movehud": "Movehud: HUDを移動できるGUIを開きます。",
-  "command.coordinatesdisplay.position": "Position: 位置に関する操作を行います。例: チャットに送信、クリップボードにコピー。",
-  "command.coordinatesdisplay.toggle": "Toggle: HUDの表示を切り替えます。"
+  "command.coordinatesdisplay.position": "Position: 位置に関する操作を行います。例: チャットに送信、クリップボードにコピー。"
 }

common/src/main/resources/assets/coordinatesdisplay/lang/ko_kr.json

@@ -1,5 +1,4 @@
 {
-  "key.coordinatesdisplay.visible": "HUD 토글",
   "key.coordinatesdisplay.coordinatesgui": "좌표 GUI 열기",
   "key.coordinatesdisplay.copypos": "현재 위치를 클립 보드로 복사하십시오",
   "key.coordinatesdisplay.sendpos": "채팅에서 현재 위치를 보내십시오",
@@ -93,6 +92,13 @@
   "hud.coordinatesdisplay.direction.positive": "positive %s",
   "hud.coordinatesdisplay.direction.negative": "negative %s",
 
+  "hud.coordinatesdisplay.filter.always": "Always",
+  "hud.coordinatesdisplay.filter.never": "Never",
+  "hud.coordinatesdisplay.filter.hold_compass": "Holding a Compass",
+  "hud.coordinatesdisplay.filter.own_compass": "Have a Compass",
+  "hud.coordinatesdisplay.filter.hold_map": "Holding a Map",
+  "hud.coordinatesdisplay.filter.own_map": "Have a Map",
+
   "screen.coordinatesdisplay.config": "%s 환경설정",
   "screen.coordinatesdisplay.confirmreset": "기본값으로 초기화 확인",
   "screen.coordinatesdisplay.render": "%s 의 렌더링 구성",
@@ -108,7 +114,6 @@
   "button.coordinatesdisplay.colorconfig": "색상...",
   "button.coordinatesdisplay.deathpos": "죽음의 위치",
   "button.coordinatesdisplay.text": "텍스트 설정...",
-  "button.coordinatesdisplay.visible": "화면에 표시: %s",
   "button.coordinatesdisplay.decimalPlaces": "소수점 표시: %s",
   "button.coordinatesdisplay.decimalPlaces.block_pos": "블록 위치",
   "button.coordinatesdisplay.displayMode": "Display Mode: %s",
@@ -171,7 +176,6 @@
 
   "command.coordinatesdisplay.emptyArgs": "Error: please enter a valid sub-command",
   "command.coordinatesdisplay.internalError": "An internal error has occurred.",
-  "command.coordinatesdisplay.togglemessage": "Toggled Hud!",
   "command.coordinatesdisplay.position.copy": "Copied the location to the clipboard!",
   "command.coordinatesdisplay.position.copytp": "Copied position as /tp command",
   "command.coordinatesdisplay.config.reload": "Reloaded config!",
@@ -184,6 +188,5 @@
   "command.coordinatesdisplay.help": "Help: View this list.",
   "command.coordinatesdisplay.mode": "Mode: Select the display mode you want to be rendered on the screen.",
   "command.coordinatesdisplay.movehud": "Movehud: Open the gui where you can move the HUD.",
-  "command.coordinatesdisplay.position": "Position: Do things with your position, such as sending in chat, and copying to the clipboard.",
-  "command.coordinatesdisplay.toggle": "Toggle: Toggle on/off the HUD."
+  "command.coordinatesdisplay.position": "Position: Do things with your position, such as sending in chat, and copying to the clipboard."
 }

common/src/main/resources/assets/coordinatesdisplay/lang/ru_ru.json

@@ -1,5 +1,4 @@
 {
-  "key.coordinatesdisplay.visible": "Переключить Hud",
   "key.coordinatesdisplay.coordinatesgui": "Открыть GUI для координат",
   "key.coordinatesdisplay.copypos": "Скопировать текущую позицию в буфер обмена",
   "key.coordinatesdisplay.sendpos": "Скопирать текущую позицию в чат",
@@ -93,6 +92,13 @@
   "hud.coordinatesdisplay.direction.positive": "positive %s",
   "hud.coordinatesdisplay.direction.negative": "negative %s",
 
+  "hud.coordinatesdisplay.filter.always": "Always",
+  "hud.coordinatesdisplay.filter.never": "Never",
+  "hud.coordinatesdisplay.filter.hold_compass": "Holding a Compass",
+  "hud.coordinatesdisplay.filter.own_compass": "Have a Compass",
+  "hud.coordinatesdisplay.filter.hold_map": "Holding a Map",
+  "hud.coordinatesdisplay.filter.own_map": "Have a Map",
+
   "screen.coordinatesdisplay.config": "Конфигурация для %s",
   "screen.coordinatesdisplay.confirmreset": "Подтвердить сброс настроек по умолчанию",
   "screen.coordinatesdisplay.render": "Рендеринг конфигурации для %s",
@@ -108,7 +114,6 @@
   "button.coordinatesdisplay.colorconfig": "Цвета...",
   "button.coordinatesdisplay.deathpos": "Позиция смерти...",
   "button.coordinatesdisplay.text": "Текстовые настройки...",
-  "button.coordinatesdisplay.visible": "Видимый: %s",
   "button.coordinatesdisplay.decimalPlaces": "Decimal Places: %s",
   "button.coordinatesdisplay.decimalPlaces.block_pos": "позиция блока",
   "button.coordinatesdisplay.displayMode": "Display Mode: %s",
@@ -171,7 +176,6 @@
 
   "command.coordinatesdisplay.emptyArgs": "Error: please enter a valid sub-command",
   "command.coordinatesdisplay.internalError": "An internal error has occurred.",
-  "command.coordinatesdisplay.togglemessage": "Toggled Hud!",
   "command.coordinatesdisplay.position.copy": "Copied the location to the clipboard!",
   "command.coordinatesdisplay.position.copytp": "Copied position as /tp command",
   "command.coordinatesdisplay.config.reload": "Reloaded config!",
@@ -184,6 +188,5 @@
   "command.coordinatesdisplay.help": "Help: View this list.",
   "command.coordinatesdisplay.mode": "Mode: Select the display mode you want to be rendered on the screen.",
   "command.coordinatesdisplay.movehud": "Movehud: Open the gui where you can move the HUD.",
-  "command.coordinatesdisplay.position": "Position: Do things with your position, such as sending in chat, and copying to the clipboard.",
-  "command.coordinatesdisplay.toggle": "Toggle: Toggle on/off the HUD."
+  "command.coordinatesdisplay.position": "Position: Do things with your position, such as sending in chat, and copying to the clipboard."
 }

fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/CoordinatesDisplayFabric.java

@@ -9,6 +9,7 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
+import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.world.entity.player.Player;
@@ -33,7 +34,7 @@ private void checkBindings(Minecraft client) {
         }
     }
 
-    private void renderHud(GuiGraphics guiGraphics, float tickDelta) {
+    private void renderHud(GuiGraphics guiGraphics, DeltaTracker tickDelta) {
         if (CoordinatesDisplay.HUD.shouldRender(CoordinatesDisplay.getConfig().visibilityFilter)) {
             try {
                 RenderSystem.enableBlend();

fabric/src/main/resources/fabric.mod.json

@@ -24,9 +24,9 @@
     "coordinatesdisplay-common.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.14.21",
-    "minecraft": ">=1.20.5",
-    "boxlib": ">=13.1.0",
-    "fabric-api": ">=0.97.5"
+    "fabricloader": ">=0.15.10",
+    "minecraft": ">=1.21",
+    "boxlib": ">=14.0.0",
+    "fabric-api": ">=0.100.0"
   }
 }

gradle.properties

@@ -3,24 +3,25 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # Mod properties
-mod_version = 10.0.1
+mod_version = 11.0.0
 maven_group = dev.boxadactle
 archives_name = CoordinatesDisplay
 enabled_platforms = fabric,neoforge
 
 # Minecraft properties
-minecraft_version = 1.20.6
+minecraft_version = 1.21
 
 # Dependencies
+#architectury_api_version = 11.1.17
 fabric_loader_version = 0.15.11
-fabric_api_version = 0.97.8+1.20.6
-neoforge_version = 20.6.57-beta
+fabric_api_version = 0.100.3+1.21
+neoforge_version = 21.0.37-beta
 
-boxlib_version=13.1.0
-modmenu_version=10.0.0-beta.1
+modmenu_version = 11.0.1
+boxlib_version = 14.0.0
 
 # publishing
-game_versions = 1.20.5,1.20.6
+game_versions = 1.21
 project_id_curseforge = 646464
 project_id_modrinth = 3mW8PdUo
 release_type = release

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -16,21 +16,21 @@ logoFile = "icon.png"
 [[dependencies.coordinatesdisplay]]
 modId = "neoforge"
 type = "required"
-versionRange = "[20.5,)"
+versionRange = "[21,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.coordinatesdisplay]]
 modId = "minecraft"
 type = "required"
-versionRange = "[1.20.5,)"
+versionRange = "[1.21,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.coordinatesdisplay]]
 modId = "boxlib"
 type = "required"
-versionRange = "[13.1.0, 14.0.0)"
+versionRange = "[14.0.0, 15.0.0)"
 ordering = "NONE"
 side = "BOTH"