diff --git a/gradle.properties b/gradle.properties index 1a633f77..d884b016 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ yarn_mappings=1.20.4+build.3 loader_version=0.15.7 # Mod Properties -mod_version=0.2.14 +mod_version=0.2.15 maven_group=zailer.me archives_base_name=fzmm diff --git a/src/main/java/fzmm/zailer/me/client/gui/components/image/source/ImageFileDialogSource.java b/src/main/java/fzmm/zailer/me/client/gui/components/image/source/ImageFileDialogSource.java index 2381f9b2..fe518eda 100644 --- a/src/main/java/fzmm/zailer/me/client/gui/components/image/source/ImageFileDialogSource.java +++ b/src/main/java/fzmm/zailer/me/client/gui/components/image/source/ImageFileDialogSource.java @@ -1,7 +1,6 @@ package fzmm.zailer.me.client.gui.components.image.source; import fzmm.zailer.me.client.FzmmClient; -import net.minecraft.text.Text; import net.minecraft.util.Util; import org.lwjgl.PointerBuffer; import org.lwjgl.system.MemoryStack; @@ -37,10 +36,10 @@ public void execute(Consumer consumer) { filterPatterns.flip(); String imagePath = TinyFileDialogs.tinyfd_openFileDialog( - Text.translatable("fzmm.gui.fileDialog.image.title").getString(), + "Choose image file", null, filterPatterns, - Text.translatable("fzmm.gui.fileDialog.image.filter").getString(), + "Image files (JPG, PNG, GIF, BMP)", false ); if (imagePath != null) { diff --git a/src/main/java/fzmm/zailer/me/client/gui/encrypt_book/translation_file_saver/TranslationCreateResourcePack.java b/src/main/java/fzmm/zailer/me/client/gui/encrypt_book/translation_file_saver/TranslationCreateResourcePack.java index 10c73c8e..52c8bffb 100644 --- a/src/main/java/fzmm/zailer/me/client/gui/encrypt_book/translation_file_saver/TranslationCreateResourcePack.java +++ b/src/main/java/fzmm/zailer/me/client/gui/encrypt_book/translation_file_saver/TranslationCreateResourcePack.java @@ -20,7 +20,7 @@ public Text getMessage() { public CompletableFuture save(TranslationEncryptProfile profile) { return CompletableFuture.supplyAsync(() -> { String resourcePackPath = TinyFileDialogs.tinyfd_saveFileDialog( - Text.translatable("fzmm.gui.resourcePackBuilder.dialog.newResourcePack.title").getString(), + "Save resource pack", MinecraftClient.getInstance().getResourcePackDir().resolve("resourcepack.zip").toString(), null, null diff --git a/src/main/java/fzmm/zailer/me/client/gui/encrypt_book/translation_file_saver/TranslationUpdateResourcePack.java b/src/main/java/fzmm/zailer/me/client/gui/encrypt_book/translation_file_saver/TranslationUpdateResourcePack.java index d9fca821..b01a4f2e 100644 --- a/src/main/java/fzmm/zailer/me/client/gui/encrypt_book/translation_file_saver/TranslationUpdateResourcePack.java +++ b/src/main/java/fzmm/zailer/me/client/gui/encrypt_book/translation_file_saver/TranslationUpdateResourcePack.java @@ -27,10 +27,10 @@ public CompletableFuture save(TranslationEncryptProfile profile) { filterPatterns.flip(); String resourcePackPath = TinyFileDialogs.tinyfd_openFileDialog( - Text.translatable("fzmm.gui.resourcePackBuilder.dialog.updateResourcePack.title").getString(), + "Choose resource pack", MinecraftClient.getInstance().getResourcePackDir().toString() + "/", filterPatterns, - Text.translatable("fzmm.gui.resourcePackBuilder.dialog.updateResourcePack.filter").getString(), + "Resource pack (ZIP)", false ); boolean cancelled = resourcePackPath == null; diff --git a/src/main/java/fzmm/zailer/me/client/gui/encrypt_book/translation_file_saver/TranslationWriteLang.java b/src/main/java/fzmm/zailer/me/client/gui/encrypt_book/translation_file_saver/TranslationWriteLang.java index a5ce5aef..c0e5fd82 100644 --- a/src/main/java/fzmm/zailer/me/client/gui/encrypt_book/translation_file_saver/TranslationWriteLang.java +++ b/src/main/java/fzmm/zailer/me/client/gui/encrypt_book/translation_file_saver/TranslationWriteLang.java @@ -22,7 +22,7 @@ public Text getMessage() { public CompletableFuture save(TranslationEncryptProfile profile) { return CompletableFuture.supplyAsync(() -> { String langPath = TinyFileDialogs.tinyfd_saveFileDialog( - Text.translatable("fzmm.gui.encryptbook.getDecryptor.option.writeLang.dialog.title").getString(), + "Save language file", MinecraftClient.getInstance().getResourcePackDir().resolve("en_us.json").toString(), null, null diff --git a/src/main/resources/assets/fzmm/lang/en_us.json b/src/main/resources/assets/fzmm/lang/en_us.json index 8552ca36..c19f21b5 100644 --- a/src/main/resources/assets/fzmm/lang/en_us.json +++ b/src/main/resources/assets/fzmm/lang/en_us.json @@ -154,7 +154,6 @@ "fzmm.gui.encryptbook.button.give": "Give book", "fzmm.gui.encryptbook.getDecryptor.option.copyTranslation": "Copy translation", "fzmm.gui.encryptbook.getDecryptor.option.writeLang": "Write language file", - "fzmm.gui.encryptbook.getDecryptor.option.writeLang.dialog.title": "Save language file", "fzmm.gui.encryptbook.getDecryptor.snack_bar.error": "Error saving decryptor", "fzmm.gui.encryptbook.getDecryptor.snack_bar.success": "Decryptor saved (requires F3+T)", "fzmm.gui.encryptbook.getDecryptor.title": "Get decryptor", @@ -171,8 +170,6 @@ "fzmm.gui.encryptbook.option.paddingCharacters.tooltip": "Characters to add to the end of the message\nto reach the required numbers of characters.", "fzmm.gui.encryptbook.option.title": "Book title", "fzmm.gui.encryptbook.option.title.tooltip": "Title of the book.", - "fzmm.gui.fileDialog.image.filter": "Image files (JPG, PNG, GIF, BMP)", - "fzmm.gui.fileDialog.image.title": "Choose image file", "fzmm.gui.headGallery.button.category.alphabet": "Alphabet", "fzmm.gui.headGallery.button.category.animals": "Animals", "fzmm.gui.headGallery.button.category.blocks": "Blocks", @@ -363,9 +360,6 @@ "fzmm.gui.playerStatue.tab.update.tooltip": "Update the player statue container in your hand with new values,\navoiding having to re-generate it to change place.", "fzmm.gui.playerStatuePlacer.label.requirement.invalidYaw": "Invalid yaw, try to rotate the camera", "fzmm.gui.playerStatuePlacer.option.execute": "Place player statue", - "fzmm.gui.resourcePackBuilder.dialog.newResourcePack.title": "Save resource pack", - "fzmm.gui.resourcePackBuilder.dialog.updateResourcePack.filter": "Resource pack (ZIP)", - "fzmm.gui.resourcePackBuilder.dialog.updateResourcePack.title": "Choose resource pack", "fzmm.gui.resourcePackBuilder.option.newResourcePack": "New resource pack", "fzmm.gui.resourcePackBuilder.option.updateResourcePack": "Update resource pack", "fzmm.gui.selectItem.button.source.all": "All",