From 37adec7b82af7aa80490296cb8e4012a6c36c66e Mon Sep 17 00:00:00 2001 From: Guntram Blohm Date: Thu, 5 Nov 2020 15:05:24 +0100 Subject: [PATCH] Update to 1.16.4, include some changes to French and Hebrew --- Versionfiles | 2 +- build.gradle | 12 +++---- .../durabilityviewer/DurabilityViewer.java | 2 +- .../assets/durabilityviewer/lang/fr_fr.json | 10 +++--- .../assets/durabilityviewer/lang/he_il.json | 32 +++++++++++++++++++ 5 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/assets/durabilityviewer/lang/he_il.json diff --git a/Versionfiles b/Versionfiles index 9da633b..5dd6a75 160000 --- a/Versionfiles +++ b/Versionfiles @@ -1 +1 @@ -Subproject commit 9da633b48d3cb0c3051744f8a40f4f3ead27e750 +Subproject commit 5dd6a75c66f35e7cb3fe6bf2a3b7725171ccff53 diff --git a/build.gradle b/build.gradle index d509776..3f9589d 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 ext.Versions = new Properties() -Versions.load(file("Versionfiles/mcversion-1.16.2.properties").newReader()) +Versions.load(file("Versionfiles/mcversion-1.16.4.properties").newReader()) archivesBaseName = "durabilityviewer" ext.projectVersion = "1.9" @@ -65,14 +65,14 @@ processResources { dependencies { minecraft "com.mojang:minecraft:${Versions['minecraft_version']}" mappings "net.fabricmc:yarn:${Versions['yarn_mappings']}:v2" - modCompile "net.fabricmc:fabric-loader:${Versions['loader_version']}" - modCompile "net.fabricmc.fabric-api:fabric-api:${Versions['fabric_version']}" - modCompile "TechReborn:TechReborn-1.16:3.4.5+build.95" - modCompile "io.github.prospector:modmenu:${Versions['modmenu_version']}" + modImplementation "net.fabricmc:fabric-loader:${Versions['loader_version']}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${Versions['fabric_version']}" + modImplementation "TechReborn:TechReborn-1.16:3.4.5+build.95" + modImplementation "io.github.prospector:modmenu:${Versions['modmenu_version']}" modImplementation "de.guntram.mcmod:crowdin-translate:1.2" include "de.guntram.mcmod:crowdin-translate:1.2" - modCompile "de.guntram.mcmod:GBfabrictools:${Versions['gbfabrictools_version']}" + modImplementation "de.guntram.mcmod:GBfabrictools:${Versions['gbfabrictools_version']}" include "de.guntram.mcmod:GBfabrictools:${Versions['gbfabrictools_version']}" modImplementation "com.github.emilyploszaj:trinkets:v2.4.1" diff --git a/src/main/java/de/guntram/mcmod/durabilityviewer/DurabilityViewer.java b/src/main/java/de/guntram/mcmod/durabilityviewer/DurabilityViewer.java index 71d2f4f..0e14db1 100644 --- a/src/main/java/de/guntram/mcmod/durabilityviewer/DurabilityViewer.java +++ b/src/main/java/de/guntram/mcmod/durabilityviewer/DurabilityViewer.java @@ -24,7 +24,7 @@ public class DurabilityViewer implements ClientModInitializer @Override public void onInitializeClient() { - CrowdinTranslate.downloadTranslations(MODID, MODID, true); + CrowdinTranslate.downloadTranslations(MODID); setKeyBindings(); confHandler=ConfigurationHandler.getInstance(); ConfigurationProvider.register(MODNAME, confHandler); diff --git a/src/main/resources/assets/durabilityviewer/lang/fr_fr.json b/src/main/resources/assets/durabilityviewer/lang/fr_fr.json index f9b9a66..fb6fd1b 100644 --- a/src/main/resources/assets/durabilityviewer/lang/fr_fr.json +++ b/src/main/resources/assets/durabilityviewer/lang/fr_fr.json @@ -15,13 +15,13 @@ "durabilityviewer.config.showalltrinkets": "Afficher tous les bibelots", "durabilityviewer.config.percentvalues": "Pourcentages", "durabilityviewer.config.tt.corner": "Coin 0 à 3 - en bas à droite, en bas à gauche, en haut à droite, en haut à gauche", - "durabilityviewer.config.tt.armorhotbar": "Rendre l'armure autour de la barre d'accès rapide (au lieu d'être autour des outils)", + "durabilityviewer.config.tt.armorhotbar": "Afficher l'armure autour de la barre d'accès rapide (au lieu d'être autour des outils)", "durabilityviewer.config.tt.tooltipcolor": "Couleur Minecraft 0 .. 15", - "durabilityviewer.config.tt.effectduration": "Afficher les durées d'effets", + "durabilityviewer.config.tt.effectduration": "Afficher la durée des effets", "durabilityviewer.config.tt.minpercent": "Jouer du son lorsque la durabilité est inférieure à X pourcent", - "durabilityviewer.config.tt.mindurability": "Jouer du son lorsque la durabilité est inférieure à X", - "durabilityviewer.config.tt.setwindowtitle": "Définir le titre de la fenêtre au joueur et au nom du serveur", - "durabilityviewer.config.tt.showdamagepercent": "Montrer les dommages au lieu de la durabilité alors que l'item est encore meilleur que ce %", + "durabilityviewer.config.tt.mindurability": "Jouer un son lorsque la durabilité est inférieure à X", + "durabilityviewer.config.tt.setwindowtitle": "Définir le titre de la fenêtre au nom du joueur et du serveur", + "durabilityviewer.config.tt.showdamagepercent": "Montrer les dommages au lieu de la durabilité quand l'item est encore meilleur que ce %", "durabilityviewer.config.tt.showfreeslots": "Afficher l'icône du coffre avec le nombre d'emplacements libres pour l'inventaire", "durabilityviewer.config.tt.showalltrinkets": "Si vous avez le mod bibelots, montrez tous les bibelots même s'ils n'ont pas de durabilité/endommagement", "durabilityviewer.config.tt.percentvalues": "Montrer les pourcentages au lieu des valeurs absolues", diff --git a/src/main/resources/assets/durabilityviewer/lang/he_il.json b/src/main/resources/assets/durabilityviewer/lang/he_il.json new file mode 100644 index 0000000..7a24fb5 --- /dev/null +++ b/src/main/resources/assets/durabilityviewer/lang/he_il.json @@ -0,0 +1,32 @@ +{ + "durabilityviewer.config.bottom_right": "למטה מימין", + "durabilityviewer.config.bottom_left": "למטה משמאל", + "durabilityviewer.config.top_right": "למעלה מימין", + "durabilityviewer.config.top_left": "למעלה משמאל", + "durabilityviewer.config.corner": "HUD Corner", + "durabilityviewer.config.armorhotbar": "Armor around hotbar", + "durabilityviewer.config.tooltipcolor": "Tooltip Color", + "durabilityviewer.config.effectduration": "משך ההשפעה", + "durabilityviewer.config.minpercent": "Sound below percent", + "durabilityviewer.config.mindurability": "Sound below durability", + "durabilityviewer.config.setwindowtitle": "Set window title", + "durabilityviewer.config.showdamagepercent": "Percent to show damage", + "durabilityviewer.config.showfreeslots": "Show free inventory slots", + "durabilityviewer.config.showalltrinkets": "Show all trinkets", + "durabilityviewer.config.percentvalues": "אחוזים", + "durabilityviewer.config.tt.corner": "Corner 0 to 3 - bottom right, bottom left, top right, top left", + "durabilityviewer.config.tt.armorhotbar": "Render armor around hotbar (instead of with tools)", + "durabilityviewer.config.tt.tooltipcolor": "Minecraft Color 0 .. 15", + "durabilityviewer.config.tt.effectduration": "Show effect durations", + "durabilityviewer.config.tt.minpercent": "Play sound when durability below X percent", + "durabilityviewer.config.tt.mindurability": "Play sound when durability below X", + "durabilityviewer.config.tt.setwindowtitle": "Set window title to player and server name", + "durabilityviewer.config.tt.showdamagepercent": "Show damage instead of durability while the item is still better than this %", + "durabilityviewer.config.tt.showfreeslots": "Show chest icon with number of free inventory slots", + "durabilityviewer.config.tt.showalltrinkets": "If you have the trinkets mod, show all trinkets even when they don't have durability/damage", + "durabilityviewer.config.tt.percentvalues": "Show percentages instead of absolute values", + "key.categories.durabilityviewer": "Durability Viewer", + "key.durabilityviewer.showhide": "Show/hide durability display", + "tooltip.durability": "Durability %s", + "durabilityviewer.subtitle.toolBreaking": "החפץ עומד להישבר" +}