Skip to content

Commit f885dac

Browse files
NekiplayNekiplay
committed
Chines languages and Look at waypoint in xaero map
1 parent 48e926e commit f885dac

7 files changed

Lines changed: 81 additions & 1 deletion

File tree

‎src/main/java/nekiplay/meteorplus/mixin/xaero/worldmap/WaypointRendererMixin.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import nekiplay.meteorplus.features.modules.integrations.MapIntegration;
1010
import net.minecraft.client.gui.screen.Screen;
1111
import net.minecraft.util.math.BlockPos;
12+
import net.minecraft.util.math.Vec3d;
1213
import org.spongepowered.asm.mixin.Mixin;
1314
import org.spongepowered.asm.mixin.injection.At;
1415
import org.spongepowered.asm.mixin.injection.Inject;
@@ -23,6 +24,8 @@
2324

2425
import java.util.ArrayList;
2526

27+
import static meteordevelopment.meteorclient.MeteorClient.mc;
28+
2629
@Mixin(WaypointReader.class)
2730
public class WaypointRendererMixin {
2831
@Inject(method = "getRightClickOptions(Lxaero/map/mods/gui/Waypoint;Lxaero/map/gui/IRightClickableElement;)Ljava/util/ArrayList;", at = @At("HEAD"), remap = false, cancellable = true)
@@ -87,6 +90,33 @@ public boolean isActive() {
8790
}
8891
}).setNameFormatArgs(new Object[]{"P"}));
8992
}
93+
94+
rightClickOptions.add((new RightClickOption("gui.world_map.look_at_waypoint", rightClickOptions.size(), target) {
95+
public void onAction(Screen screen) {
96+
Vec3d playerPos = mc.player.getPos();
97+
Vec3d blockCenter = new Vec3d(
98+
element.getX() + 0.5,
99+
element.getY() + 0.5,
100+
element.getZ() + 0.5
101+
);
102+
103+
// Вычисляем вектор направления от игрока к блоку
104+
Vec3d direction = blockCenter.subtract(playerPos).normalize();
105+
106+
// Преобразуем вектор направления в углы поворота (yaw и pitch)
107+
double distanceXZ = Math.sqrt(direction.x * direction.x + direction.z * direction.z);
108+
float yaw = (float)Math.toDegrees(Math.atan2(direction.z, direction.x)) - 90.0F;
109+
float pitch = (float)Math.toDegrees(-Math.atan2(direction.y, distanceXZ));
110+
111+
// Устанавливаем поворот игрока
112+
mc.player.setYaw(yaw);
113+
mc.player.setPitch(pitch);
114+
}
115+
116+
public boolean isActive() {
117+
return true;
118+
}
119+
}).setNameFormatArgs(new Object[]{"P"}));
90120
}
91121

92122
rightClickOptions.add((new RightClickOption("gui.xaero_right_click_waypoint_teleport", rightClickOptions.size(), target) {

‎src/main/resources/assets/meteorplus/lang/de_de.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"gui.world_map.baritone_goal_here": "Baritone das ziel hier",
33
"gui.world_map.baritone_path_here": "Baritone der weg ist hier",
44
"gui.world_map.baritone_elytra_here": "Baritone elitra ist hier",
5-
5+
"gui.world_map.look_at_waypoint": "Siehe den tag",
6+
67
"item.meteorplus.logo": "Meteor+ logo",
78
"item.meteorplus.logo_mods": "Meteor+ Integrations logo",
89

‎src/main/resources/assets/meteorplus/lang/en_us.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"gui.world_map.baritone_goal_here": "Baritone goal here",
33
"gui.world_map.baritone_path_here": "Baritone Path here",
44
"gui.world_map.baritone_elytra_here": "Baritone elytra here",
5+
"gui.world_map.look_at_waypoint": "Look at waypoint",
56

67
"item.meteorplus.logo": "Meteor+ logo",
78
"item.meteorplus.logo_mods": "Meteor+ Integrations logo",

‎src/main/resources/assets/meteorplus/lang/ru_ru.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"gui.world_map.baritone_goal_here": "Baritone цель тут",
33
"gui.world_map.baritone_path_here": "Baritone путь тут",
44
"gui.world_map.baritone_elytra_here": "Baritone элитра тут",
5+
"gui.world_map.look_at_waypoint": "Смотреть на метку",
56

67
"item.meteorplus.logo": "Meteor+ логотип",
78
"item.meteorplus.logo_mods": "Meteor+ Integrations логотип",

‎src/main/resources/assets/meteorplus/lang/uk_ua.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"gui.world_map.baritone_goal_here": "Baritone мета тут",
33
"gui.world_map.baritone_path_here": "Baritone путь тут",
44
"gui.world_map.baritone_elytra_here": "Baritone елітра тут",
5+
"gui.world_map.look_at_waypoint": "Дивитися на мітку",
56

67
"item.meteorplus.logo": "Meteor+ логотип",
78
"item.meteorplus.logo_mods": "Meteor+ Integrations логотип",

‎src/main/resources/assets/meteorplus/lang/zh_cn.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"gui.world_map.baritone_goal_here": "Baritone 目标标记",
3+
"gui.world_map.baritone_path_here": "Baritone 路径标记",
4+
"gui.world_map.baritone_elytra_here": "Baritone 鞘翅飞行标记",
5+
"gui.world_map.look_at_waypoint": "查看标签",
6+
7+
"item.meteorplus.logo": "Meteor+ 主标识",
8+
"item.meteorplus.logo_mods": "Meteor+ 整合包标识",
9+
10+
"modules.meteor-client.better-tooltips.beehive.honey-level": "§7蜂蜜等级：§e%d§7",
11+
"modules.meteor-client.better-tooltips.beehive.bees": "§7蜜蜂数量：§e%d§7",
12+
13+
"modules.meteor-client.better-tooltips.kilobytes": "§7%s KB",
14+
"modules.meteor-client.better-tooltips.bytes": "§7%s 字节",
15+
"modules.meteor-client.better-tooltips.error-getting-bytes": "§c字节数据获取失败",
16+
17+
"modules.meteor-client.better-tooltips.unknown-inventory": "§4未知容器类型",
18+
19+
"modules.meteor-client.better-tooltips.hold-to-preview": "按住 §e%s§r 以预览",
20+
21+
"modules.meteor-client.inventory-tweaks.dump": "批量丢弃",
22+
"modules.meteor-client.inventory-tweaks.steal": "快速拿取"
23+
}

‎src/main/resources/assets/meteorplus/lang/zh_tw.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"gui.world_map.baritone_goal_here": "Baritone 目標標記",
3+
"gui.world_map.baritone_path_here": "Baritone 路徑標記",
4+
"gui.world_map.baritone_elytra_here": "Baritone 鞘翅飛行標記",
5+
"gui.world_map.look_at_waypoint": "查看標籤",
6+
7+
"item.meteorplus.logo": "Meteor+ 主標誌",
8+
"item.meteorplus.logo_mods": "Meteor+ 整合包標誌",
9+
10+
"modules.meteor-client.better-tooltips.beehive.honey-level": "§7蜂蜜等級：§e%d§7",
11+
"modules.meteor-client.better-tooltips.beehive.bees": "§7蜜蜂數量：§e%d§7",
12+
13+
"modules.meteor-client.better-tooltips.kilobytes": "§7%s KB",
14+
"modules.meteor-client.better-tooltips.bytes": "§7%s 位元組",
15+
"modules.meteor-client.better-tooltips.error-getting-bytes": "§c位元組資料獲取失敗",
16+
17+
"modules.meteor-client.better-tooltips.unknown-inventory": "§4未知容器類型",
18+
19+
"modules.meteor-client.better-tooltips.hold-to-preview": "按住 §e%s§r 以預覽",
20+
21+
"modules.meteor-client.inventory-tweaks.dump": "批量丟棄",
22+
"modules.meteor-client.inventory-tweaks.steal": "快速拿取"
23+
}

0 commit comments

Comments
 (0)