From 664374c657848b5dd41b59a79384f97936400205 Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Wed, 8 Jan 2025 13:35:55 +0000 Subject: [PATCH 1/5] i18n: new translations from crowdin --- crowdin/zh_TW.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crowdin/zh_TW.json b/crowdin/zh_TW.json index 86ec06aa..43da9237 100644 --- a/crowdin/zh_TW.json +++ b/crowdin/zh_TW.json @@ -161,7 +161,7 @@ "warp.set.success": "傳送點 %s 已設定.", "warp.unset.success": "傳送點 %s 已移除.", "warp.gui.title": "傳送點", - "warp.tp.success": "Teleported to warp %s.", + "warp.tp.success": "已傳送至傳送點 %s。", "works.list.add": "<#FFA1F5>新增作品", "works.list.all_works": "<#FFA1F5>所有作品", "works.list.help.lore": " - 左鍵 -> 參觀\n - 右鍵 -> 開啟通用設定\n - SHIFT + 右鍵 -> 開啟特殊設定", From dfdd4aace9292198f4e8a4c3a598db5a0289bf67 Mon Sep 17 00:00:00 2001 From: Philipp Daniels Date: Sat, 11 Jan 2025 13:45:40 +0100 Subject: [PATCH 2/5] bug: handle non player place_block in AntiBuild (resolves #241) --- .../initializer/anti_build/AntiBuildInitializer.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/github/sakurawald/module/initializer/anti_build/AntiBuildInitializer.java b/src/main/java/io/github/sakurawald/module/initializer/anti_build/AntiBuildInitializer.java index 2f401cff..26b50c40 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/anti_build/AntiBuildInitializer.java +++ b/src/main/java/io/github/sakurawald/module/initializer/anti_build/AntiBuildInitializer.java @@ -9,6 +9,7 @@ import net.minecraft.entity.player.PlayerEntity; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import java.util.Optional; import java.util.Set; import java.util.function.Supplier; @@ -16,9 +17,7 @@ public class AntiBuildInitializer extends ModuleInitializer { public static final BaseConfigurationHandler config = new ObjectConfigurationHandler<>(BaseConfigurationHandler.CONFIG_JSON, AntiBuildConfigModel.class); public static void checkAntiBuild(PlayerEntity player, String antiType, Set ids, String id, CallbackInfoReturnable cir, T cancelWithValue, Supplier shouldSendFeedback) { - if ((ids.contains(id) || ids.contains("*")) - && !PermissionHelper.hasPermission(player.getUuid(), "fuji.anti_build.%s.bypass.%s".formatted(antiType, id)) - ) { + if ((ids.contains(id) || ids.contains("*")) && !isAllowedByPlayerPermission(player, antiType, id)) { if (shouldSendFeedback.get()) { TextHelper.sendMessageByKey(player, "anti_build.disallow"); } @@ -26,4 +25,10 @@ public static void checkAntiBuild(PlayerEntity player, String antiType, Set< cir.setReturnValue(cancelWithValue); } } + + private static boolean isAllowedByPlayerPermission(PlayerEntity player, String antiType, String id) { + return Optional.ofNullable(player) + .map(p -> PermissionHelper.hasPermission(player.getUuid(), "fuji.anti_build.%s.bypass.%s".formatted(antiType, id))) + .orElse(true); + } } From a2ad3cfec45d3fa11ee23953a2ecf0e80db9200e Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Sat, 11 Jan 2025 15:09:26 +0000 Subject: [PATCH 3/5] i18n: new translations from crowdin --- crowdin/id_ID.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crowdin/id_ID.json b/crowdin/id_ID.json index 6a7317f1..85cea8b2 100644 --- a/crowdin/id_ID.json +++ b/crowdin/id_ID.json @@ -161,7 +161,7 @@ "warp.set.success": "Warp %s diatur.", "warp.unset.success": "Warp %s dihapus.", "warp.gui.title": "Warp", - "warp.tp.success": "Teleported to warp %s.", + "warp.tp.success": "Teleportasi ke warp %s.", "works.list.add": "<#FFA1F5>Tambah pekerjaan", "works.list.all_works": "<#FFA1F5>Semua pekerjaan", "works.list.help.lore": " - Klik kiri -> Kunjungi\n - Klik kanan -> Buka pengaturan umum\n - Shift + Klik kanan -> Buka pengaturan khusus", From 968ff97043318b2e74a9daa069f19822e979e69b Mon Sep 17 00:00:00 2001 From: sakurawald Date: Sat, 11 Jan 2025 23:18:48 +0800 Subject: [PATCH 4/5] update: version + changelog --- CHANGELOG.md | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf052ccc..d6c0e1da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ > The version number of fuji follows `semver` now: https://semver.org/ -- (back module): add option `enable_back_on_death` and `enable_back_on_teleport`. \ No newline at end of file +- (anti_build module) fix: the `place_block` anti-type should not throw `NPE` if a non-player (e.g. a dispenser) places a block. (Thanks to @phaldan) diff --git a/gradle.properties b/gradle.properties index 178bd435..e4a26a93 100755 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.parallel=true # project maven_group=io.github.sakurawald mod_id=fuji -mod_version=6.3.0 +mod_version=6.3.1 # loader minecraft_version=1.21.4 From 9b2afdb39687e812f03fd33e48e60cd57d5c190d Mon Sep 17 00:00:00 2001 From: sakurawald Date: Sat, 11 Jan 2025 23:20:41 +0800 Subject: [PATCH 5/5] update: version + changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6c0e1da..366b6a90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ > The version number of fuji follows `semver` now: https://semver.org/ - (anti_build module) fix: the `place_block` anti-type should not throw `NPE` if a non-player (e.g. a dispenser) places a block. (Thanks to @phaldan) +- i18n: new translation for `zh_tw` and `id_id`. (Thanks to @dirtTW) \ No newline at end of file