fix: merge issues

Direwolf20-MC · Oct 20, 2023 · 3e925d9 · 3e925d9
1 parent 5507a0f
commit 3e925d9
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### [1.15.5]
 
+#### Added
+
+- Creative energy upgrade. Thanks to [#197](https://github.com/Direwolf20-MC/MiningGadgets/pull/197) [@Anoyomouse](https://github.com/Anoyomouse)
+- Portuguese (Brazil) translations. Thanks to [#211](https://github.com/Direwolf20-MC/MiningGadgets/pull/211) [@3AAndreAugustoDev](https://github.com/AndreAugustoDev)
+- French translations. Thanks to [#171](https://github.com/Direwolf20-MC/MiningGadgets/pull/171) [@dadobug1111](https://github.com/dadobug1111)
+
 #### Fixed
 
 - 3x3 upgrades will no longer disappear from the gadget after updating from `1.15.3` or earlier. Thanks to [#227](https://github.com/Direwolf20-MC/MiningGadgets/pull/227) [@Anoyomouse](https://github.com/Anoyomouse)

diff --git a/build.gradle b/build.gradle
@@ -85,6 +85,9 @@ repositories {
             includeGroup("mezz.jei")
         }
     }
+
+    maven { url = "https://maven.architectury.dev" }
+
     maven {
         url "https://www.cursemaven.com"
         content {
@@ -115,8 +118,9 @@ dependencies {
 
 //    runtimeOnly fg.deobf("curse.maven:inventory-tweaks-renewed:3102237")
 //    runtimeOnly fg.deobf("curse.maven:lollipop-347954:3232534")
-//    runtimeOnly fg.deobf("curse.maven:powah-352656:352656")
 //    runtimeOnly fg.deobf("curse.maven:mekanism-268560:268560")
+
+    runtimeOnly fg.deobf("curse.maven:charging-gadgets-399757:4617304")
 }
 
 processResources {
@@ -138,12 +142,15 @@ processResources {
 		def jsonBytesSaved = 0
 
 	    fileTree(dir: outputs.files.asPath, include: '**/*.json').each {
-
 			File file = it
 			jsonMinified++
 			def oldLength = file.length()
-			file.text = JsonOutput.toJson(new JsonSlurper().parse(file))
-			jsonBytesSaved += oldLength - file.length()
+			try {
+                file.text = JsonOutput.toJson(new JsonSlurper().parse(file))
+                jsonBytesSaved += oldLength - file.length()
+            } catch (Exception e) {
+                println('Failed to minify ' + it + ' ' + e)
+            }
 		}
 
 		println('Minified ' + jsonMinified + ' json files. Saved ' + jsonBytesSaved + ' bytes. Took ' + (System.currentTimeMillis() - jsonMinifyStart) + 'ms.')

diff --git a/src/generated/resources/.cache/2e50376a258ceefdeaf48c21f919aaa551c1fbe8 b/src/generated/resources/.cache/2e50376a258ceefdeaf48c21f919aaa551c1fbe8
@@ -1,9 +1,10 @@
-// 1.20.1	2023-10-03T15:56:54.8095774	Item Models
+// 1.20.1	2023-10-20T21:43:10.440018	Item Models
 8da37fe8fa2b785fbf0633e3d25dfc8502305df3 assets/mininggadgets/models/item/minerslight.json
 6e083fdcfbbe3ace1ce88136cfe9d68bf07c5490 assets/mininggadgets/models/item/modificationtable.json
 00d58751e2423f4999a59ca9019b15100de3da1b assets/mininggadgets/models/item/upgrade_battery_1.json
 5b7cbf3ad35790168c87ca770fa22158436459f0 assets/mininggadgets/models/item/upgrade_battery_2.json
 bbf2e8b8b73bdecaa471e48bde4064c6f165106a assets/mininggadgets/models/item/upgrade_battery_3.json
+7554d06952f0b2d0fa9d205b76a557575a8a3281 assets/mininggadgets/models/item/upgrade_battery_creative.json
 58815a83891b831ec777b939d77ebc1ec3b83777 assets/mininggadgets/models/item/upgrade_efficiency_1.json
 f6c8071ed2b64977071d63b1a4d9e6803ff0cff1 assets/mininggadgets/models/item/upgrade_efficiency_2.json
 4423e551abeb76abb309020a89ee44fa0871f00c assets/mininggadgets/models/item/upgrade_efficiency_3.json

diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
@@ -1,2 +1,2 @@
-// 1.20.1	2023-10-04T07:31:05.1284504	Languages: en_us
-f6d17f678d0ba472524e8542e691c4b1213a5c2f assets/mininggadgets/lang/en_us.json
+// 1.20.1	2023-10-20T21:43:10.442003	Languages: en_us
+a1982468138e260a4be9f9a5878c9f19ea7bc2da assets/mininggadgets/lang/en_us.json
diff --git a/src/generated/resources/assets/mininggadgets/lang/en_us.json b/src/generated/resources/assets/mininggadgets/lang/en_us.json
@@ -9,7 +9,7 @@
   "item.mininggadgets.upgrade_battery_1": "Upgrade: Battery, Tier 1",
   "item.mininggadgets.upgrade_battery_2": "Upgrade: Battery, Tier 2",
   "item.mininggadgets.upgrade_battery_3": "Upgrade: Battery, Tier 3",
-  "item.mininggadgets.upgrade_battery_creative": "Upgrade: Battery, Creative",
+  "item.mininggadgets.upgrade_battery_creative": "Upgrade: Creative Battery",
   "item.mininggadgets.upgrade_efficiency_1": "Upgrade: Efficiency, Tier 1",
   "item.mininggadgets.upgrade_efficiency_2": "Upgrade: Efficiency, Tier 2",
   "item.mininggadgets.upgrade_efficiency_3": "Upgrade: Efficiency, Tier 3",

diff --git a/src/main/java/com/direwolf20/mininggadgets/common/items/upgrade/Upgrade.java b/src/main/java/com/direwolf20/mininggadgets/common/items/upgrade/Upgrade.java
@@ -43,7 +43,7 @@ public enum Upgrade {
     BATTERY_1("battery_1", ModItems.BATTERY_1, 1, () -> 0),
     BATTERY_2("battery_2", ModItems.BATTERY_2, 2, () -> 0),
     BATTERY_3("battery_3", ModItems.BATTERY_3, 3, () -> 0),
-    BATTERY_CREATIVE("battery_CREATIVE", ModItems.BATTERY_CREATIVE, 4, () -> 0),
+    BATTERY_CREATIVE("battery_creative", ModItems.BATTERY_CREATIVE, 4, () -> 0),
 
     RANGE_1("range_1", ModItems.RANGE_1, 1, () -> 0),
     RANGE_2("range_2", ModItems.RANGE_2, 2, () -> 0),
@@ -115,7 +115,7 @@ public String getLocal() {
     public String getLocalReplacement() {
         return MiningGadgets.MOD_ID + ".upgrade.replacement";
     }
-    
+
     public boolean hasTier() {
         return tier != -1;
     }

diff --git a/src/main/resources/assets/mininggadgets/lang/fr_fr.json b/src/main/resources/assets/mininggadgets/lang/fr_fr.json
@@ -6,31 +6,31 @@
 	"item.mininggadgets.mininggadget": "Gadget minier MK3",
 	"item.mininggadgets.mininggadget_fancy": "Gadget minier MK2",
 	"item.mininggadgets.mininggadget_simple": "Gadget minier MK1",
-	"item.mininggadgets.upgrade_battery_1": "Mise à niveau : Batterie, Niveau 1",
-	"item.mininggadgets.upgrade_battery_2": "Mise à niveau : Batterie, Niveau 2",
-	"item.mininggadgets.upgrade_battery_3": "Mise à niveau : Batterie, Niveau 3",
-	"item.mininggadgets.upgrade_efficiency_1": "Mise à niveau : Efficacité, Niveau 1",
-	"item.mininggadgets.upgrade_efficiency_2": "Mise à niveau : Efficacité, Niveau 2",
-	"item.mininggadgets.upgrade_efficiency_3": "Mise à niveau : Efficacité, Niveau 3",
-	"item.mininggadgets.upgrade_efficiency_4": "Mise à niveau : Efficacité, Niveau 4",
-	"item.mininggadgets.upgrade_efficiency_5": "Mise à niveau : Efficacité, Niveau 5",
+	"item.mininggadgets.upgrade_battery_1": "Mise à niveau: Batterie, Niveau 1",
+	"item.mininggadgets.upgrade_battery_2": "Mise à niveau: Batterie, Niveau 2",
+	"item.mininggadgets.upgrade_battery_3": "Mise à niveau: Batterie, Niveau 3",
+	"item.mininggadgets.upgrade_efficiency_1": "Mise à niveau: Efficacité, Niveau 1",
+	"item.mininggadgets.upgrade_efficiency_2": "Mise à niveau: Efficacité, Niveau 2",
+	"item.mininggadgets.upgrade_efficiency_3": "Mise à niveau: Efficacité, Niveau 3",
+	"item.mininggadgets.upgrade_efficiency_4": "Mise à niveau: Efficacité, Niveau 4",
+	"item.mininggadgets.upgrade_efficiency_5": "Mise à niveau: Efficacité, Niveau 5",
 	"item.mininggadgets.upgrade_empty": "Module de mise à niveau vierge",
-	"item.mininggadgets.upgrade_fortune_1": "Mise à niveau : Fortune, Niveau 1",
-	"item.mininggadgets.upgrade_fortune_2": "Mise à niveau : Fortune, Niveau 2",
-	"item.mininggadgets.upgrade_fortune_3": "Mise à niveau : Fortune, Niveau 3",
-	"item.mininggadgets.upgrade_freezing": "Mise à niveau : Geler",
-	"item.mininggadgets.upgrade_light_placer": "Mise à niveau : Placeur de lumière",
-	"item.mininggadgets.upgrade_magnet": "Mise à niveau : Aimant",
-	"item.mininggadgets.upgrade_range_1": "Mise à niveau : Portée, Niveau 1",
-	"item.mininggadgets.upgrade_range_2": "Mise à niveau : Portée, Niveau 2",
-	"item.mininggadgets.upgrade_range_3": "Mise à niveau : Portée, Niveau 3",
-	"item.mininggadgets.upgrade_silk": "Mise à niveau : Toucher de soie",
-	"item.mininggadgets.upgrade_three_by_three": "Mise à niveau : 3x3",
-	"item.mininggadgets.upgrade_void_junk": "Mise à niveau : Poubelle du vide",
+	"item.mininggadgets.upgrade_fortune_1": "Mise à niveau: Fortune, Niveau 1",
+	"item.mininggadgets.upgrade_fortune_2": "Mise à niveau: Fortune, Niveau 2",
+	"item.mininggadgets.upgrade_fortune_3": "Mise à niveau: Fortune, Niveau 3",
+	"item.mininggadgets.upgrade_freezing": "Mise à niveau: Geler",
+	"item.mininggadgets.upgrade_light_placer": "Mise à niveau: Placeur de lumière",
+	"item.mininggadgets.upgrade_magnet": "Mise à niveau: Aimant",
+	"item.mininggadgets.upgrade_range_1": "Mise à niveau: Portée, Niveau 1",
+	"item.mininggadgets.upgrade_range_2": "Mise à niveau: Portée, Niveau 2",
+	"item.mininggadgets.upgrade_range_3": "Mise à niveau: Portée, Niveau 3",
+	"item.mininggadgets.upgrade_silk": "Mise à niveau: Toucher de soie",
+	"item.mininggadgets.upgrade_size_1": "Mise à niveau: 3x3",
+	"item.mininggadgets.upgrade_void_junk": "Mise à niveau: Poubelle du vide",
 	"itemGroup.mininggadgets": "Gadgets miniers",
 	"mininggadgets.gadget.energy": "Énergie : %d/%d",
 	"mininggadgets.gadget.range_change": "Changement de portée: %1$d x %1$d",
-	"mininggadgets.text.empty_table_helper": "Maj-cliquez pour insérer à partir de vos emplacements\nou déposez la mise à niveau sur cet écran.\on\onCliquez sur la mise à niveau pour supprimer.",
+	"mininggadgets.text.empty_table_helper": "Maj-cliquez pour insérer à partir de vos emplacements\nou déposez la mise à niveau sur cet écran. Cliquez sur la mise à niveau pour supprimer.",
 	"mininggadgets.text.modification_table": "Tableau des modifications",
 	"mininggadgets.text.open_gui": "Ouvrir les paramètres du gadget minier",
 	"mininggadgets.tooltip.item.battery_boost": "Boost de batterie : %1$d",
@@ -65,7 +65,7 @@
 	"mininggadgets.tooltip.screen.whitelist": "Liste blanche active",
 	"mininggadgets.tooltip.single.filters": "Filtres",
 	"mininggadgets.tooltip.single.insert": "Insérer",
-	"mininggadgets.upgrade.replacement": "Mise à niveau : ",
+	"mininggadgets.upgrade.replacement": "Mise à niveau: ",
 	"tooltop.mininggadgets.battery": "Améliore les condensateurs internes",
 	"tooltop.mininggadgets.efficiency": "Applique efficacité au gadget minier",
 	"tooltop.mininggadgets.empty": "Utilisé pour fabriquer d'autres améliorations",
@@ -77,5 +77,5 @@
 	"tooltop.mininggadgets.range": "Prolonge votre portée de 5 fois avec chaque niveau",
 	"tooltop.mininggadgets.silk": "Applique l'enchantement toucher soie au gadget minier",
 	"tooltop.mininggadgets.three_by_three": "Permet un rayon minier de 3x3",
-	"tooltop.mininggadgets.void_junk": "Désintègre les blocs ! (ajoute également un filtrage)"
-}
+	"tooltop.mininggadgets.void_junk": "Désintègre les blocs! (ajoute également un filtrage)"
+}
diff --git a/src/main/resources/assets/mininggadgets/lang/pt_br.json b/src/main/resources/assets/mininggadgets/lang/pt_br.json
@@ -25,7 +25,7 @@
   "item.mininggadgets.upgrade_range_2": "Atualização: Alcance, nível 2",
   "item.mininggadgets.upgrade_range_3": "Atualização: Alcance, nível 3",
   "item.mininggadgets.upgrade_silk": "Atualização: Toque suave",
-  "item.mininggadgets.upgrade_three_by_three": "Atualização: 3x3",
+  "item.mininggadgets.upgrade_size_1": "Atualização: 3x3",
   "item.mininggadgets.upgrade_void_junk": "Atualização: Lixeira",
   "itemGroup.mininggadgets": "Dispositivos de mineração",
   "mininggadgets.gadget.energy": "Energia: %d/%d",
@@ -78,4 +78,4 @@
   "tooltop.mininggadgets.silk": "Aplica toque suave ao dispositivo de mineração",
   "tooltop.mininggadgets.three_by_three": "Permite um raio de mineração de 3x3",
   "tooltop.mininggadgets.void_junk": "Elimina blocos! (também adiciona filtragem)"
-}
+}
diff --git a/src/main/resources/assets/mininggadgets/lang/ru_ru.json b/src/main/resources/assets/mininggadgets/lang/ru_ru.json
@@ -23,7 +23,7 @@
   "item.mininggadgets.upgrade_range_2": "Улучшение: Дальность, Уровень 2",
   "item.mininggadgets.upgrade_range_3": "Улучшение: Дальность, Уровень 3",
   "item.mininggadgets.upgrade_silk": "Улучшение: Шелковое касание",
-  "item.mininggadgets.upgrade_three_by_three": "Улучшение: 3x3",
+  "item.mininggadgets.upgrade_size_1": "Улучшение: 3x3",
   "item.mininggadgets.upgrade_void_junk": "Улучшение: Пустотная мусорка",
   "itemGroup.mininggadgets": "Mining Gadgets",
   "mininggadgets.gadget.energy": "Энергия: %d/%d",

diff --git a/src/main/resources/assets/mininggadgets/lang/zh_tw.json b/src/main/resources/assets/mininggadgets/lang/zh_tw.json
@@ -23,7 +23,7 @@
 "item.mininggadgets.upgrade_range_2":"升級：範圍，二級",
 "item.mininggadgets.upgrade_range_3":"升級：範圍，三級",
 "item.mininggadgets.upgrade_silk":"升級：絲綢之觸",
-"item.mininggadgets.upgrade_three_by_three":"升級：3x3",
+"item.mininggadgets.upgrade_size_1":"升級：3x3",
 "item.mininggadgets.upgrade_void_junk":"升級：虛空垃圾",
 "itemGroup.mininggadgets":"採礦小工具",
 "mininggadgets.gadget.energy":"能源： %d/%d",