diff --git a/README.md b/README.md index 1908c4f..0ccf5ab 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Coordinates Display is a Client-side mod that adds an HUD to show your position, # Dependencies -Both versions of this mod embed [BoxLib](https://github.com/Boxadactle/BoxLib/), a Client-side library mod developed by me. +#### Versions 10.0.0+ of this mod require [BoxLib](https://modrinth.com/mod/boxlib) a Client-side library mod developed by me. ## Fabric diff --git a/common/src/main/java/dev/boxadactle/coordinatesdisplay/CoordinatesDisplay.java b/common/src/main/java/dev/boxadactle/coordinatesdisplay/CoordinatesDisplay.java index a24fdff..cece272 100644 --- a/common/src/main/java/dev/boxadactle/coordinatesdisplay/CoordinatesDisplay.java +++ b/common/src/main/java/dev/boxadactle/coordinatesdisplay/CoordinatesDisplay.java @@ -1,21 +1,20 @@ package dev.boxadactle.coordinatesdisplay; import com.mojang.blaze3d.platform.InputConstants; +import dev.boxadactle.boxlib.command.BCommandManager; import dev.boxadactle.boxlib.config.BConfigClass; import dev.boxadactle.boxlib.config.BConfigHandler; import dev.boxadactle.boxlib.util.ClientUtils; import dev.boxadactle.boxlib.util.ModLogger; import dev.boxadactle.boxlib.util.WorldUtils; +import dev.boxadactle.coordinatesdisplay.command.CoordinatesCommand; import dev.boxadactle.coordinatesdisplay.config.screen.ConfigScreen; import dev.boxadactle.coordinatesdisplay.config.screen.HudPositionScreen; import dev.boxadactle.coordinatesdisplay.hud.CoordinatesHuds; 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 { @@ -71,6 +70,11 @@ 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()); LOGGER.info("Initializing hud"); HUD = new Hud(); diff --git a/common/src/main/java/dev/boxadactle/coordinatesdisplay/CoordinatesScreen.java b/common/src/main/java/dev/boxadactle/coordinatesdisplay/CoordinatesScreen.java index d4bf357..bd32790 100644 --- a/common/src/main/java/dev/boxadactle/coordinatesdisplay/CoordinatesScreen.java +++ b/common/src/main/java/dev/boxadactle/coordinatesdisplay/CoordinatesScreen.java @@ -31,6 +31,7 @@ public CoordinatesScreen(Position pos) { @Override public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) { this.renderBackground(guiGraphics, mouseX, mouseY, delta); + super.render(guiGraphics, mouseX, mouseY, delta); Vec3 player = pos.position.getPlayerPos(); @@ -40,8 +41,6 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) guiGraphics.drawCenteredString(this.font, Component.translatable("message.coordinatesdisplay.at"), this.width / 2, (this.height / 4) - 20, GuiUtils.WHITE); guiGraphics.drawCenteredString(this.font, Component.translatable("message.coordinatesdisplay.location", x, y, z), this.width / 2, (this.height / 4), GuiUtils.WHITE); - - super.render(guiGraphics, mouseX, mouseY, delta); } @Override diff --git a/common/src/main/java/dev/boxadactle/coordinatesdisplay/ModUtil.java b/common/src/main/java/dev/boxadactle/coordinatesdisplay/ModUtil.java index 9adf69a..01138b8 100644 --- a/common/src/main/java/dev/boxadactle/coordinatesdisplay/ModUtil.java +++ b/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[] 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 boolean not(T val, T ...compare) { return toReturn; } - public static BlockPos toBlockPos(Vec3 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)); } diff --git a/common/src/main/java/dev/boxadactle/coordinatesdisplay/command/ConfigSubcommand.java b/common/src/main/java/dev/boxadactle/coordinatesdisplay/command/ConfigSubcommand.java new file mode 100644 index 0000000..bba1b91 --- /dev/null +++ b/common/src/main/java/dev/boxadactle/coordinatesdisplay/command/ConfigSubcommand.java @@ -0,0 +1,58 @@ +package dev.boxadactle.coordinatesdisplay.command; + +import com.mojang.brigadier.builder.ArgumentBuilder; +import com.mojang.brigadier.context.CommandContext; +import dev.boxadactle.boxlib.command.BCommandManager; +import dev.boxadactle.boxlib.command.BCommandSourceStack; +import dev.boxadactle.boxlib.command.api.BClientSubcommand; +import dev.boxadactle.boxlib.util.GuiUtils; +import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; +import dev.boxadactle.coordinatesdisplay.ModUtil; + +public class ConfigSubcommand implements BClientSubcommand { + @Override + public ArgumentBuilder getSubcommand() { + return BCommandManager.literal("config") + .executes(this::openConfigGui); + } + + @Override + public void build(ArgumentBuilder builder) { + builder.then(BCommandManager.literal("file") + .executes(this::openConfigFile) + ); + + builder.then(BCommandManager.literal("reload") + .executes(this::reloadConfig) + ); + + builder.then(BCommandManager.literal("gui") + .executes(this::openConfigGui) + ); + } + + private int openConfigGui(CommandContext ignored) { + CoordinatesDisplay.shouldConfigGuiOpen = true; + CoordinatesDisplay.LOGGER.info("Opening Config GUI"); + + return 0; + } + + private int openConfigFile(CommandContext ignored) { + if (ModUtil.openConfigFile()) { + CoordinatesDisplay.LOGGER.player.info(GuiUtils.getTranslatable("command.coordinatesdisplay.config.open.success")); + return 0; + } else { + CoordinatesDisplay.LOGGER.info(GuiUtils.getTranslatable("command.coordinatesdisplay.config.open.fail")); + return 1; + } + } + + private int reloadConfig(CommandContext ignored) { + CoordinatesDisplay.CONFIG.reload(); + CoordinatesDisplay.LOGGER.player.info(GuiUtils.getTranslatable("command.coordinatesdisplay.config.reload")); + CoordinatesDisplay.LOGGER.info("Reloaded all config"); + + return 0; + } +} diff --git a/common/src/main/java/dev/boxadactle/coordinatesdisplay/command/CoordinatesCommand.java b/common/src/main/java/dev/boxadactle/coordinatesdisplay/command/CoordinatesCommand.java new file mode 100644 index 0000000..7c852ed --- /dev/null +++ b/common/src/main/java/dev/boxadactle/coordinatesdisplay/command/CoordinatesCommand.java @@ -0,0 +1,58 @@ +package dev.boxadactle.coordinatesdisplay.command; + +import com.google.common.collect.ImmutableList; +import com.mojang.brigadier.context.CommandContext; +import dev.boxadactle.boxlib.command.BCommandSourceStack; +import dev.boxadactle.boxlib.command.api.BClientCommand; +import dev.boxadactle.boxlib.util.GuiUtils; +import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; +import net.minecraft.network.chat.Component; + +import java.util.List; + +public class CoordinatesCommand { + + public static BClientCommand create() { + return BClientCommand.create("coordinates", CoordinatesCommand::openCoordinatesScreen) + .registerSubcommand(new ConfigSubcommand()) + .registerSubcommand(new CornerSubcommand()) + .registerSubcommand("help", CoordinatesCommand::showHelpMessage) + .registerSubcommand(new ModeSubcommand()) + .registerSubcommand("movehud", CoordinatesCommand::moveHud) + .registerSubcommand(new PositionSubcommand()); + } + + private static int openCoordinatesScreen(CommandContext ignored) { + + CoordinatesDisplay.shouldCoordinatesGuiOpen = true; + + return 0; + + } + + private static int showHelpMessage(CommandContext ignored) { + List components = ImmutableList.of( + GuiUtils.colorize(Component.translatable("command.coordinatesdisplay.helpmenu"), GuiUtils.AQUA), + Component.translatable("command.coordinatesdisplay.config"), + Component.translatable("command.coordinatesdisplay.gui"), + Component.translatable("command.coordinatesdisplay.help"), + Component.translatable("command.coordinatesdisplay.mode"), + Component.translatable("command.coordinatesdisplay.movehud"), + Component.translatable("command.coordinatesdisplay.position"), + Component.translatable("command.coordinatesdisplay.visibility") + ); + + components.forEach(c -> { + CoordinatesDisplay.LOGGER.player.chat(c); + }); + + return 0; + } + + private static int moveHud(CommandContext ignored) { + CoordinatesDisplay.shouldHudPositionGuiOpen = true; + + return 0; + } + +} diff --git a/common/src/main/java/dev/boxadactle/coordinatesdisplay/command/CornerSubcommand.java b/common/src/main/java/dev/boxadactle/coordinatesdisplay/command/CornerSubcommand.java new file mode 100644 index 0000000..49fe56f --- /dev/null +++ b/common/src/main/java/dev/boxadactle/coordinatesdisplay/command/CornerSubcommand.java @@ -0,0 +1,30 @@ +package dev.boxadactle.coordinatesdisplay.command; + +import com.mojang.brigadier.builder.ArgumentBuilder; +import dev.boxadactle.boxlib.command.BCommandManager; +import dev.boxadactle.boxlib.command.BCommandSourceStack; +import dev.boxadactle.boxlib.command.api.BClientSubcommand; +import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; +import dev.boxadactle.coordinatesdisplay.config.ModConfig; + +public class CornerSubcommand implements BClientSubcommand { + @Override + public ArgumentBuilder getSubcommand() { + return BCommandManager.literal("corner"); + } + + @Override + public void build(ArgumentBuilder builder) { + ModConfig.StartCorner[] corners = ModConfig.StartCorner.values(); + + for (ModConfig.StartCorner corner : corners) { + builder.then(BCommandManager.literal(corner.name().toLowerCase()) + .executes(c -> { + CoordinatesDisplay.getConfig().startCorner = corner; + CoordinatesDisplay.CONFIG.save(); + return 0; + }) + ); + } + } +} diff --git a/common/src/main/java/dev/boxadactle/coordinatesdisplay/command/ModeSubcommand.java b/common/src/main/java/dev/boxadactle/coordinatesdisplay/command/ModeSubcommand.java new file mode 100644 index 0000000..6d97049 --- /dev/null +++ b/common/src/main/java/dev/boxadactle/coordinatesdisplay/command/ModeSubcommand.java @@ -0,0 +1,30 @@ +package dev.boxadactle.coordinatesdisplay.command; + +import com.mojang.brigadier.builder.ArgumentBuilder; +import dev.boxadactle.boxlib.command.BCommandManager; +import dev.boxadactle.boxlib.command.BCommandSourceStack; +import dev.boxadactle.boxlib.command.api.BClientSubcommand; +import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; +import dev.boxadactle.coordinatesdisplay.hud.CoordinatesHuds; + +public class ModeSubcommand implements BClientSubcommand { + @Override + public ArgumentBuilder getSubcommand() { + return BCommandManager.literal("mode"); + } + + @Override + public void build(ArgumentBuilder builder) { + String[] modes = CoordinatesHuds.registeredOverlays.keySet().toArray(new String[0]); + + for (String mode : modes) { + builder.then(BCommandManager.literal(mode.toLowerCase()) + .executes(c -> { + CoordinatesDisplay.getConfig().renderMode = mode; + CoordinatesDisplay.CONFIG.save(); + return 0; + }) + ); + } + } +} diff --git a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/PositionCommand.java b/common/src/main/java/dev/boxadactle/coordinatesdisplay/command/PositionSubcommand.java similarity index 52% rename from neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/PositionCommand.java rename to common/src/main/java/dev/boxadactle/coordinatesdisplay/command/PositionSubcommand.java index 819bf78..a1c210f 100644 --- a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/PositionCommand.java +++ b/common/src/main/java/dev/boxadactle/coordinatesdisplay/command/PositionSubcommand.java @@ -1,42 +1,42 @@ -package dev.boxadactle.coordinatesdisplay.neoforge.command; +package dev.boxadactle.coordinatesdisplay.command; -import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import com.mojang.brigadier.builder.ArgumentBuilder; import com.mojang.brigadier.context.CommandContext; +import dev.boxadactle.boxlib.command.BCommandManager; +import dev.boxadactle.boxlib.command.BCommandSourceStack; +import dev.boxadactle.boxlib.command.api.BClientSubcommand; +import dev.boxadactle.boxlib.util.GuiUtils; import dev.boxadactle.boxlib.util.WorldUtils; import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; import dev.boxadactle.coordinatesdisplay.ModUtil; import dev.boxadactle.coordinatesdisplay.position.Position; import net.minecraft.client.Minecraft; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.commands.Commands; -public class PositionCommand extends CoordinatesCommand { +public class PositionSubcommand implements BClientSubcommand { @Override - public String getName() { - return "position"; + public ArgumentBuilder getSubcommand() { + return BCommandManager.literal("position"); } @Override - public void build(LiteralArgumentBuilder builder) { - + public void build(ArgumentBuilder builder) { // send in chat - builder.then(Commands.literal("chat") + builder.then(BCommandManager.literal("chat") .executes(this::sendPosInChat) ); // copy to clipboard - builder.then(Commands.literal("copy") + builder.then(BCommandManager.literal("copy") .executes(this::copyPos) ); // copy as tp - builder.then(Commands.literal("copytp") + builder.then(BCommandManager.literal("copytp") .executes(this::copyPosTp) ); - } - private int sendPosInChat(CommandContext context) { + private int sendPosInChat(CommandContext ignored) { Position pos = Position.of(WorldUtils.getPlayer()); @@ -46,32 +46,29 @@ private int sendPosInChat(CommandContext context) { return 0; } - private int copyPos(CommandContext context) { - + private int copyPos(CommandContext context) { Position pos = Position.of(WorldUtils.getPlayer()); Minecraft.getInstance().keyboardHandler.setClipboard(ModUtil.parseText(CoordinatesDisplay.CONFIG.get().copyPosMessage, pos)); - CoordinatesDisplay.LOGGER.player.info(super.translatable("command.coordinatesdisplay.position.copy")); + CoordinatesDisplay.LOGGER.player.info(GuiUtils.getTranslatable("command.coordinatesdisplay.position.copy")); CoordinatesDisplay.LOGGER.info("Copied location to clipboard"); return 0; - } - private int copyPosTp(CommandContext context) { + private int copyPosTp(CommandContext context) { try { Position pos = Position.of(WorldUtils.getPlayer()); Minecraft.getInstance().keyboardHandler.setClipboard(CoordinatesDisplay.getConfig().teleportMode.toCommand(pos)); - CoordinatesDisplay.LOGGER.player.info(super.translatable("command.coordinatesdisplay.position.copytp")); + CoordinatesDisplay.LOGGER.player.info(GuiUtils.getTranslatable("command.coordinatesdisplay.position.copytp")); return 0; } catch (Exception ignored) { - CoordinatesDisplay.LOGGER.player.info(super.translatable("command.coordinatesdisplay.internalError")); + CoordinatesDisplay.LOGGER.player.info(GuiUtils.getTranslatable("command.coordinatesdisplay.internalError")); return 1; } - } } diff --git a/common/src/main/java/dev/boxadactle/coordinatesdisplay/hud/renderer/SpawnpointRenderer.java b/common/src/main/java/dev/boxadactle/coordinatesdisplay/hud/renderer/SpawnpointRenderer.java index d959c44..088d7df 100644 --- a/common/src/main/java/dev/boxadactle/coordinatesdisplay/hud/renderer/SpawnpointRenderer.java +++ b/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 diff --git a/common/src/main/java/dev/boxadactle/coordinatesdisplay/hud/visibility/HoldMapVisibility.java b/common/src/main/java/dev/boxadactle/coordinatesdisplay/hud/visibility/HoldMapVisibility.java new file mode 100644 index 0000000..af95111 --- /dev/null +++ b/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); + } +} diff --git a/common/src/main/java/dev/boxadactle/coordinatesdisplay/hud/visibility/OwnMapVisibility.java b/common/src/main/java/dev/boxadactle/coordinatesdisplay/hud/visibility/OwnMapVisibility.java new file mode 100644 index 0000000..f1b843a --- /dev/null +++ b/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); + })); + } +} diff --git a/common/src/main/resources/assets/coordinatesdisplay/lang/en_us.json b/common/src/main/resources/assets/coordinatesdisplay/lang/en_us.json index 6fc0629..81b2b79 100644 --- a/common/src/main/resources/assets/coordinatesdisplay/lang/en_us.json +++ b/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", diff --git a/common/src/main/resources/assets/coordinatesdisplay/lang/es_es.json b/common/src/main/resources/assets/coordinatesdisplay/lang/es_es.json index b47121d..b98cafc 100644 --- a/common/src/main/resources/assets/coordinatesdisplay/lang/es_es.json +++ b/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." } \ No newline at end of file diff --git a/common/src/main/resources/assets/coordinatesdisplay/lang/ja_jp.json b/common/src/main/resources/assets/coordinatesdisplay/lang/ja_jp.json index 754c5d2..cfd1011 100644 --- a/common/src/main/resources/assets/coordinatesdisplay/lang/ja_jp.json +++ b/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: 位置に関する操作を行います。例: チャットに送信、クリップボードにコピー。" } \ No newline at end of file diff --git a/common/src/main/resources/assets/coordinatesdisplay/lang/ko_kr.json b/common/src/main/resources/assets/coordinatesdisplay/lang/ko_kr.json index c2ee581..25310b9 100644 --- a/common/src/main/resources/assets/coordinatesdisplay/lang/ko_kr.json +++ b/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." } \ No newline at end of file diff --git a/common/src/main/resources/assets/coordinatesdisplay/lang/ru_ru.json b/common/src/main/resources/assets/coordinatesdisplay/lang/ru_ru.json index dad3830..5813659 100644 --- a/common/src/main/resources/assets/coordinatesdisplay/lang/ru_ru.json +++ b/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." } \ No newline at end of file diff --git a/common/src/main/resources/assets/coordinatesdisplay/lang/uk_ua.json b/common/src/main/resources/assets/coordinatesdisplay/lang/uk_ua.json new file mode 100644 index 0000000..5858c4f --- /dev/null +++ b/common/src/main/resources/assets/coordinatesdisplay/lang/uk_ua.json @@ -0,0 +1,192 @@ +{ + "key.coordinatesdisplay.coordinatesgui": "Відкрити меню координат", + "key.coordinatesdisplay.copypos": "Скопіювати поточні координати", + "key.coordinatesdisplay.sendpos": "Надіслати поточні координати в чат", + "key.coordinatesdisplay.copypostp": "Скопіювати поточні координати як команду /tp", + "key.coordinatesdisplay.changeHudPos": "Змінити положення інтерфейсу", + "key.coordinatesdisplay.cycleDisplayMode": "Перемкнути режим відображення (Shift — назад)", + "category.coordinatesdisplay": "Coordinates Display", + + "hud.coordinatesdisplay.north": "Північ", + "hud.coordinatesdisplay.northeast": "Північний схід", + "hud.coordinatesdisplay.east": "Схід", + "hud.coordinatesdisplay.southeast": "Південний схід", + "hud.coordinatesdisplay.south": "Південь", + "hud.coordinatesdisplay.southwest": "Південний захід", + "hud.coordinatesdisplay.west": "Захід", + "hud.coordinatesdisplay.northwest": "Північний захід", + + "hud.coordinatesdisplay.north.short": "ПН", + "hud.coordinatesdisplay.northeast.short": "ПН-СХ", + "hud.coordinatesdisplay.east.short": "СХ", + "hud.coordinatesdisplay.southeast.short": "ПД-СХ", + "hud.coordinatesdisplay.south.short": "ПД", + "hud.coordinatesdisplay.southwest.short": "ПД-ЗХ", + "hud.coordinatesdisplay.west.short": "ЗХ", + "hud.coordinatesdisplay.northwest.short": "ПН-ЗХ", + + "hud.coordinatesdisplay.default": "Усталений", + "hud.coordinatesdisplay.default.x": "X: %s", + "hud.coordinatesdisplay.default.y": "Y: %s", + "hud.coordinatesdisplay.default.z": "Z: %s", + "hud.coordinatesdisplay.default.chunk.x": "X чанку: %s", + "hud.coordinatesdisplay.default.chunk.z": "Z чанку: %s", + "hud.coordinatesdisplay.default.direction": "%s %s", + "hud.coordinatesdisplay.default.biome": "Біом: %s", + "hud.coordinatesdisplay.default.dimension": "Вимір: %s", + "hud.coordinatesdisplay.default.version": "Minecraft %s", + + "hud.coordinatesdisplay.minimum": "Мінімалістичний", + "hud.coordinatesdisplay.minimum.x": "X: %s", + "hud.coordinatesdisplay.minimum.y": "Y: %s", + "hud.coordinatesdisplay.minimum.z": "Z: %s", + "hud.coordinatesdisplay.minimum.direction": "%s", + "hud.coordinatesdisplay.minimum.biome": "%s", + + "hud.coordinatesdisplay.maximum": "Повний", + "hud.coordinatesdisplay.maximum.xyz": "Координати: %s %s %s ", + "hud.coordinatesdisplay.maximum.block": "Координати блока: %s %s %s [%s %s %s]", + "hud.coordinatesdisplay.maximum.block.targeted": "Цільовий блок: %s %s %s", + "hud.coordinatesdisplay.maximum.chunk": "Чанк: %s %s %s", + "hud.coordinatesdisplay.maximum.direction": "Погляд на %s %s", + "hud.coordinatesdisplay.maximum.direction_int": "(%s / %s)", + "hud.coordinatesdisplay.maximum.biome": "У %s", + "hud.coordinatesdisplay.maximum.version": "Minecraft %s", + "hud.coordinatesdisplay.maximum.dimension": "Вимір: %s (з %s)", + + "hud.coordinatesdisplay.line": "Смужка", + "hud.coordinatesdisplay.line.x": "X: %s", + "hud.coordinatesdisplay.line.y": "Y: %s", + "hud.coordinatesdisplay.line.z": "Z: %s", + "hud.coordinatesdisplay.line.direction": "Напрямок: %s", + + "hud.coordinatesdisplay.nether_overworld": "Незер/Верхній світ", + "hud.coordinatesdisplay.nether_overworld.overworld": "Верхній світ", + "hud.coordinatesdisplay.nether_overworld.nether": "Незер", + "hud.coordinatesdisplay.nether_overworld.x": "X: %s", + "hud.coordinatesdisplay.nether_overworld.y": "Y: %s", + "hud.coordinatesdisplay.nether_overworld.z": "Z: %s", + "hud.coordinatesdisplay.nether_overworld.error": "Зараз не у Незері/Верхньому світі", + "hud.coordinatesdisplay.nether_overworld.dimension": "Вимір: %s", + + "hud.coordinatesdisplay.hotbar": "Панель швидкого доступу", + "hud.coordinatesdisplay.hotbar.all": "%s / %s / %s", + "hud.coordinatesdisplay.hotbar.xyz": "Координати: %s %s %s", + "hud.coordinatesdisplay.hotbar.direction": "Погляд на %s", + + "hud.coordinatesdisplay.spawnpoint": "Точка появи у світі (компас)", + "hud.coordinatesdisplay.spawnpoint.player": "Гравець", + "hud.coordinatesdisplay.spawnpoint.worldSpawn": "Точка появи у світі", + "hud.coordinatesdisplay.spawnpoint.relative": "Відносно", + "hud.coordinatesdisplay.spawnpoint.x": "X: %s", + "hud.coordinatesdisplay.spawnpoint.y": "Y: %s", + "hud.coordinatesdisplay.spawnpoint.z": "Z: %s", + + "hud.coordinatesdisplay.direction": "Напрямки", + "hud.coordinatesdisplay.direction.x": "X: %s", + "hud.coordinatesdisplay.direction.y": "Y: %s", + "hud.coordinatesdisplay.direction.z": "Z: %s", + "hud.coordinatesdisplay.direction.direction": "Напрямок: %s (%s)", + "hud.coordinatesdisplay.direction.yaw": "Рискання: %s (%s)", + "hud.coordinatesdisplay.direction.pitch": "Нахил: %s (%s)", + "hud.coordinatesdisplay.direction.positive": "додатне %s", + "hud.coordinatesdisplay.direction.negative": "від'ємне %s", + + "hud.coordinatesdisplay.filter.always": "Завжди", + "hud.coordinatesdisplay.filter.never": "Ніколи", + "hud.coordinatesdisplay.filter.hold_compass": "Тримаючи компас", + "hud.coordinatesdisplay.filter.own_compass": "Маючи компас", + + "screen.coordinatesdisplay.config": "Налаштування %s", + "screen.coordinatesdisplay.confirmreset": "Підтвердження скидання до усталеного", + "screen.coordinatesdisplay.render": "Налаштування відображення (%s)", + "screen.coordinatesdisplay.color": "Налаштування кольору (%s)", + "screen.coordinatesdisplay.deathpos": "Налаштування показу місця смерті (%s)", + "screen.coordinatesdisplay.visual": "Налаштування вигляду (%s)", + "screen.coordinatesdisplay.position": "Змінити положення інтерфейсу", + "screen.coordinatesdisplay.text": "Налаштування тексту (%s)", + "screen.coordinatesdispaly.hudposition": "Зміна положення інтерфейсу", + + "button.coordinatesdisplay.visualconfig": "Налаштування вигляду...", + "button.coordinatesdisplay.renderconfig": "Відображення...", + "button.coordinatesdisplay.colorconfig": "Кольори...", + "button.coordinatesdisplay.deathpos": "Місце смерті...", + "button.coordinatesdisplay.text": "Налаштування тексту...", + "button.coordinatesdisplay.visibility": "Видимість: %s", + "button.coordinatesdisplay.decimalPlaces": "Цифри після коми: %s", + "button.coordinatesdisplay.decimalPlaces.block_pos": "положення блока", + "button.coordinatesdisplay.displayMode": "Режим: %s", + "button.coordinatesdisplay.textshadow": "Тінь тексту: %s", + "button.coordinatesdisplay.biomecolors": "Кольори біомів: %s", + "button.coordinatesdisplay.dimensioncolors": "Кольори вимірів: %s", + "button.coordinatesdisplay.startcorner": "Кут початку: %s", + "button.coordinatesdisplay.startcorner.top_left": "Лівий верхній", + "button.coordinatesdisplay.startcorner.top_right": "Правий верхній", + "button.coordinatesdisplay.startcorner.bottom_left": "Лівий нижній", + "button.coordinatesdisplay.startcorner.bottom_right": "Правий нижній", + "button.coordinatesdisplay.editHudPos": "Змінити положення інтерфейсу...", + "button.coordinatesdisplay.padding": "Зовнішній відступ: %s", + "button.coordinatesdisplay.textpadding": "Текстовий відступ: %s", + "button.coordinatesdisplay.background": "Тло: %s", + "button.coordinatesdisplay.xyz": "Координати: %s", + "button.coordinatesdisplay.chunkpos": "Положеня чанка: %s", + "button.coordinatesdisplay.direction": "Напрямок: %s", + "button.coordinatesdisplay.biome": "Біом: %s", + "button.coordinatesdisplay.directionint": "Кут напрямку: %s", + "button.coordinatesdisplay.mcversion": "Версія Minecraft: %s", + "button.coordinatesdisplay.dimension": "Вимір: %s", + "button.coordinatesdisplay.displayondeathscreen": "Показувати на екрані смерті: %s", + "button.coordinatesdisplay.sendinchat": "Надсилати в чат: %s", + "button.coordinatesdisplay.roundwhencopying": "Заокруглювати при копіюванні: %s", + "button.coordinatesdisplay.tpmode": "Режим телепортування: %s", + "button.coordinatesdisplay.tpmode.execute": "/execute", + "button.coordinatesdisplay.tpmode.tp": "/tp", + "button.coordinatesdisplay.tpmode.baritone": "Baritone (#goto)", + + "button.coordinatesdisplay.help": "Як використовувати...", + "button.coordinatesdisplay.wiki": "Відкрити вікі...", + "button.coordinatesdisplay.configfile": "Показати файл налаштувань...", + "button.coordinatesdisplay.configfilesuccess": "Відкрито файл налаштувань...", + "button.coordinatesdisplay.configfilefail": "Не вдалося відкрити файл налаштувань", + "button.coordinatesdisplay.resetdefault": "Скинути до усталеного...", + + "label.coordinatesdisplay.preview": "Попередній перегляд", + "label.coordinatesdisplay.definitionColor": "Колір параметра", + "label.coordinatesdisplay.dataColor": "Колір значення", + "label.coordinatesdisplay.deathposColor": "Колір місця смерті", + "label.coordinatesdisplay.backgroundColor": "Колір тла (ARGB)", + "label.coordinatesdisplay.posChatMessage": "Текст, що надсилається в чат", + "label.coordinatesdisplay.copyPosMessage": "Текст, що копіюється", + + "message.coordinatesdisplay.openfilefailed": "Не вдалося відкрити файл", + "message.coordinatesdisplay.openfilesuccess": "Файл відкрито у файловому провіднику", + "message.coordinatesdisplay.confirmreset": "Ви впевнені, що хочете скинути всі ваші налаштування до усталеного?", + "message.coordinatesdisplay.at": "Поточне положення", + "message.coordinatesdisplay.location": "X: %d Y: %d Z: %d", + "message.coordinatesdisplay.deathlocation": "%d, %d, %d у %s", + "message.coordinatesdisplay.deathpos": "Ви померли на %s", + "message.coordinatesdisplay.teleport": "Телепортуватися на місце смерті", + "message.coordintatesdisplay.disabled": "Ця опція недоступна в обраному режимі.", + + "button.coordinatesdisplay.copy": "Скопіювати в буфер обміну", + "button.coordinatesdisplay.copied": "Скопійовано!", + "button.coordinatesdisplay.send": "Надіслати в чат", + "button.coordinatesdisplay.copytp": "Скопіювати як команду для телепортації", + + "command.coordinatesdisplay.emptyArgs": "Помилка: Будь ласка, вкажіть дійсну підкоманду", + "command.coordinatesdisplay.internalError": "Стався збій", + "command.coordinatesdisplay.position.copy": "Положення скопійоване в буфер обміну!", + "command.coordinatesdisplay.position.copytp": "Положення скопійоване як команда /tp", + "command.coordinatesdisplay.config.reload": "Перезавантажено налаштування!", + "command.coordinatesdisplay.config.open.success": "Успішно відкрито файл налаштувань", + "command.coordinatesdisplay.config.open.fail": "Не вдалося відкрити файл налаштувань", + + "command.coordinatesdisplay.helpmenu": "Підкоманди /coordinates", + "command.coordinatesdisplay.config": "Config: Завантажити/збережти файл налаштувнь. Не вказуйте аргументів, щоб відкрити меню.", + "command.coordinatesdisplay.gui": "Gui: Відкрити екран координат, де ви можете робити дії з вашими координатами.", + "command.coordinatesdisplay.help": "Help: Переглянути цей список.", + "command.coordinatesdisplay.mode": "Mode: Виберіть режим показу інтерфейсу на екрані.", + "command.coordinatesdisplay.movehud": "Movehud: Відкриває меню, де ви можете переміщати інтерфейс.", + "command.coordinatesdisplay.position": "Position: Дії з вашою позицією, накшталт, надіслати її в чат або скопіювати в буфер обміну.", + "command.coordinatesdisplay.visibility": "Visibility: Перемикання видимості показу координат." +} diff --git a/fabric/build.gradle b/fabric/build.gradle index a9f5bee..588677c 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -60,7 +60,7 @@ unifiedPublishing { project { displayName = "[Fabric ${rootProject.minecraft_version}] v$rootProject.mod_version" version = "$rootProject.version-fabric" - changelog = "A changelog can be found here: https://github.com/Boxadactle/coordinates-display/releases/tag/$rootProject.mod_version" + changelog = "A changelog can be found here: ${rootProject.releases_page}tag/$rootProject.mod_version" releaseType = rootProject.release_type gameVersions = Arrays.asList(rootProject.game_versions.split(",")) gameLoaders = [ "fabric", "quilt" ] diff --git a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/CoordinatesDisplayFabric.java b/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/CoordinatesDisplayFabric.java index 4415bd7..fdc91c3 100644 --- a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/CoordinatesDisplayFabric.java +++ b/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/CoordinatesDisplayFabric.java @@ -3,13 +3,13 @@ import com.mojang.blaze3d.systems.RenderSystem; import dev.boxadactle.boxlib.util.WorldUtils; import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import dev.boxadactle.coordinatesdisplay.fabric.init.Commands; import dev.boxadactle.coordinatesdisplay.config.ModConfig; import dev.boxadactle.coordinatesdisplay.fabric.init.Keybinds; import dev.boxadactle.coordinatesdisplay.position.Position; 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; @@ -20,8 +20,6 @@ public class CoordinatesDisplayFabric implements ClientModInitializer { public void onInitializeClient() { CoordinatesDisplay.init(); - Commands.register(); - ClientTickEvents.END_CLIENT_TICK.register(this::checkBindings); HudRenderCallback.EVENT.register(this::renderHud); @@ -36,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(); diff --git a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/ConfigCommand.java b/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/ConfigCommand.java deleted file mode 100644 index 0509a7d..0000000 --- a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/ConfigCommand.java +++ /dev/null @@ -1,60 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.fabric.command; - -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import com.mojang.brigadier.context.CommandContext; -import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import dev.boxadactle.coordinatesdisplay.ModUtil; -import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; -import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; - -public class ConfigCommand extends CoordinatesCommand { - @Override - public String getName() { - return "config"; - } - - @Override - public void build(LiteralArgumentBuilder builder) { - - // open config file - builder.then(ClientCommandManager.literal("file") - .executes(this::openConfigFile) - ); - - builder.then(ClientCommandManager.literal("reload") - .executes(this::reloadConfig) - ); - - - // empty args - builder.executes(this::openConfigGui); - } - - private int openConfigGui(CommandContext context) { - - CoordinatesDisplay.shouldConfigGuiOpen = true; - CoordinatesDisplay.LOGGER.info("Opening Config GUI"); - - return 0; - - } - - private int openConfigFile(CommandContext context) { - if (ModUtil.openConfigFile()) { - CoordinatesDisplay.LOGGER.player.info(super.translatable("command.coordinatesdisplay.config.open.success")); - return 0; - } else { - CoordinatesDisplay.LOGGER.info(super.translatable("command.coordinatesdisplay.config.open.fail")); - return 1; - } - } - - private int reloadConfig(CommandContext context) { - CoordinatesDisplay.CONFIG.reload(); - CoordinatesDisplay.LOGGER.player.info(super.translatable("command.coordinatesdisplay.config.reload")); - CoordinatesDisplay.LOGGER.info("Reloaded all config"); - - return 0; - } - -} diff --git a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/CoordinatesCommand.java b/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/CoordinatesCommand.java deleted file mode 100644 index 7aba4d7..0000000 --- a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/CoordinatesCommand.java +++ /dev/null @@ -1,11 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.fabric.command; - -import dev.boxadactle.boxlib.fabric.command.BClientCommand; - -public abstract class CoordinatesCommand extends BClientCommand { - - @Override - public String getCommandName() { - return "coordinates"; - } -} diff --git a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/CornerCommand.java b/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/CornerCommand.java deleted file mode 100644 index 34388b1..0000000 --- a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/CornerCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.fabric.command; - -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import dev.boxadactle.coordinatesdisplay.config.ModConfig; -import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; -import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; - -public class CornerCommand extends CoordinatesCommand { - @Override - public String getName() { - return "corner"; - } - - @Override - public void build(LiteralArgumentBuilder builder) { - ModConfig.StartCorner[] corners = ModConfig.StartCorner.values(); - - for (ModConfig.StartCorner corner : corners) { - builder.then(ClientCommandManager.literal(corner.name().toLowerCase()) - .executes(c -> { - CoordinatesDisplay.getConfig().startCorner = corner; - CoordinatesDisplay.CONFIG.save(); - return 0; - }) - ); - } - } -} diff --git a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/GuiCommand.java b/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/GuiCommand.java deleted file mode 100644 index 2bf600b..0000000 --- a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/GuiCommand.java +++ /dev/null @@ -1,28 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.fabric.command; - -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import com.mojang.brigadier.context.CommandContext; -import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; - -public class GuiCommand extends CoordinatesCommand { - @Override - public String getName() { - return "gui"; - } - - @Override - public void build(LiteralArgumentBuilder builder) { - - builder.executes(this::openCoordinatesScreen); - - } - - private int openCoordinatesScreen(CommandContext context) { - - CoordinatesDisplay.shouldCoordinatesGuiOpen = true; - - return 0; - - } -} diff --git a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/HelpCommand.java b/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/HelpCommand.java deleted file mode 100644 index a39479a..0000000 --- a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/HelpCommand.java +++ /dev/null @@ -1,44 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.fabric.command; - -import com.google.common.collect.ImmutableList; -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import com.mojang.brigadier.context.CommandContext; -import dev.boxadactle.boxlib.util.GuiUtils; -import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; -import net.minecraft.network.chat.Component; - -import java.util.List; - -public class HelpCommand extends CoordinatesCommand { - - @Override - public String getName() { - return "help"; - } - - @Override - public void build(LiteralArgumentBuilder builder) { - builder.executes(this::sendHelpMessage); - } - - private int sendHelpMessage(CommandContext context) { - List components = ImmutableList.of( - GuiUtils.colorize(Component.translatable("command.coordinatesdisplay.helpmenu"), GuiUtils.AQUA), - Component.translatable("command.coordinatesdisplay.config"), - Component.translatable("command.coordinatesdisplay.gui"), - Component.translatable("command.coordinatesdisplay.help"), - Component.translatable("command.coordinatesdisplay.mode"), - Component.translatable("command.coordinatesdisplay.movehud"), - Component.translatable("command.coordinatesdisplay.position"), - Component.translatable("command.coordinatesdisplay.visibility") - ); - - components.forEach(c -> { - CoordinatesDisplay.LOGGER.player.chat(c); - }); - - return 0; - } - -} diff --git a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/ModeCommand.java b/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/ModeCommand.java deleted file mode 100644 index a7a2d4e..0000000 --- a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/ModeCommand.java +++ /dev/null @@ -1,32 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.fabric.command; - -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import dev.boxadactle.coordinatesdisplay.config.ModConfig; -import dev.boxadactle.coordinatesdisplay.hud.CoordinatesHuds; -import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; -import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; - -public class ModeCommand extends CoordinatesCommand { - @Override - public String getName() { - return "mode"; - } - - @Override - public void build(LiteralArgumentBuilder builder) { - - String[] modes = CoordinatesHuds.registeredOverlays.keySet().toArray(new String[0]); - - for (String mode : modes) { - builder.then(ClientCommandManager.literal(mode.toLowerCase()) - .executes(c -> { - CoordinatesDisplay.getConfig().renderMode = mode; - CoordinatesDisplay.CONFIG.save(); - return 0; - }) - ); - } - - } -} diff --git a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/MoveHudCommand.java b/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/MoveHudCommand.java deleted file mode 100644 index 4bb5226..0000000 --- a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/MoveHudCommand.java +++ /dev/null @@ -1,28 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.fabric.command; - -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import com.mojang.brigadier.context.CommandContext; -import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; - -public class MoveHudCommand extends CoordinatesCommand { - @Override - public String getName() { - return "movehud"; - } - - @Override - public void build(LiteralArgumentBuilder builder) { - - builder.executes(this::openHudPositionScreen); - - } - - private int openHudPositionScreen(CommandContext context) { - - CoordinatesDisplay.shouldHudPositionGuiOpen = true; - - return 0; - - } -} diff --git a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/PositionCommand.java b/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/PositionCommand.java deleted file mode 100644 index fbe7c7b..0000000 --- a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/PositionCommand.java +++ /dev/null @@ -1,78 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.fabric.command; - -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import com.mojang.brigadier.context.CommandContext; -import dev.boxadactle.boxlib.util.WorldUtils; -import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import dev.boxadactle.coordinatesdisplay.ModUtil; -import dev.boxadactle.coordinatesdisplay.position.Position; -import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; -import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; -import net.minecraft.client.Minecraft; - -public class PositionCommand extends CoordinatesCommand { - @Override - public String getName() { - return "position"; - } - - @Override - public void build(LiteralArgumentBuilder builder) { - - // send in chat - builder.then(ClientCommandManager.literal("chat") - .executes(this::sendPosInChat) - ); - - // copy to clipboard - builder.then(ClientCommandManager.literal("copy") - .executes(this::copyPos) - ); - - // copy as tp - builder.then(ClientCommandManager.literal("copytp") - .executes(this::copyPosTp) - ); - - } - - private int sendPosInChat(CommandContext context) { - - Position pos = Position.of(WorldUtils.getPlayer()); - - CoordinatesDisplay.LOGGER.player.publicChat(ModUtil.parseText(CoordinatesDisplay.CONFIG.get().posChatMessage, pos)); - CoordinatesDisplay.LOGGER.info("Sent position as chat message"); - - return 0; - } - - private int copyPos(CommandContext context) { - - Position pos = Position.of(WorldUtils.getPlayer()); - - Minecraft.getInstance().keyboardHandler.setClipboard(ModUtil.parseText(CoordinatesDisplay.CONFIG.get().copyPosMessage, pos)); - CoordinatesDisplay.LOGGER.player.info(super.translatable("command.coordinatesdisplay.position.copy")); - CoordinatesDisplay.LOGGER.info("Copied location to clipboard"); - - return 0; - - } - - private int copyPosTp(CommandContext context) { - - try { - Position pos = Position.of(WorldUtils.getPlayer()); - - Minecraft.getInstance().keyboardHandler.setClipboard(CoordinatesDisplay.getConfig().teleportMode.toCommand(pos)); - - CoordinatesDisplay.LOGGER.player.info(super.translatable("command.coordinatesdisplay.position.copytp")); - - return 0; - } catch (Exception ignored) { - CoordinatesDisplay.LOGGER.player.info(super.translatable("command.coordinatesdisplay.internalError")); - return 1; - } - - } - -} diff --git a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/VisibilityFilterCommand.java b/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/VisibilityFilterCommand.java deleted file mode 100644 index 49fc042..0000000 --- a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/command/VisibilityFilterCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.fabric.command; - -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import dev.boxadactle.coordinatesdisplay.hud.CoordinatesHuds; -import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; -import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; - -public class VisibilityFilterCommand extends CoordinatesCommand { - @Override - public String getName() { - return "visibility"; - } - - @Override - public void build(LiteralArgumentBuilder builder) { - String[] filters = CoordinatesHuds.registeredVisibilityFilters.keySet().toArray(new String[0]); - - for (String filter : filters) { - builder.then(ClientCommandManager.literal(filter.toLowerCase()) - .executes(c -> { - CoordinatesDisplay.getConfig().visibilityFilter = filter; - CoordinatesDisplay.CONFIG.save(); - return 0; - }) - ); - } - } -} diff --git a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/init/Commands.java b/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/init/Commands.java deleted file mode 100644 index 144e6e0..0000000 --- a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/init/Commands.java +++ /dev/null @@ -1,24 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.fabric.init; - -import dev.boxadactle.boxlib.fabric.command.BCommandManager; -import dev.boxadactle.coordinatesdisplay.fabric.command.*; -import net.minecraft.network.chat.Component; - -import java.util.List; - -public class Commands { - - public static void register() { - BCommandManager.registerCommand("coordinates", list -> { - list.add(ConfigCommand::new); - list.add(CornerCommand::new); - list.add(GuiCommand::new); - list.add(HelpCommand::new); - list.add(ModeCommand::new); - list.add(MoveHudCommand::new); - list.add(PositionCommand::new); - list.add(VisibilityFilterCommand::new); - }); - } - -} diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 43ea823..db3fd0c 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/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.0.0", - "fabric-api": ">=0.97.5" + "fabricloader": ">=0.15.10", + "minecraft": ">=1.21", + "boxlib": ">=14.0.0", + "fabric-api": ">=0.100.0" } } diff --git a/gradle.properties b/gradle.properties index 8ea79ed..a39d013 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,24 +3,26 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true # Mod properties -mod_version = 10.0.0 +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.0.2 -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 \ No newline at end of file +release_type = release +releases_page = https://github.com/Boxadactle/coordinates-display/releases/ \ No newline at end of file diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 9b73a8e..f544240 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -62,7 +62,7 @@ unifiedPublishing { project { displayName = "[NeoForge ${rootProject.minecraft_version}] v$rootProject.mod_version" version = "$rootProject.version-neoforge" - changelog = "A changelog can be found here: https://github.com/Boxadactle/coordinates-display/releases/tag/$rootProject.mod_version" + changelog = "A changelog can be found here: ${rootProject.releases_page}tag/$rootProject.mod_version" releaseType = rootProject.release_type gameVersions = Arrays.asList(rootProject.game_versions.split(",")) gameLoaders = [ "neoforge" ] diff --git a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/CoordinatesDisplayNeoforge.java b/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/CoordinatesDisplayNeoforge.java index 3b3400f..5f0fc35 100644 --- a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/CoordinatesDisplayNeoforge.java +++ b/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/CoordinatesDisplayNeoforge.java @@ -1,12 +1,10 @@ package dev.boxadactle.coordinatesdisplay.neoforge; import com.mojang.blaze3d.systems.RenderSystem; -import dev.boxadactle.boxlib.util.ClientUtils; import dev.boxadactle.boxlib.util.WorldUtils; import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; import dev.boxadactle.coordinatesdisplay.config.ModConfig; import dev.boxadactle.coordinatesdisplay.config.screen.ConfigScreen; -import dev.boxadactle.coordinatesdisplay.neoforge.init.Commands; import dev.boxadactle.coordinatesdisplay.neoforge.init.Keybinds; import dev.boxadactle.coordinatesdisplay.position.Position; import net.minecraft.world.entity.player.Player; @@ -27,8 +25,6 @@ public class CoordinatesDisplayNeoforge { public CoordinatesDisplayNeoforge() { CoordinatesDisplay.init(); - Commands.register(); - ModLoadingContext.get().registerExtensionPoint(IConfigScreenFactory.class, () -> (minecraft, screen) -> new ConfigScreen(screen) ); diff --git a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/ConfigCommand.java b/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/ConfigCommand.java deleted file mode 100644 index 8516d22..0000000 --- a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/ConfigCommand.java +++ /dev/null @@ -1,60 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.neoforge.command; - -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import com.mojang.brigadier.context.CommandContext; -import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import dev.boxadactle.coordinatesdisplay.ModUtil; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.commands.Commands; - -public class ConfigCommand extends CoordinatesCommand { - @Override - public String getName() { - return "config"; - } - - @Override - public void build(LiteralArgumentBuilder builder) { - - // open config file - builder.then(Commands.literal("file") - .executes(this::openConfigFile) - ); - - builder.then(Commands.literal("reload") - .executes(this::reloadConfig) - ); - - - // empty args - builder.executes(this::openConfigGui); - } - - private int openConfigGui(CommandContext context) { - - CoordinatesDisplay.shouldConfigGuiOpen = true; - CoordinatesDisplay.LOGGER.info("Opening Config GUI"); - - return 0; - - } - - private int openConfigFile(CommandContext context) { - if (ModUtil.openConfigFile()) { - CoordinatesDisplay.LOGGER.player.info(super.translatable("command.coordinatesdisplay.config.open.success")); - return 0; - } else { - CoordinatesDisplay.LOGGER.info(super.translatable("command.coordinatesdisplay.config.open.fail")); - return 1; - } - } - - private int reloadConfig(CommandContext context) { - CoordinatesDisplay.CONFIG.reload(); - CoordinatesDisplay.LOGGER.player.info(super.translatable("command.coordinatesdisplay.config.reload")); - CoordinatesDisplay.LOGGER.info("Reloaded all config"); - - return 0; - } - -} diff --git a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/CoordinatesCommand.java b/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/CoordinatesCommand.java deleted file mode 100644 index 1dc5776..0000000 --- a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/CoordinatesCommand.java +++ /dev/null @@ -1,11 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.neoforge.command; - -import dev.boxadactle.boxlib.neoforge.command.BClientCommand; - -public abstract class CoordinatesCommand extends BClientCommand { - - @Override - public String getCommandName() { - return "coordinates"; - } -} diff --git a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/CornerCommand.java b/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/CornerCommand.java deleted file mode 100644 index 6401fa5..0000000 --- a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/CornerCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.neoforge.command; - -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import dev.boxadactle.coordinatesdisplay.config.ModConfig; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.commands.Commands; - -public class CornerCommand extends CoordinatesCommand { - @Override - public String getName() { - return "corner"; - } - - @Override - public void build(LiteralArgumentBuilder builder) { - ModConfig.StartCorner[] corners = ModConfig.StartCorner.values(); - - for (ModConfig.StartCorner corner : corners) { - builder.then(Commands.literal(corner.name().toLowerCase()) - .executes(c -> { - CoordinatesDisplay.getConfig().startCorner = corner; - CoordinatesDisplay.CONFIG.save(); - return 0; - }) - ); - } - } -} diff --git a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/GuiCommand.java b/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/GuiCommand.java deleted file mode 100644 index 13cdcc4..0000000 --- a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/GuiCommand.java +++ /dev/null @@ -1,28 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.neoforge.command; - -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import com.mojang.brigadier.context.CommandContext; -import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import net.minecraft.commands.CommandSourceStack; - -public class GuiCommand extends CoordinatesCommand { - @Override - public String getName() { - return "gui"; - } - - @Override - public void build(LiteralArgumentBuilder builder) { - - builder.executes(this::openCoordinatesScreen); - - } - - private int openCoordinatesScreen(CommandContext context) { - - CoordinatesDisplay.shouldCoordinatesGuiOpen = true; - - return 0; - - } -} diff --git a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/HelpCommand.java b/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/HelpCommand.java deleted file mode 100644 index d83e526..0000000 --- a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/HelpCommand.java +++ /dev/null @@ -1,44 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.neoforge.command; - -import com.google.common.collect.ImmutableList; -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import com.mojang.brigadier.context.CommandContext; -import dev.boxadactle.boxlib.util.GuiUtils; -import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.network.chat.Component; - -import java.util.List; - -public class HelpCommand extends CoordinatesCommand { - - @Override - public String getName() { - return "help"; - } - - @Override - public void build(LiteralArgumentBuilder builder) { - builder.executes(this::sendHelpMessage); - } - - private int sendHelpMessage(CommandContext context) { - List components = ImmutableList.of( - GuiUtils.colorize(Component.translatable("command.coordinatesdisplay.helpmenu"), GuiUtils.AQUA), - Component.translatable("command.coordinatesdisplay.config"), - Component.translatable("command.coordinatesdisplay.gui"), - Component.translatable("command.coordinatesdisplay.help"), - Component.translatable("command.coordinatesdisplay.mode"), - Component.translatable("command.coordinatesdisplay.movehud"), - Component.translatable("command.coordinatesdisplay.position"), - Component.translatable("command.coordinatesdisplay.visibility") - ); - - components.forEach(c -> { - CoordinatesDisplay.LOGGER.player.chat(c); - }); - - return 0; - } - -} \ No newline at end of file diff --git a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/ModeCommand.java b/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/ModeCommand.java deleted file mode 100644 index 26d7a2f..0000000 --- a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/ModeCommand.java +++ /dev/null @@ -1,31 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.neoforge.command; - -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import dev.boxadactle.coordinatesdisplay.hud.CoordinatesHuds; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.commands.Commands; - -public class ModeCommand extends CoordinatesCommand { - @Override - public String getName() { - return "mode"; - } - - @Override - public void build(LiteralArgumentBuilder builder) { - - String[] modes = CoordinatesHuds.registeredOverlays.keySet().toArray(new String[0]); - - for (String mode : modes) { - builder.then(Commands.literal(mode.toLowerCase()) - .executes(c -> { - CoordinatesDisplay.getConfig().renderMode = mode; - CoordinatesDisplay.CONFIG.save(); - return 0; - }) - ); - } - - } -} diff --git a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/MoveHudCommand.java b/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/MoveHudCommand.java deleted file mode 100644 index 620175a..0000000 --- a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/MoveHudCommand.java +++ /dev/null @@ -1,28 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.neoforge.command; - -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import com.mojang.brigadier.context.CommandContext; -import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import net.minecraft.commands.CommandSourceStack; - -public class MoveHudCommand extends CoordinatesCommand { - @Override - public String getName() { - return "movehud"; - } - - @Override - public void build(LiteralArgumentBuilder builder) { - - builder.executes(this::openHudPositionScreen); - - } - - private int openHudPositionScreen(CommandContext context) { - - CoordinatesDisplay.shouldHudPositionGuiOpen = true; - - return 0; - - } -} diff --git a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/VisibilityFilterCommand.java b/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/VisibilityFilterCommand.java deleted file mode 100644 index 93ac90d..0000000 --- a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/command/VisibilityFilterCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.neoforge.command; - -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import dev.boxadactle.coordinatesdisplay.hud.CoordinatesHuds; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.commands.Commands; - -public class VisibilityFilterCommand extends CoordinatesCommand { - @Override - public String getName() { - return "visibility"; - } - - @Override - public void build(LiteralArgumentBuilder builder) { - String[] filters = CoordinatesHuds.registeredVisibilityFilters.keySet().toArray(new String[0]); - - for (String filter : filters) { - builder.then(Commands.literal(filter.toLowerCase()) - .executes(c -> { - CoordinatesDisplay.getConfig().visibilityFilter = filter; - CoordinatesDisplay.CONFIG.save(); - return 0; - }) - ); - } - } -} diff --git a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/init/Commands.java b/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/init/Commands.java deleted file mode 100644 index 196d376..0000000 --- a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/init/Commands.java +++ /dev/null @@ -1,19 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.neoforge.init; - -import dev.boxadactle.boxlib.neoforge.command.BCommandManager; -import dev.boxadactle.coordinatesdisplay.neoforge.command.*; - -public class Commands { - public static void register() { - BCommandManager.registerCommand("coordinates", list -> { - list.add(ConfigCommand::new); - list.add(CornerCommand::new); - list.add(GuiCommand::new); - list.add(HelpCommand::new); - list.add(ModeCommand::new); - list.add(MoveHudCommand::new); - list.add(PositionCommand::new); - list.add(VisibilityFilterCommand::new); - }); - } -} diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index edc43d0..c54affd 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/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.0.0, 14.0.0)" +versionRange = "[14.0.0, 15.0.0)" ordering = "NONE" side = "BOTH"