From 210e9e973208379a1e54f8b11a9bfdef54ba8476 Mon Sep 17 00:00:00 2001
From: Kawaa <89033115+Kawaa-qwq@users.noreply.github.com>
Date: Mon, 5 Sep 2022 22:12:38 +0800
Subject: [PATCH] Added a directive to fix some minor bugs (#1744)
* Pull request made after merging the latest version
* Update src/main/resources/languages/ja-JP.json
---
.../emu/grasscutter/command/commands/PositionCommand.java | 3 ++-
src/main/java/emu/grasscutter/tools/Tools.java | 4 +++-
src/main/resources/languages/en-US.json | 4 ++--
src/main/resources/languages/es-ES.json | 4 ++--
src/main/resources/languages/fr-FR.json | 4 ++--
src/main/resources/languages/ja-JP.json | 4 ++--
src/main/resources/languages/ko-KR.json | 4 ++--
src/main/resources/languages/pl-PL.json | 4 ++--
src/main/resources/languages/ro-RO.json | 4 ++--
src/main/resources/languages/ru-RU.json | 2 +-
src/main/resources/languages/zh-CN.json | 7 +++----
src/main/resources/languages/zh-TW.json | 4 ++--
12 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/src/main/java/emu/grasscutter/command/commands/PositionCommand.java b/src/main/java/emu/grasscutter/command/commands/PositionCommand.java
index 92a6ee0a..e899287e 100644
--- a/src/main/java/emu/grasscutter/command/commands/PositionCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/PositionCommand.java
@@ -13,7 +13,8 @@ public final class PositionCommand implements CommandHandler {
@Override
public void execute(Player sender, Player targetPlayer, List<String> args) {
Position pos = targetPlayer.getPosition();
+ Position rot = targetPlayer.getRotation();
CommandHandler.sendTranslatedMessage(sender, "commands.position.success",
- pos.getX(), pos.getY(), pos.getZ(), targetPlayer.getSceneId());
+ pos.getX(), pos.getY(), pos.getZ(), rot.getX(), rot.getY(), rot.getZ(), targetPlayer.getSceneId());
}
}
diff --git a/src/main/java/emu/grasscutter/tools/Tools.java b/src/main/java/emu/grasscutter/tools/Tools.java
index e9ebe9f8..792b8e77 100644
--- a/src/main/java/emu/grasscutter/tools/Tools.java
+++ b/src/main/java/emu/grasscutter/tools/Tools.java
@@ -97,7 +97,9 @@ public final class Tools {
// Write txt files
for (int i = 0; i < TextStrings.NUM_LANGUAGES; i++) {
- final String fileName = "./GM Handbook - %s.txt".formatted(TextStrings.ARR_LANGUAGES[i]);
+ File GMHandbookOutputpath=new File("./GM Handbook");
+ GMHandbookOutputpath.mkdir();
+ final String fileName = "./GM Handbook/GM Handbook - %s.txt".formatted(TextStrings.ARR_LANGUAGES[i]);
try (PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(fileName), StandardCharsets.UTF_8), false)) {
writer.write(handbookBuilders.get(i).toString());
}
diff --git a/src/main/resources/languages/en-US.json b/src/main/resources/languages/en-US.json
index a77afd3c..76b61daa 100644
--- a/src/main/resources/languages/en-US.json
+++ b/src/main/resources/languages/en-US.json
@@ -207,8 +207,8 @@
"description": "Grants or removes a permission for a user"
},
"position": {
- "success": "Coordinates: %s, %s, %s\nScene ID: %s",
- "description": "Get coordinates"
+ "success": "Coordinates: %s, %s, %s\nRotation锛�%s, %s, %s\nScene ID: %s",
+ "description": "Gets position and rotation information"
},
"quest": {
"added": "Quest %s added.",
diff --git a/src/main/resources/languages/es-ES.json b/src/main/resources/languages/es-ES.json
index a7978ea9..657ff807 100644
--- a/src/main/resources/languages/es-ES.json
+++ b/src/main/resources/languages/es-ES.json
@@ -207,8 +207,8 @@
"description": "Da o quita un permiso a un jugador"
},
"position": {
- "success": "Coordenadas: %s, %s, %s\nID del escenario: %s",
- "description": "Da las coordenadas en el escenario actual"
+ "success": "Coordenadas: %s, %s, %s\nRotaci贸n: %s, %s, %s\nID del escenario: %s",
+ "description": "Obtener informaci贸n sobre ubicaci贸n y rotaci贸n"
},
"quest": {
"added": "Misi贸n %s a帽adida.",
diff --git a/src/main/resources/languages/fr-FR.json b/src/main/resources/languages/fr-FR.json
index 1e812288..050917a7 100644
--- a/src/main/resources/languages/fr-FR.json
+++ b/src/main/resources/languages/fr-FR.json
@@ -207,8 +207,8 @@
"description": "Accorde ou retire une permission a un utilisateur"
},
"position": {
- "success": "Coordon茅es: %s, %s, %s\nID de la sc猫ne: %s",
- "description": "Obtenir vos coordonn茅es"
+ "success": "Coordon茅es: %s, %s, %s\nRotatifs锛�%s, %s, %s\nID de la sc猫ne: %s",
+ "description": "Obtient des informations de position et de rotation"
},
"quest": {
"added": "Qu锚te %s ajout茅e.",
diff --git a/src/main/resources/languages/ja-JP.json b/src/main/resources/languages/ja-JP.json
index 4b9b91b9..f96aa0dd 100644
--- a/src/main/resources/languages/ja-JP.json
+++ b/src/main/resources/languages/ja-JP.json
@@ -207,8 +207,8 @@
"description": "銉︺兗銈躲兗銇ī闄愩倰浠樹笌銇俱仧銇墛闄ゃ仐銇俱仚"
},
"position": {
- "success": "搴ф: %s銆�%s銆�%s\n銈枫兗銉矷D: %s",
- "description": "搴ф銈掑彇寰椼仚銈�"
+ "success": "搴ф锛�%s銆�%s銆�%s\n鍥炶虎锛�%s銆�%s銆�%s\n銈枫兗銉矷D: %s",
+ "description": "浣嶇疆銇ㄥ洖杌㈡儏鍫便倰鍙栧緱銇椼伨銇�"
},
"quest": {
"added": "銈偍銈广儓 %s 銇岃拷鍔犮仌銈屻伨銇椼仧銆�",
diff --git a/src/main/resources/languages/ko-KR.json b/src/main/resources/languages/ko-KR.json
index 06f244c3..07298ec8 100644
--- a/src/main/resources/languages/ko-KR.json
+++ b/src/main/resources/languages/ko-KR.json
@@ -207,8 +207,8 @@
"description": "靷毄鞛愳棎瓴� 甓岉暅鞚� 攵€鞐晿瓯半倶 鞝滉卑頃╇媹雼�."
},
"position": {
- "success": "膦岉憸: %s, %s, %s\nScene ID: %s",
- "description": "膦岉憸毳� 於滊牓頃╇媹雼�"
+ "success": "膦岉憸: %s, %s, %s\n須岇爠锛�%s, %s, %s\nScene ID: %s",
+ "description": "鞙勳箻 氚� 須岇爠 鞝曤炒毳� 臧€鞝胳樀雼堧嫟"
},
"quest": {
"added": "%s 韤橃姢韸戈皜 於旉皜霅橃棃鞀惦媹雼�.",
diff --git a/src/main/resources/languages/pl-PL.json b/src/main/resources/languages/pl-PL.json
index 3b8a1d1d..f1f9bd16 100644
--- a/src/main/resources/languages/pl-PL.json
+++ b/src/main/resources/languages/pl-PL.json
@@ -207,8 +207,8 @@
"description": "Dodaj lub usu艅 uprawnienia podanego gracza."
},
"position": {
- "success": "Koordynaty: (%s, %s, %s).\nID sceny: %s.",
- "description": "Poka偶 gdzie znajduje si臋 dany gracz."
+ "success": "Koordynaty: (%s, %s, %s).\nKr膮偶y膰锛�%s, %s, %s\nID sceny: %s.",
+ "description": "Pobiera informacje o pozycji i obrocie"
},
"quest": {
"added": "Zadanie %s zosta艂o dodane.",
diff --git a/src/main/resources/languages/ro-RO.json b/src/main/resources/languages/ro-RO.json
index 2ccd78c6..1d337def 100644
--- a/src/main/resources/languages/ro-RO.json
+++ b/src/main/resources/languages/ro-RO.json
@@ -207,8 +207,8 @@
"description": "Acord膬 sau elimin膬 o permisiune de la un utilizator."
},
"position": {
- "success": "Coordonate: %s, %s, %s\nScene ID: %s",
- "description": "Ob葲ine葲i coordonatele"
+ "success": "Coordonate: %s, %s, %s\nGraviteaz膬锛�%s, %s, %s\nScene ID: %s",
+ "description": "Ob葲ine informa葲ii despre pozi葲ie 葯i rota葲ie"
},
"quest": {
"added": "Misiunea %s ad膬ugat膬.",
diff --git a/src/main/resources/languages/ru-RU.json b/src/main/resources/languages/ru-RU.json
index ea6c396a..99a42a0c 100644
--- a/src/main/resources/languages/ru-RU.json
+++ b/src/main/resources/languages/ru-RU.json
@@ -207,7 +207,7 @@
"description": "袛芯斜邪胁谢褟械褌 (add) 懈谢懈 褍写邪谢褟械褌 (remove) 褉邪蟹褉械褕械薪懈褟 褍 锌芯谢褜蟹芯胁邪褌械谢褟"
},
"position": {
- "success": "袣芯芯褉写懈薪邪褌褘: %s, %s, %s\nID 褋褑械薪褘: %s",
+ "success": "袣芯芯褉写懈薪邪褌褘: %s, %s, %s\n袩芯胁芯褉芯褌锛�%s, %s, %s\nID 褋褑械薪褘: %s",
"description": "袩芯蟹胁芯谢褟械褌 锌芯谢褍褔懈褌褜 泻芯芯褉写懈薪邪褌褘"
},
"quest": {
diff --git a/src/main/resources/languages/zh-CN.json b/src/main/resources/languages/zh-CN.json
index 1362d06f..95672d89 100644
--- a/src/main/resources/languages/zh-CN.json
+++ b/src/main/resources/languages/zh-CN.json
@@ -181,7 +181,7 @@
},
"killall": {
"scene_not_found_in_player_world": "鏈湪鐜╁涓栫晫涓壘鍒版鍦烘櫙銆�",
- "kill_monsters_in_scene": "宸叉潃姝诲満鏅� %s 涓殑 %s 涓€墿銆�",
+ "kill_monsters_in_scene": "宸叉潃姝� %s 涓€墿銆� [鍦烘櫙ID: %s ]",
"description": "鏉€姝绘墍鏈夋€墿"
},
"killCharacter": {
@@ -207,9 +207,8 @@
"description": "娣诲姞鎴栫Щ闄ゆ寚瀹氱帺瀹剁殑鏉冮檺"
},
"position": {
- "success": "鍧愭爣锛�%s, %s, %s\n鍦烘櫙ID锛�%s",
- "description": "鑾峰彇鎵€鍦ㄤ綅缃�"
- },
+ "success": "鍧愭爣锛�%s, %s, %s\n鏃嬭浆锛�%s, %s, %s\n鍦烘櫙ID锛�%s",
+ "description": "鑾峰彇鎵€鍦ㄤ綅缃拰鏃嬭浆淇℃伅"},
"quest": {
"added": "宸叉坊鍔犱换鍔� %s銆�",
"finished": "宸插畬鎴愪换鍔� %s銆�",
diff --git a/src/main/resources/languages/zh-TW.json b/src/main/resources/languages/zh-TW.json
index 365de4da..f0a71513 100644
--- a/src/main/resources/languages/zh-TW.json
+++ b/src/main/resources/languages/zh-TW.json
@@ -207,8 +207,8 @@
"description": "鎸囨淳鎴栫Щ闄ゆ寚瀹氱帺瀹剁殑娆婇檺銆�"
},
"position": {
- "success": "搴ф锛�%s, %s, %s\n鍫存櫙ID锛�%s",
- "description": "鐛插彇鐩墠鎵€鍦ㄤ綅缃殑搴ф銆�"
+ "success": "鍧愭锛�%s, %s, %s\n鏃嬭綁锛�%s, %s, %s\n鍫存櫙ID锛�%s",
+ "description": "鐛插彇鎵€鍦ㄥ潗妯欏拰鏃嬭綁淇℃伅"
},
"quest": {
"added": "宸叉坊鍔犱换鍕� %s",
--
GitLab