diff --git a/common/src/main/java/xaeroplus/mixin/client/MixinGuiMap.java b/common/src/main/java/xaeroplus/mixin/client/MixinGuiMap.java index fca8ac45..33f159ea 100644 --- a/common/src/main/java/xaeroplus/mixin/client/MixinGuiMap.java +++ b/common/src/main/java/xaeroplus/mixin/client/MixinGuiMap.java @@ -1,7 +1,5 @@ package xaeroplus.mixin.client; -import baritone.api.BaritoneAPI; -import baritone.api.pathing.goals.GoalXZ; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.injector.WrapWithCondition; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; @@ -41,6 +39,7 @@ import xaero.map.graphics.renderer.multitexture.MultiTextureRenderTypeRendererProvider; import xaero.map.gui.*; import xaero.map.gui.dropdown.rightclick.RightClickOption; +import xaero.map.misc.Misc; import xaero.map.misc.OptimizedMath; import xaero.map.mods.SupportMods; import xaero.map.world.MapDimension; @@ -48,6 +47,7 @@ import xaeroplus.XaeroPlus; import xaeroplus.mixin.client.mc.AccessorGameOptions; import xaeroplus.settings.XaeroPlusSettingRegistry; +import xaeroplus.util.BaritoneExecutor; import xaeroplus.util.BaritoneHelper; import xaeroplus.util.ChunkUtils; @@ -571,6 +571,19 @@ public void onInputPress(final int code, final int scanCode, final int modifiers if (code == 257) { onGotoCoordinatesButton(null); cir.setReturnValue(true); + return; + } + } + if (BaritoneHelper.isBaritonePresent()) { + if (XaeroPlusSettingRegistry.worldMapBaritoneGoalHereKeybindSetting.getKeyBinding().matches(code, scanCode)) { + BaritoneExecutor.goal(mouseBlockPosX, mouseBlockPosZ); + cir.setReturnValue(true); + } else if (XaeroPlusSettingRegistry.worldMapBaritonePathHereKeybindSetting.getKeyBinding().matches(code, scanCode)) { + BaritoneExecutor.path(mouseBlockPosX, mouseBlockPosZ); + cir.setReturnValue(true); + } else if (BaritoneHelper.isBaritoneElytraPresent() && XaeroPlusSettingRegistry.worldMapBaritoneElytraHereKeybindSetting.getKeyBinding().matches(code, scanCode)) { + BaritoneExecutor.elytra(mouseBlockPosX, mouseBlockPosZ); + cir.setReturnValue(true); } } } @@ -578,41 +591,31 @@ public void onInputPress(final int code, final int scanCode, final int modifiers @Inject(method = "getRightClickOptions", at = @At(value = "RETURN"), remap = false) public void getRightClickOptionsInject(final CallbackInfoReturnable> cir) { if (BaritoneHelper.isBaritonePresent()) { - ResourceKey customDim = Globals.getCurrentDimensionId(); - ResourceKey actualDim = ChunkUtils.getActualDimension(); - double customDimDiv = 1.0; - if (customDim != actualDim) { - if (customDim == NETHER && actualDim == OVERWORLD) { - customDimDiv = 8; - } else if (customDim == OVERWORLD && actualDim == NETHER) { - customDimDiv = 0.125; - } - } - int goalX = (int) (rightClickX * customDimDiv); - int goalZ = (int) (rightClickZ * customDimDiv); final ArrayList options = cir.getReturnValue(); + int goalX = rightClickX; + int goalZ = rightClickZ; options.addAll(3, asList( - new RightClickOption(I18n.get("gui.world_map.baritone_goal_here"), options.size(), this) { + new RightClickOption("gui.world_map.baritone_goal_here", options.size(), this) { @Override public void onAction(Screen screen) { - BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoal(new GoalXZ(goalX, goalZ)); + BaritoneExecutor.goal(goalX, goalZ); } - }, - new RightClickOption(I18n.get("gui.world_map.baritone_path_here"), options.size(), this) { + }.setNameFormatArgs(Misc.getKeyName(XaeroPlusSettingRegistry.worldMapBaritoneGoalHereKeybindSetting.getKeyBinding())), + new RightClickOption("gui.world_map.baritone_path_here", options.size(), this) { @Override public void onAction(Screen screen) { - BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalXZ(goalX, goalZ)); + BaritoneExecutor.path(goalX, goalZ); } - } + }.setNameFormatArgs(Misc.getKeyName(XaeroPlusSettingRegistry.worldMapBaritonePathHereKeybindSetting.getKeyBinding())) )); if (BaritoneHelper.isBaritoneElytraPresent()) { options.addAll(5, asList( - new RightClickOption(I18n.get("gui.world_map.baritone_elytra_here"), options.size(), this) { + new RightClickOption("gui.world_map.baritone_elytra_here", options.size(), this) { @Override public void onAction(Screen screen) { - BaritoneAPI.getProvider().getPrimaryBaritone().getElytraProcess().pathTo(new GoalXZ(goalX, goalZ)); + BaritoneExecutor.elytra(goalX, goalZ); } - } + }.setNameFormatArgs(Misc.getKeyName(XaeroPlusSettingRegistry.worldMapBaritoneElytraHereKeybindSetting.getKeyBinding())) )); } } diff --git a/common/src/main/java/xaeroplus/mixin/client/MixinWaypointReader.java b/common/src/main/java/xaeroplus/mixin/client/MixinWaypointReader.java index aab422b7..34b5ceb5 100644 --- a/common/src/main/java/xaeroplus/mixin/client/MixinWaypointReader.java +++ b/common/src/main/java/xaeroplus/mixin/client/MixinWaypointReader.java @@ -1,29 +1,22 @@ package xaeroplus.mixin.client; -import baritone.api.BaritoneAPI; -import baritone.api.pathing.goals.GoalXZ; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.resources.language.I18n; -import net.minecraft.resources.ResourceKey; -import net.minecraft.world.level.Level; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import xaero.map.gui.IRightClickableElement; import xaero.map.gui.dropdown.rightclick.RightClickOption; +import xaero.map.misc.Misc; import xaero.map.mods.gui.Waypoint; import xaero.map.mods.gui.WaypointReader; -import xaeroplus.feature.extensions.IWaypointDimension; import xaeroplus.settings.XaeroPlusSettingRegistry; +import xaeroplus.util.BaritoneExecutor; import xaeroplus.util.BaritoneHelper; -import xaeroplus.util.ChunkUtils; import java.util.ArrayList; import static java.util.Arrays.asList; -import static net.minecraft.world.level.Level.NETHER; -import static net.minecraft.world.level.Level.OVERWORLD; @Mixin(value = WaypointReader.class, remap = false) public class MixinWaypointReader { @@ -33,43 +26,30 @@ public class MixinWaypointReader { public void getRightClickOptionsReturn(final Waypoint element, final IRightClickableElement target, final CallbackInfoReturnable> cir) { if (BaritoneHelper.isBaritonePresent()) { final ArrayList options = cir.getReturnValue(); - ResourceKey wpDimension = ((IWaypointDimension) element).getDimension(); - if (wpDimension == null) { - wpDimension = OVERWORLD; - } - ResourceKey playerDimension = ChunkUtils.getActualDimension(); - double dimDiv = 1.0; - if (wpDimension != playerDimension) { - if (wpDimension == NETHER && playerDimension == OVERWORLD) { - dimDiv = 8.0; - } else if (wpDimension == OVERWORLD && playerDimension == NETHER) { - dimDiv = 0.125; - } - } - int destX = (int) (element.getX() * dimDiv); - int destZ = (int) (element.getZ() * dimDiv); + int goalX = element.getX(); + int goalZ = element.getZ(); options.addAll(3, asList( - new RightClickOption(I18n.get("gui.world_map.baritone_goal_here"), options.size(), target) { + new RightClickOption("gui.world_map.baritone_goal_here", options.size(), target) { @Override public void onAction(Screen screen) { - BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoal(new GoalXZ(destX, destZ)); + BaritoneExecutor.goal(goalX, goalZ); } - }, - new RightClickOption(I18n.get("gui.world_map.baritone_path_here"), options.size(), target) { + }.setNameFormatArgs(Misc.getKeyName(XaeroPlusSettingRegistry.worldMapBaritoneGoalHereKeybindSetting.getKeyBinding())), + new RightClickOption("gui.world_map.baritone_path_here", options.size(), target) { @Override public void onAction(Screen screen) { - BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalXZ(destX, destZ)); + BaritoneExecutor.path(goalX, goalZ); } - } + }.setNameFormatArgs(Misc.getKeyName(XaeroPlusSettingRegistry.worldMapBaritonePathHereKeybindSetting.getKeyBinding())) )); if (BaritoneHelper.isBaritoneElytraPresent()) { options.addAll(5, asList( - new RightClickOption(I18n.get("gui.world_map.baritone_elytra_here"), options.size(), target) { + new RightClickOption("gui.world_map.baritone_elytra_here", options.size(), target) { @Override public void onAction(Screen screen) { - BaritoneAPI.getProvider().getPrimaryBaritone().getElytraProcess().pathTo(new GoalXZ(destX, destZ)); + BaritoneExecutor.elytra(goalX, goalZ); } - } + }.setNameFormatArgs(Misc.getKeyName(XaeroPlusSettingRegistry.worldMapBaritoneElytraHereKeybindSetting.getKeyBinding())) )); } } diff --git a/common/src/main/java/xaeroplus/settings/XaeroPlusSettingRegistry.java b/common/src/main/java/xaeroplus/settings/XaeroPlusSettingRegistry.java index 34baaa35..86c4a934 100644 --- a/common/src/main/java/xaeroplus/settings/XaeroPlusSettingRegistry.java +++ b/common/src/main/java/xaeroplus/settings/XaeroPlusSettingRegistry.java @@ -529,6 +529,24 @@ public String getTranslationKey() { (b) -> Globals.switchToDimension(END), false, SettingLocation.KEYBINDS); + public static final XaeroPlusBooleanSetting worldMapBaritoneGoalHereKeybindSetting = XaeroPlusBooleanSetting.create( + "WorldMap Baritone Goal Here", + "setting.keybinds.world_map_baritone_goal_here", + "setting.keybinds.world_map_baritone_goal_here.tooltip", + false, + SettingLocation.KEYBINDS); + public static final XaeroPlusBooleanSetting worldMapBaritonePathHereKeybindSetting = XaeroPlusBooleanSetting.create( + "WorldMap Baritone Path Here", + "setting.keybinds.world_map_baritone_path_here", + "setting.keybinds.world_map_baritone_path_here.tooltip", + false, + SettingLocation.KEYBINDS); + public static final XaeroPlusBooleanSetting worldMapBaritoneElytraHereKeybindSetting = XaeroPlusBooleanSetting.create( + "WorldMap Baritone Elytra Here", + "setting.keybinds.world_map_baritone_elytra_here", + "setting.keybinds.world_map_baritone_elytra_here.tooltip", + false, + SettingLocation.KEYBINDS); public static final XaeroPlusBooleanSetting netherCaveFix = XaeroPlusBooleanSetting.create( "Nether Cave Fix", "setting.world_map.nether_cave_fix", diff --git a/common/src/main/java/xaeroplus/util/BaritoneExecutor.java b/common/src/main/java/xaeroplus/util/BaritoneExecutor.java new file mode 100644 index 00000000..b387e72b --- /dev/null +++ b/common/src/main/java/xaeroplus/util/BaritoneExecutor.java @@ -0,0 +1,47 @@ +package xaeroplus.util; + +import baritone.api.BaritoneAPI; +import baritone.api.pathing.goals.GoalXZ; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.level.Level; +import xaeroplus.Globals; + +import static net.minecraft.world.level.Level.NETHER; +import static net.minecraft.world.level.Level.OVERWORLD; + +// avoid classloading this unless baritone is actually present +// otherwise game crashes +public final class BaritoneExecutor { + private BaritoneExecutor() {} + public static GoalXZ getBaritoneGoalXZ(int x, int z) { + ResourceKey customDim = Globals.getCurrentDimensionId(); + ResourceKey actualDim = ChunkUtils.getActualDimension(); + double customDimDiv = 1.0; + if (customDim != actualDim) { + if (customDim == NETHER && actualDim == OVERWORLD) { + customDimDiv = 8; + } else if (customDim == OVERWORLD && actualDim == NETHER) { + customDimDiv = 0.125; + } + } + int goalX = (int) (x * customDimDiv); + int goalZ = (int) (z * customDimDiv); + return new GoalXZ(goalX, goalZ); + } + + public static void goal(int x, int z) { + if (!BaritoneHelper.isBaritonePresent()) return; + BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoal(getBaritoneGoalXZ(x, z)); + } + + public static void path(int x, int z) { + if (!BaritoneHelper.isBaritonePresent()) return; + BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(getBaritoneGoalXZ(x, z)); + } + + public static void elytra(int x, int z) { + if (!BaritoneHelper.isBaritonePresent()) return; + if (!BaritoneHelper.isBaritoneElytraPresent()) return; + BaritoneAPI.getProvider().getPrimaryBaritone().getElytraProcess().pathTo(getBaritoneGoalXZ(x, z)); + } +} diff --git a/common/src/main/java/xaeroplus/util/BaritoneHelper.java b/common/src/main/java/xaeroplus/util/BaritoneHelper.java index 66cf12fa..60754ae4 100644 --- a/common/src/main/java/xaeroplus/util/BaritoneHelper.java +++ b/common/src/main/java/xaeroplus/util/BaritoneHelper.java @@ -4,7 +4,8 @@ import baritone.api.process.IElytraProcess; import xaeroplus.XaeroPlus; -public class BaritoneHelper { +public final class BaritoneHelper { + private BaritoneHelper() {} private static boolean isBaritonePresent = false; private static boolean isBaritoneElytraPresent = false; private static boolean checkedBaritone = false; diff --git a/common/src/main/resources/assets/xaeroplus/lang/en_us.json b/common/src/main/resources/assets/xaeroplus/lang/en_us.json index 8be7dc71..fc8f1671 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/en_us.json +++ b/common/src/main/resources/assets/xaeroplus/lang/en_us.json @@ -138,6 +138,12 @@ "setting.keybinds.switch_to_overworld.tooltip": "Switches to the overworld map.", "setting.keybinds.switch_to_end": "Switch to End", "setting.keybinds.switch_to_end.tooltip": "Switches to the end map.", + "setting.keybinds.world_map_baritone_goal_here": "Baritone Goal Here (WorldMap)", + "setting.keybinds.world_map_baritone_goal_here.tooltip": "If pressed while viewing the WorldMap, sets a Baritone goal", + "setting.keybinds.world_map_baritone_path_here": "Baritone Path Here (WorldMap)", + "setting.keybinds.world_map_baritone_path_here.tooltip": "If pressed while viewing the WorldMap, sets a Baritone goal and paths to it", + "setting.keybinds.world_map_baritone_elytra_here": "Baritone Elytra Here (WorldMap)", + "setting.keybinds.world_map_baritone_elytra_here.tooltip": "If pressed while viewing the WorldMap, sets a Baritone goal and starts elytra pathing to it", "setting.world_map.nether_cave_fix": "Nether Cave Fix", "setting.world_map.nether_cave_fix.tooltip": "Forces full cave maps to be written and rendered when cave mode is off in the nether. \n Without this, you have to manually move region files pre WorldMap 1.30.0 to the correct cave folder.", "setting.minimap.always_render_player_name": "Always Render Player Name", @@ -170,9 +176,9 @@ "gui.xaeroplus.minimap_incompatible.download_minimap": "Download Xaero's Minimap", "gui.xaeroplus.minimap_incompatible.exit": "Exit", "gui.world_map.go_to_coordinates": "Go to Coordinates", - "gui.world_map.baritone_goal_here": "Baritone Goal Here", - "gui.world_map.baritone_path_here": "Baritone Path Here", - "gui.world_map.baritone_elytra_here": "Baritone Elytra Here", + "gui.world_map.baritone_goal_here": "§2%s§r Baritone Goal Here", + "gui.world_map.baritone_path_here": "§2%s§r Baritone Path Here", + "gui.world_map.baritone_elytra_here": "§2%s§r Baritone Elytra Here", "gui.xaeroplus.check_github_button": "Go to XaeroPlus Github for updates", "gui.waypoints.toggle_enable_all": "Toggle Enable All", "setting.world_map.waystones_sync": "Waystones Sync", diff --git a/common/src/main/resources/assets/xaeroplus/lang/es_ar.json b/common/src/main/resources/assets/xaeroplus/lang/es_ar.json index 4d48c63a..db690a91 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/es_ar.json +++ b/common/src/main/resources/assets/xaeroplus/lang/es_ar.json @@ -138,6 +138,12 @@ "setting.keybinds.switch_to_overworld.tooltip": "Cambia al mapa del Overworld.", "setting.keybinds.switch_to_end": "Cambiar al End", "setting.keybinds.switch_to_end.tooltip": "Cambia al mapa del End.", + "setting.keybinds.world_map_baritone_goal_here": "Objetivo de Baritone Aquí (MapaMundial)", + "setting.keybinds.world_map_baritone_goal_here.tooltip": "Si se presiona mientras se visualiza el MapaMundial, establece un objetivo de Baritone", + "setting.keybinds.world_map_baritone_path_here": "Ruta de Baritone Aquí (MapaMundial)", + "setting.keybinds.world_map_baritone_path_here.tooltip": "Si se presiona mientras se visualiza el MapaMundial, establece un objetivo de Baritone y traza un camino hacia él", + "setting.keybinds.world_map_baritone_elytra_here": "Elytra de Baritone Aquí (MapaMundial)", + "setting.keybinds.world_map_baritone_elytra_here.tooltip": "Si se presiona mientras se visualiza el MapaMundial, establece un objetivo de Baritone y comienza a volar con Elytra hacia él", "setting.world_map.nether_cave_fix": "Corrección Cueva Nether", "setting.world_map.nether_cave_fix.tooltip": "Forzar que los mapas completos de cuevas se escriban y rendericen cuando el modo cueva está desactivado en el Nether. \n Sin esto, tendrás que mover manualmente archivos de región pre WorldMap 1.30.0 a la carpeta de cuevas correcta.", "setting.minimap.always_render_player_name": "Siempre Representar Nombre Jugador", @@ -170,9 +176,9 @@ "gui.xaeroplus.minimap_incompatible.download_minimap": "Descargar Xaero's Minimap", "gui.xaeroplus.minimap_incompatible.exit": "Salir", "gui.world_map.go_to_coordinates": "Ir a Coordenadas", - "gui.world_map.baritone_goal_here": "Objetivo Baritone Aca", - "gui.world_map.baritone_path_here": "Camino Baritone Aca", - "gui.world_map.baritone_elytra_here": "Elytra Baritone Aca", + "gui.world_map.baritone_goal_here": "§2%s§r Objetivo Baritone Aca", + "gui.world_map.baritone_path_here": "§2%s§r Camino Baritone Aca", + "gui.world_map.baritone_elytra_here": "§2%s§r Elytra Baritone Aca", "gui.xaeroplus.check_github_button": "Ir al Github de XaeroPlus para ver actualizaciones", "gui.waypoints.toggle_enable_all": "Alternar Habilitar Todo", "setting.world_map.waystones_sync": "Sincronizar Waypoint de Waystones", diff --git a/common/src/main/resources/assets/xaeroplus/lang/fr_ca.json b/common/src/main/resources/assets/xaeroplus/lang/fr_ca.json index a902abad..dce1507a 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/fr_ca.json +++ b/common/src/main/resources/assets/xaeroplus/lang/fr_ca.json @@ -138,6 +138,12 @@ "setting.keybinds.switch_to_overworld.tooltip": "Bascule vers la carte de l'Overworld.", "setting.keybinds.switch_to_end": "Basculer vers l'End", "setting.keybinds.switch_to_end.tooltip": "Bascule vers la carte de l'End.", + "setting.keybinds.world_map_baritone_goal_here": "Objectif Baritone Ici (CarteMondiale)", + "setting.keybinds.world_map_baritone_goal_here.tooltip": "Si appuyé en visualisant la CarteMondiale, définit un objectif Baritone", + "setting.keybinds.world_map_baritone_path_here": "Chemin Baritone Ici (CarteMondiale)", + "setting.keybinds.world_map_baritone_path_here.tooltip": "Si appuyé en visualisant la CarteMondiale, définit un objectif Baritone et trace un chemin vers lui", + "setting.keybinds.world_map_baritone_elytra_here": "Elytra Baritone Ici (CarteMondiale)", + "setting.keybinds.world_map_baritone_elytra_here.tooltip": "Si appuyé en visualisant la CarteMondiale, définit un objectif Baritone et commence à voler avec Elytra vers lui", "setting.world_map.nether_cave_fix": "Correction des grottes du Nether", "setting.world_map.nether_cave_fix.tooltip": "Force l'écriture et le rendu de cartes de grottes complètes lorsque le mode grotte est désactivé dans le nether. \n Sans cela, vous devez déplacer manuellement les fichiers de région antérieurs à WorldMap 1.30.0 dans le bon dossier de grottes.", "setting.minimap.always_render_player_name": "Toujours afficher le nom du joueur", @@ -170,9 +176,9 @@ "gui.xaeroplus.minimap_incompatible.download_minimap": "Téléchargez la mini-carte de Xaero", "gui.xaeroplus.minimap_incompatible.exit": "Sortie", "gui.world_map.go_to_coordinates": "Aller aux coordonnées", - "gui.world_map.baritone_goal_here": "Baryton Ciblez ici", - "gui.world_map.baritone_path_here": "Chemin du baryton ici", - "gui.world_map.baritone_elytra_here": "Baryton Elytra Ici", + "gui.world_map.baritone_goal_here": "§2%s§r Baryton Ciblez ici", + "gui.world_map.baritone_path_here": "§2%s§r Chemin du baryton ici", + "gui.world_map.baritone_elytra_here": "§2%s§r Baryton Elytra Ici", "gui.xaeroplus.check_github_button": "Aller sur la page de XaeroPlus sur Github pour les mises à jour", "gui.waypoints.toggle_enable_all": "Activer tout", "setting.world_map.waystones_sync": "Waystones Sync", diff --git a/common/src/main/resources/assets/xaeroplus/lang/fr_fr.json b/common/src/main/resources/assets/xaeroplus/lang/fr_fr.json index a902abad..dce1507a 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/fr_fr.json +++ b/common/src/main/resources/assets/xaeroplus/lang/fr_fr.json @@ -138,6 +138,12 @@ "setting.keybinds.switch_to_overworld.tooltip": "Bascule vers la carte de l'Overworld.", "setting.keybinds.switch_to_end": "Basculer vers l'End", "setting.keybinds.switch_to_end.tooltip": "Bascule vers la carte de l'End.", + "setting.keybinds.world_map_baritone_goal_here": "Objectif Baritone Ici (CarteMondiale)", + "setting.keybinds.world_map_baritone_goal_here.tooltip": "Si appuyé en visualisant la CarteMondiale, définit un objectif Baritone", + "setting.keybinds.world_map_baritone_path_here": "Chemin Baritone Ici (CarteMondiale)", + "setting.keybinds.world_map_baritone_path_here.tooltip": "Si appuyé en visualisant la CarteMondiale, définit un objectif Baritone et trace un chemin vers lui", + "setting.keybinds.world_map_baritone_elytra_here": "Elytra Baritone Ici (CarteMondiale)", + "setting.keybinds.world_map_baritone_elytra_here.tooltip": "Si appuyé en visualisant la CarteMondiale, définit un objectif Baritone et commence à voler avec Elytra vers lui", "setting.world_map.nether_cave_fix": "Correction des grottes du Nether", "setting.world_map.nether_cave_fix.tooltip": "Force l'écriture et le rendu de cartes de grottes complètes lorsque le mode grotte est désactivé dans le nether. \n Sans cela, vous devez déplacer manuellement les fichiers de région antérieurs à WorldMap 1.30.0 dans le bon dossier de grottes.", "setting.minimap.always_render_player_name": "Toujours afficher le nom du joueur", @@ -170,9 +176,9 @@ "gui.xaeroplus.minimap_incompatible.download_minimap": "Téléchargez la mini-carte de Xaero", "gui.xaeroplus.minimap_incompatible.exit": "Sortie", "gui.world_map.go_to_coordinates": "Aller aux coordonnées", - "gui.world_map.baritone_goal_here": "Baryton Ciblez ici", - "gui.world_map.baritone_path_here": "Chemin du baryton ici", - "gui.world_map.baritone_elytra_here": "Baryton Elytra Ici", + "gui.world_map.baritone_goal_here": "§2%s§r Baryton Ciblez ici", + "gui.world_map.baritone_path_here": "§2%s§r Chemin du baryton ici", + "gui.world_map.baritone_elytra_here": "§2%s§r Baryton Elytra Ici", "gui.xaeroplus.check_github_button": "Aller sur la page de XaeroPlus sur Github pour les mises à jour", "gui.waypoints.toggle_enable_all": "Activer tout", "setting.world_map.waystones_sync": "Waystones Sync", diff --git a/common/src/main/resources/assets/xaeroplus/lang/ja_jp.json b/common/src/main/resources/assets/xaeroplus/lang/ja_jp.json index e86e57db..e1665e13 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/ja_jp.json +++ b/common/src/main/resources/assets/xaeroplus/lang/ja_jp.json @@ -136,6 +136,12 @@ "setting.keybinds.switch_to_overworld.tooltip": "オーバーワールドのマップに切り替える", "setting.keybinds.switch_to_end": "エンドに切り替え", "setting.keybinds.switch_to_end.tooltip": "エンドの地図に切り替える", + "setting.keybinds.world_map_baritone_goal_here": "バリトン目標ここに (ワールドマップ)", + "setting.keybinds.world_map_baritone_goal_here.tooltip": "ワールドマップを表示しているときに押すと、バリトンの目標を設定します", + "setting.keybinds.world_map_baritone_path_here": "バリトンの道ここに (ワールドマップ)", + "setting.keybinds.world_map_baritone_path_here.tooltip": "ワールドマップを表示しているときに押すと、バリトンの目標を設定し、そこに向かって道を設定します", + "setting.keybinds.world_map_baritone_elytra_here": "バリトンのエリトラここに (ワールドマップ)", + "setting.keybinds.world_map_baritone_elytra_here.tooltip": "ワールドマップを表示しているときに押すと、バリトンの目標を設定し、エリトラでの移動を開始します", "setting.world_map.nether_cave_fix": "Netherの洞窟の修正", "setting.world_map.nether_cave_fix.tooltip": "ネザーで洞窟モードがオフのときに、洞窟のフルマップを強制的に書き込んでレンダリングする。\nこれがないと、WorldMap 1.30.0以前の地域ファイルを正しい洞窟フォルダに手動で移動しなければなりません。", "setting.minimap.always_render_player_name": "プレイヤー名を表示する", @@ -168,9 +174,9 @@ "gui.xaeroplus.minimap_incompatible.download_minimap": "Xaero's Minimapをダウンロード", "gui.xaeroplus.minimap_incompatible.exit": "Exit", "gui.world_map.go_to_coordinates": "この座標に行く", - "gui.world_map.baritone_goal_here": "Baritoneのゴール", - "gui.world_map.baritone_path_here": "Baritoneのルート", - "gui.world_map.baritone_elytra_here": "Baritoneのエリトラ", + "gui.world_map.baritone_goal_here": "§2%s§r Baritoneのゴール", + "gui.world_map.baritone_path_here": "§2%s§r Baritoneのルート", + "gui.world_map.baritone_elytra_here": "§2%s§r Baritoneのエリトラ", "gui.xaeroplus.check_github_button": "XaeroPlusのupdateを見にGithubに行く", "gui.waypoints.toggle_enable_all": "すべてを有効にする", "setting.world_map.waystones_sync": "Waystones Sync", diff --git a/common/src/main/resources/assets/xaeroplus/lang/pl_pl.json b/common/src/main/resources/assets/xaeroplus/lang/pl_pl.json index 0e029cef..22775483 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/pl_pl.json +++ b/common/src/main/resources/assets/xaeroplus/lang/pl_pl.json @@ -138,6 +138,12 @@ "setting.keybinds.switch_to_overworld.tooltip": "Przełącza na mapę świata domyślnego.", "setting.keybinds.switch_to_end": "Przełącz na Kres", "setting.keybinds.switch_to_end.tooltip": "Przełącz na mapę kresu.", + "setting.keybinds.world_map_baritone_goal_here": "Cel Baritone Tutaj (MapaŚwiata)", + "setting.keybinds.world_map_baritone_goal_here.tooltip": "Jeśli naciśnięty podczas przeglądania MapaŚwiata, ustawia cel Baritone", + "setting.keybinds.world_map_baritone_path_here": "Ścieżka Baritone Tutaj (MapaŚwiata)", + "setting.keybinds.world_map_baritone_path_here.tooltip": "Jeśli naciśnięty podczas przeglądania MapaŚwiata, ustawia cel Baritone i wyznacza do niego ścieżkę", + "setting.keybinds.world_map_baritone_elytra_here": "Elytra Baritone Tutaj (MapaŚwiata)", + "setting.keybinds.world_map_baritone_elytra_here.tooltip": "Jeśli naciśnięty podczas przeglądania MapaŚwiata, ustawia cel Baritone i rozpoczyna lot Elytra do niego", "setting.world_map.nether_cave_fix": "Naprawa Netherowych Jaskiń", "setting.world_map.nether_cave_fix.tooltip": "Wymusza zapisywanie i renderowanie pełnych map jaskiń, gdy tryb jaskiń jest wyłączony w netherze. \n Bez tego musisz manualnie przenieść pliki regionów przed WorldMap 1.30.0 do właściwych folderów z jaskiniami", "setting.minimap.always_render_player_name": "Zawsze Renderuj Nazwę Gracza", @@ -170,9 +176,9 @@ "gui.xaeroplus.minimap_incompatible.download_minimap": "Pobierz minimapę Xaero", "gui.xaeroplus.minimap_incompatible.exit": "Wyjście", "gui.world_map.go_to_coordinates": "Idź na Koordynaty", - "gui.world_map.baritone_goal_here": "Cel Baritone Tutaj", - "gui.world_map.baritone_path_here": "Ścieżka Baritone Tutaj", - "gui.world_map.baritone_elytra_here": "Elytra Baritone Tutaj", + "gui.world_map.baritone_goal_here": "§2%s§r Cel Baritone Tutaj", + "gui.world_map.baritone_path_here": "§2%s§r Ścieżka Baritone Tutaj", + "gui.world_map.baritone_elytra_here": "§2%s§r Elytra Baritone Tutaj", "gui.xaeroplus.check_github_button": "Udaj się na Github XaeroPlus po aktualizacje", "gui.waypoints.toggle_enable_all": "Włącz Wszystko", "setting.world_map.waystones_sync": "Synchronizuj Kamienie Nawigacyjne", diff --git a/common/src/main/resources/assets/xaeroplus/lang/pt_pt.json b/common/src/main/resources/assets/xaeroplus/lang/pt_pt.json index 895344ec..33ab5a0d 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/pt_pt.json +++ b/common/src/main/resources/assets/xaeroplus/lang/pt_pt.json @@ -138,6 +138,12 @@ "setting.keybinds.switch_to_overworld.tooltip": "Altera para o mapa da Superfície.", "setting.keybinds.switch_to_end": "Alterar para End", "setting.keybinds.switch_to_end.tooltip": "Altera para o mapa do End.", + "setting.keybinds.world_map_baritone_goal_here": "Objetivo do Baritone Aqui (MapaMundial)", + "setting.keybinds.world_map_baritone_goal_here.tooltip": "Se pressionado enquanto visualiza o MapaMundial, define um objetivo do Baritone", + "setting.keybinds.world_map_baritone_path_here": "Caminho do Baritone Aqui (MapaMundial)", + "setting.keybinds.world_map_baritone_path_here.tooltip": "Se pressionado enquanto visualiza o MapaMundial, define um objetivo do Baritone e traça um caminho até ele", + "setting.keybinds.world_map_baritone_elytra_here": "Elytra do Baritone Aqui (MapaMundial)", + "setting.keybinds.world_map_baritone_elytra_here.tooltip": "Se pressionado enquanto visualiza o MapaMundial, define um objetivo do Baritone e começa a trajetória de Elytra até ele", "setting.world_map.nether_cave_fix": "Corr. Cavernas do Nether", "setting.world_map.nether_cave_fix.tooltip": "Força o mapa completo das cavernas a ser renderizado e guardado quando o modo cavernas para o Nether está desligado. \n Sem isto tens de manualmente mover os ficheiros das regiões pré mapa-mundo v1.30.0 para a diretoria de cavernas correta.", "setting.minimap.always_render_player_name": "Mostrar Sempre Nome do Jogador", @@ -170,9 +176,9 @@ "gui.xaeroplus.minimap_incompatible.download_minimap": "Transferir Xaero's Minimap", "gui.xaeroplus.minimap_incompatible.exit": "Sair", "gui.world_map.go_to_coordinates": "Ir para Coordenadas", - "gui.world_map.baritone_goal_here": "Destino Baritone Aqui", - "gui.world_map.baritone_path_here": "Caminho Baritone Aqui", - "gui.world_map.baritone_elytra_here": "Elytra Baritone Aqui", + "gui.world_map.baritone_goal_here": "§2%s§r Destino Baritone Aqui", + "gui.world_map.baritone_path_here": "§2%s§r Caminho Baritone Aqui", + "gui.world_map.baritone_elytra_here": "§2%s§r Elytra Baritone Aqui", "gui.xaeroplus.check_github_button": "Vísita o Github do XaeroPlus para atualizações", "gui.waypoints.toggle_enable_all": "Alternar Ligar Todos", "setting.world_map.waystones_sync": "Sincronizar Waystones", diff --git a/common/src/main/resources/assets/xaeroplus/lang/ru_ru.json b/common/src/main/resources/assets/xaeroplus/lang/ru_ru.json index 90de1a8a..30150546 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/ru_ru.json +++ b/common/src/main/resources/assets/xaeroplus/lang/ru_ru.json @@ -138,6 +138,12 @@ "setting.keybinds.switch_to_overworld.tooltip": "Переключается на карту верхнего мира.", "setting.keybinds.switch_to_end": "Переключиться на Энд", "setting.keybinds.switch_to_end.tooltip": "Перключиться на карту Энда.", + "setting.keybinds.world_map_baritone_goal_here": "Цель Baritone Здесь (КартаМира)", + "setting.keybinds.world_map_baritone_goal_here.tooltip": "Если нажать при просмотре КартыМира, устанавливает цель Baritone", + "setting.keybinds.world_map_baritone_path_here": "Маршрут Baritone Здесь (КартаМира)", + "setting.keybinds.world_map_baritone_path_here.tooltip": "Если нажать при просмотре КартыМира, устанавливает цель Baritone и прокладывает путь к ней", + "setting.keybinds.world_map_baritone_elytra_here": "Elytra Baritone Здесь (КартаМира)", + "setting.keybinds.world_map_baritone_elytra_here.tooltip": "Если нажать при просмотре КартыМира, устанавливает цель Baritone и начинает путь с Elytra к ней", "setting.world_map.nether_cave_fix": "Фикс пещер Незера", "setting.world_map.nether_cave_fix.tooltip": "Принудительно записывает и отображает полные карты пещер, когда режим пещеры в преисподней выключен. \n Без этого вам придется вручную переместить файлы регионов до версии WorldMap 1.30.0 в нужную папку сохранения", "setting.minimap.always_render_player_name": "Всегда отображайте имя игрока", @@ -170,9 +176,9 @@ "gui.xaeroplus.minimap_incompatible.download_minimap": "Скачать миникарту Xaero", "gui.xaeroplus.minimap_incompatible.exit": "Выход", "gui.world_map.go_to_coordinates": "Идти на координаты", - "gui.world_map.baritone_goal_here": "Baritone Цель тут", - "gui.world_map.baritone_path_here": "Baritone Путь тут", - "gui.world_map.baritone_elytra_here": "Baritone Элитра тут", + "gui.world_map.baritone_goal_here": "§2%s§r Baritone Цель тут", + "gui.world_map.baritone_path_here": "§2%s§r Baritone Путь тут", + "gui.world_map.baritone_elytra_here": "§2%s§r Baritone Элитра тут", "gui.xaeroplus.check_github_button": "Перейти на XaeroPlus Github для обновления", "gui.waypoints.toggle_enable_all": "Переключить Вкл Всё", "setting.world_map.waystones_sync": "Waystones Синхр.", @@ -180,9 +186,5 @@ "setting.world_map.waystone_color": "Цвет путевой точки", "setting.world_map.waystone_color.tooltip": "Использует дополнительный предустановленный цвет для всех путевых точек путевого камня или случайный цвет.", "setting.world_map.waystone_waypoint_set": "Набор путевых точек Waystone", - "setting.world_map.waystone_waypoint_set.tooltip": "Создает отдельный набор путевых точек для путевых точек вместо добавления их в набор по умолчанию.", - "setting.world_map.cross_dim_waystones_sync": "Синхронизация измерений Waystones", - "setting.world_map.cross_dim_waystones_sync.tooltip": "Синхронизирует Waystones с путевой точкой (по умолчанию), установленной в соответствии с ее измерением", - "setting.world_map.cross_dimension_teleport": "Телепортация между измерениями", - "setting.world_map.cross_dimension_teleport.tooltip": "Если измерение XaeroPlus переключено, также изменяется команды телепортации в это измерение" + "setting.world_map.waystone_waypoint_set.tooltip": "Создает отдельный набор путевых точек для путевых точек вместо добавления их в набор по умолчанию." } diff --git a/common/src/main/resources/assets/xaeroplus/lang/vi_vn.json b/common/src/main/resources/assets/xaeroplus/lang/vi_vn.json index d4ceacc9..a2cf377b 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/vi_vn.json +++ b/common/src/main/resources/assets/xaeroplus/lang/vi_vn.json @@ -138,6 +138,12 @@ "setting.keybinds.switch_to_overworld.tooltip": "Chuyển sang bản đồ thế giới trên.", "setting.keybinds.switch_to_end": "Chuyển sang End", "setting.keybinds.switch_to_end.tooltip": "Chuyển sang bản đồ end.", + "setting.keybinds.world_map_baritone_goal_here": "Mục Tiêu Baritone Ở Đây (BảnĐồThếGiới)", + "setting.keybinds.world_map_baritone_goal_here.tooltip": "Nếu nhấn khi xem BảnĐồThếGiới, thiết lập một mục tiêu Baritone", + "setting.keybinds.world_map_baritone_path_here": "Đường Baritone Ở Đây (BảnĐồThếGiới)", + "setting.keybinds.world_map_baritone_path_here.tooltip": "Nếu nhấn khi xem BảnĐồThếGiới, thiết lập một mục tiêu Baritone và vạch đường đến đó", + "setting.keybinds.world_map_baritone_elytra_here": "Elytra Baritone Ở Đây (BảnĐồThếGiới)", + "setting.keybinds.world_map_baritone_elytra_here.tooltip": "Nếu nhấn khi xem BảnĐồThếGiới, thiết lập một mục tiêu Baritone và bắt đầu bay Elytra đến đó", "setting.world_map.nether_cave_fix": "Sửa Lỗi Hang Nether", "setting.world_map.nether_cave_fix.tooltip": "Buộc viết và hiển thị bản đồ hang động đầy đủ khi chế độ hang động tắt ở nether. \n Không có điều này, bạn phải di chuyển tệp khu vực thủ công trước WorldMap 1.30.0 đến thư mục hang động đúng", "setting.minimap.always_render_player_name": "Luôn Hiển Thị Tên Người Chơi", @@ -170,9 +176,9 @@ "gui.xaeroplus.minimap_incompatible.download_minimap": "Tải Xuống Xaero's Minimap", "gui.xaeroplus.minimap_incompatible.exit": "Thoát", "gui.world_map.go_to_coordinates": "Đi Đến Tọa Độ", - "gui.world_map.baritone_goal_here": "Mục Tiêu Baritone Tại Đây", - "gui.world_map.baritone_path_here": "Đường Đi Baritone Tại Đây", - "gui.world_map.baritone_elytra_here": "Baritone Elytra Tại Đây", + "gui.world_map.baritone_goal_here": "§2%s§r Mục Tiêu Baritone Tại Đây", + "gui.world_map.baritone_path_here": "§2%s§r Đường Đi Baritone Tại Đây", + "gui.world_map.baritone_elytra_here": "§2%s§r Baritone Elytra Tại Đây", "gui.xaeroplus.check_github_button": "Đi Đến Github XaeroPlus để cập nhật", "gui.waypoints.toggle_enable_all": "Chuyển Đổi Kích Hoạt Tất Cả", "setting.world_map.waystones_sync": "Đồng Bộ Hóa Waystones", diff --git a/common/src/main/resources/assets/xaeroplus/lang/zh_cn.json b/common/src/main/resources/assets/xaeroplus/lang/zh_cn.json index e547573d..d5e0030d 100644 --- a/common/src/main/resources/assets/xaeroplus/lang/zh_cn.json +++ b/common/src/main/resources/assets/xaeroplus/lang/zh_cn.json @@ -138,6 +138,12 @@ "setting.keybinds.switch_to_overworld.tooltip": "切换到主世界地图。", "setting.keybinds.switch_to_end": "切换到末地", "setting.keybinds.switch_to_end.tooltip": "切换到末地地图。", + "setting.keybinds.world_map_baritone_goal_here": "巴里顿目标在此（世界地图）", + "setting.keybinds.world_map_baritone_goal_here.tooltip": "如果在查看世界地图时按下，则设置一个巴里顿目标", + "setting.keybinds.world_map_baritone_path_here": "巴里顿路径在此（世界地图）", + "setting.keybinds.world_map_baritone_path_here.tooltip": "如果在查看世界地图时按下，则设置一个巴里顿目标并规划路径", + "setting.keybinds.world_map_baritone_elytra_here": "巴里顿鞘翅在此（世界地图）", + "setting.keybinds.world_map_baritone_elytra_here.tooltip": "如果在查看世界地图时按下，则设置一个巴里顿目标并开始鞘翅飞行", "setting.world_map.nether_cave_fix": "下界洞穴修复", "setting.world_map.nether_cave_fix.tooltip": "当洞穴模式在下界关闭时，强制写入和渲染完整的洞穴地图。\n 如果没有这个，你必须手动将世界地图 1.30.0 版本之前的区域文件移动到正确的洞穴文件夹", "setting.minimap.always_render_player_name": "始终渲染玩家名称", @@ -170,9 +176,9 @@ "gui.xaeroplus.minimap_incompatible.download_minimap": "下载 Xaero 的小地图", "gui.xaeroplus.minimap_incompatible.exit": "出口", "gui.world_map.go_to_coordinates": "转到坐标", - "gui.world_map.baritone_goal_here": "设置 Baritone 目标点", - "gui.world_map.baritone_path_here": "通过 Baritone 寻路至此处", - "gui.world_map.baritone_elytra_here": "通过 Baritone 使用鞘翅寻路至此处", + "gui.world_map.baritone_goal_here": "§2%s§r 设置 Baritone 目标点", + "gui.world_map.baritone_path_here": "§2%s§r 通过 Baritone 寻路至此处", + "gui.world_map.baritone_elytra_here": "§2%s§r 通过 Baritone 使用鞘翅寻路至此处", "gui.xaeroplus.check_github_button": "前往 XaeroPlus Github 获取更新", "gui.waypoints.toggle_enable_all": "切换全部启用", "setting.world_map.waystones_sync": "指路石同步",