Merge pull request #11 from LTHCTheMaster/Dev

Dev
LTHCTheMaster · Jul 24, 2022 · 8119f59 · 8119f59
2 parents 4bb4620 + ad65c98
commit 8119f59
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 12 deletions.
diff --git a/Datapack/data/lthc.mage/functions/mental_state/mental_reader/bad.mcfunction b/Datapack/data/lthc.mage/functions/mental_state/mental_reader/bad.mcfunction
@@ -3,4 +3,4 @@ scoreboard players set #200 lthc.mage.data 200
 scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
 scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
 scoreboard players operation #temp lthc.mage.data /= #200 lthc.mage.data
-title @s actionbar [{"text": "Hell - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
+title @s actionbar [{"translate": "Bad - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
diff --git a/Datapack/data/lthc.mage/functions/mental_state/mental_reader/good.mcfunction b/Datapack/data/lthc.mage/functions/mental_state/mental_reader/good.mcfunction
@@ -3,4 +3,4 @@ scoreboard players set #1111 lthc.mage.data 1111
 scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
 scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
 scoreboard players operation #temp lthc.mage.data /= #1111 lthc.mage.data
-title @s actionbar [{"text": "Good - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
+title @s actionbar [{"translate": "Good - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
diff --git a/Datapack/data/lthc.mage/functions/mental_state/mental_reader/hell.mcfunction b/Datapack/data/lthc.mage/functions/mental_state/mental_reader/hell.mcfunction
@@ -3,4 +3,4 @@ scoreboard players set #20 lthc.mage.data 20
 scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
 scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
 scoreboard players operation #temp lthc.mage.data /= #20 lthc.mage.data
-title @s actionbar [{"text": "Hell - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
+title @s actionbar [{"translate": "Hell - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
diff --git a/Datapack/data/lthc.mage/functions/mental_state/mental_reader/neutral.mcfunction b/Datapack/data/lthc.mage/functions/mental_state/mental_reader/neutral.mcfunction
@@ -3,4 +3,4 @@ scoreboard players set #500 lthc.mage.data 500
 scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
 scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
 scoreboard players operation #temp lthc.mage.data /= #500 lthc.mage.data
-title @s actionbar [{"text": "Neutral - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
+title @s actionbar [{"translate": "Neutral - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
diff --git a/Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_bad.mcfunction b/Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_bad.mcfunction
@@ -3,4 +3,4 @@ scoreboard players set #90 lthc.mage.data 90
 scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
 scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
 scoreboard players operation #temp lthc.mage.data /= #90 lthc.mage.data
-title @s actionbar [{"text": "Really Bad - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
+title @s actionbar [{"translate": "Really Bad - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
diff --git a/Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_bad_p.mcfunction b/Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_bad_p.mcfunction
@@ -3,4 +3,4 @@ scoreboard players set #55 lthc.mage.data 55
 scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
 scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
 scoreboard players operation #temp lthc.mage.data /= #55 lthc.mage.data
-title @s actionbar [{"text": "Really Bad + - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
+title @s actionbar [{"translate": "Really Bad + - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
diff --git a/Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_bad_pp.mcfunction b/Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_bad_pp.mcfunction
@@ -3,4 +3,4 @@ scoreboard players set #35 lthc.mage.data 35
 scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
 scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
 scoreboard players operation #temp lthc.mage.data /= #35 lthc.mage.data
-title @s actionbar [{"text": "Really Bad ++ - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
+title @s actionbar [{"translate": "Really Bad ++ - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
diff --git a/Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_good.mcfunction b/Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_good.mcfunction
@@ -3,4 +3,4 @@ scoreboard players set #2300 lthc.mage.data 2300
 scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
 scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
 scoreboard players operation #temp lthc.mage.data /= #2300 lthc.mage.data
-title @s actionbar [{"text": "Really Good - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
+title @s actionbar [{"translate": "Really Good - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
diff --git a/Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_good_p.mcfunction b/Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_good_p.mcfunction
@@ -3,4 +3,4 @@ scoreboard players set #4750 lthc.mage.data 4750
 scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
 scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
 scoreboard players operation #temp lthc.mage.data /= #4750 lthc.mage.data
-title @s actionbar [{"text": "Really Good + - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
+title @s actionbar [{"translate": "Really Good + - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
diff --git a/Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_good_pp.mcfunction b/Datapack/data/lthc.mage/functions/mental_state/mental_reader/really_good_pp.mcfunction
@@ -3,4 +3,4 @@ scoreboard players set #10235 lthc.mage.data 10235
 scoreboard players operation #temp lthc.mage.data = @s lthc.mage.mental_state_2
 scoreboard players operation #temp lthc.mage.data *= #100 lthc.mage.data
 scoreboard players operation #temp lthc.mage.data /= #10235 lthc.mage.data
-title @s actionbar [{"text": "Really Good ++ - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
+title @s actionbar [{"translate": "Really Good ++ - ", "italic": false, "color": "#FFFFFF","bold": true},{"score":{"name":"#temp","objective":"lthc.mage.data"}},{"text":"%"}]
diff --git a/Resourcespack/assets/minecraft/lang/fr_ca.json b/Resourcespack/assets/minecraft/lang/fr_ca.json
@@ -120,5 +120,17 @@
 "\nWork with any essences": "\nFonctionne avec toutes les essences.",
 "Compact Essences": "Essences Compactes",
 "\nsame for each essences": "\nla même pour chaque essence.",
-"\nWork with any pylons": "\nFonctionne avec tous les pylônes."
+"\nWork with any pylons": "\nFonctionne avec tous les pylônes.",
+
+"__comments": "mental state",
+"Bad - ":"Mauvais - ",
+"Good - ":"Bon - ",
+"Hell - ":"Enfer - ",
+"Neutral - ":"Neutre - ",
+"Really Bad + - ":"Très mauvais + - ",
+"Really Bad ++ - ":"Très mauvais ++ - ",
+"Really Good + - ":"Très bon + - ",
+"Really Good ++ - ":"Très bon ++ - ",
+"Really Good":"Très bon"
+
 }
diff --git a/Resourcespack/assets/minecraft/lang/fr_fr.json b/Resourcespack/assets/minecraft/lang/fr_fr.json
@@ -121,5 +121,17 @@
 "\nWork with any essences": "\nFonctionne avec toutes les essences.",
 "Compact Essences": "Essences Compactes",
 "\nsame for each essences": "\nla même pour chaque essence.",
-"\nWork with any pylons": "\nFonctionne avec tous les pylônes."
+"\nWork with any pylons": "\nFonctionne avec tous les pylônes.",
+
+"__comments": "mental state",
+"Bad - ":"Mauvais - ",
+"Good - ":"Bon - ",
+"Hell - ":"Enfer - ",
+"Neutral - ":"Neutre - ",
+"Really Bad + - ":"Très mauvais + - ",
+"Really Bad ++ - ":"Très mauvais ++ - ",
+"Really Good + - ":"Très bon + - ",
+"Really Good ++ - ":"Très bon ++ - ",
+"Really Good":"Très bon"
+
 }