Merge branch '1.17.x/dev' into 1.17.x/stable

FlashyReese · Jun 7, 2022 · 722e253 · 722e253
2 parents 07a9604 + 90ce00d
commit 722e253
Show file tree

Hide file tree

Showing 17 changed files with 404 additions and 247 deletions.
diff --git a/.github/workflows/pull-request.yml → .github/workflows/gradle.yml b/.github/workflows/pull-request.yml → .github/workflows/gradle.yml
@@ -1,6 +1,6 @@
 name: Java CI with Gradle
 
-on: [ pull_request ]
+on: [ pull_request, push ]
 
 jobs:
   build:

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
diff --git a/README.md b/README.md
@@ -26,6 +26,10 @@ or the path to it.
 The initial setup may take a few minutes. After Gradle has finished building everything, you can find the resulting
 artifacts in `build/libs`.
 
+# Contributing to localization
+
+Translations can be done on [Crowdin](https://crowdin.com/project/sodium-extra).
+
 # License
 
 Sodium Extra is licensed under GNU LGPLv3, a free and open-source license. For more information, please see the [license file](LICENSE.txt).
diff --git a/crowdin.yml b/crowdin.yml
@@ -0,0 +1,3 @@
+files:
+  - source: /src/main/resources/assets/sodium-extra/lang/en_us.json
+    translation: /src/main/resources/assets/sodium-extra/lang/%locale_with_underscore%.json
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ org.gradle.jvmargs=-Xmx1G
     loader_version=0.14.4
 
 # Mod Properties
-    mod_version=0.4.4
+    mod_version=0.4.5
     maven_group=me.flashyreese.mods
     archives_base_name=sodium-extra
 

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
@@ -342,7 +342,11 @@ public static OptionPage extra() {
                         .setControl(TickBoxControl::new)
                         .setImpact(OptionImpact.VARIES)
                         .setEnabled(GLFW.glfwExtensionSupported("GLX_EXT_swap_control_tear") || GLFW.glfwExtensionSupported("WGL_EXT_swap_control_tear"))
-                        .setBinding((opts, value) -> opts.extraSettings.useAdaptiveSync = value, opts -> opts.extraSettings.useAdaptiveSync)
+                        .setBinding((opts, value) -> {
+                            opts.extraSettings.useAdaptiveSync = value;
+                            // Update the swap buffer
+                            MinecraftClient.getInstance().getWindow().setVsync(MinecraftClient.getInstance().options.enableVsync);
+                        }, opts -> opts.extraSettings.useAdaptiveSync)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java
@@ -207,7 +207,7 @@ public ExtraSettings() {
             this.showFPSExtended = true;
             this.showCoords = false;
             this.reduceResolutionOnMac = true;
-            this.useAdaptiveSync = true;
+            this.useAdaptiveSync = false;
             this.cloudHeight = 128;
             this.toasts = true;
             this.instantSneak = false;

diff --git a/src/main/resources/assets/sodium-extra/lang/de_de.json b/src/main/resources/assets/sodium-extra/lang/de_de.json
@@ -2,13 +2,13 @@
   "sodium-extra.option.animate_fire.tooltip": "Feuer-Animationen umschalten",
   "sodium-extra.option.animate_lava.tooltip": "Lava-Animationen umschalten",
   "sodium-extra.option.animate_portal.tooltip": "Portal-Animationen umschalten",
-  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "Sculk Sensor umschalten.",
   "sodium-extra.option.animate_water.tooltip": "Wasser-Animationen umschalten",
   "sodium-extra.option.animations": "Animationen",
   "sodium-extra.option.animations_all.tooltip": "Alle Animationen umschalten",
   "sodium-extra.option.armor_stands.tooltip": "Darstellung von Rüstungsständern umschalten",
-  "sodium-extra.option.beacon_beam": "Beacon Beam",
-  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
+  "sodium-extra.option.beacon_beam": "\"Leuchtfeuer Strahl\"",
+  "sodium-extra.option.beacon_beam.tooltip": "Leuchtfeuer Strahl umschalten.",
   "sodium-extra.option.biome_colors": "Biom-Farben",
   "sodium-extra.option.biome_colors.tooltip": "Biom-Farben basierend auf dem aktuellen Biom verändern",
   "sodium-extra.option.block_animations": "Block-Animationen",
@@ -19,7 +19,7 @@
   "sodium-extra.option.cloud_height": "Wolken-Höhe",
   "sodium-extra.option.cloud_height.tooltip": "Passt die Höhe der Wolken an",
   "sodium-extra.option.composter.tooltip": "Komposterpartikel umschalten",
-  "sodium-extra.option.details": "Details",
+  "sodium-extra.option.details": "Einzelheiten",
   "sodium-extra.option.dripping_particles": "Tropfen-Partikel",
   "sodium-extra.option.dripping_particles.tooltip": "Tropfenpartikel umschalten",
   "sodium-extra.option.environment.tooltip": "Umgebungspartikel umschalten",
@@ -33,12 +33,12 @@
   "sodium-extra.option.item_frames.tooltip": "Darstellung von Rahmen umschalten",
   "sodium-extra.option.light_updates": "Licht-Aktualisierungen",
   "sodium-extra.option.light_updates.tooltip": "Licht-Aktualisierungen anzeigen",
-  "sodium-extra.option.overlay_corner": "Overlay Corner",
-  "sodium-extra.option.overlay_corner.bottom_left": "Bottom Left",
-  "sodium-extra.option.overlay_corner.bottom_right": "Bottom Right",
+  "sodium-extra.option.overlay_corner": "Überlagerungs Ecke",
+  "sodium-extra.option.overlay_corner.bottom_left": "Unten Links",
+  "sodium-extra.option.overlay_corner.bottom_right": "Unten Rechts",
   "sodium-extra.option.overlay_corner.tooltip": "Determine which corner of the screen the overlay(fps and coordinates) will be rendered",
-  "sodium-extra.option.overlay_corner.top_left": "Top Left",
-  "sodium-extra.option.overlay_corner.top_right": "Top Right",
+  "sodium-extra.option.overlay_corner.top_left": "Oben Links",
+  "sodium-extra.option.overlay_corner.top_right": "Oben Rechts",
   "sodium-extra.option.paintings.tooltip": "Darstellung von Gemälden umschalten",
   "sodium-extra.option.particles_all.tooltip": "Alle Partikel umschalten",
   "sodium-extra.option.piston.tooltip": "Kolbenanimationen anzeigen",
@@ -57,30 +57,30 @@
   "sodium-extra.option.show_coordinates.tooltip": "Koordinaten in der linken oberen Ecke anzeigen",
   "sodium-extra.option.show_fps": "FPS anzeigen",
   "sodium-extra.option.show_fps.tooltip": "Aktuelle, Max., Mittlere und Min. FPS in der linken oberen Ecke anzeigen",
-  "sodium-extra.option.show_fps_extended": "Show FPS Extended",
+  "sodium-extra.option.show_fps_extended": "FPS erweitert anzeigen",
   "sodium-extra.option.show_fps_extended.tooltip": "Show max, average and min FPS on overlay",
-  "sodium-extra.option.sky": "Sky",
-  "sodium-extra.option.sky.tooltip": "If enabled, the sky will be rendered.",
+  "sodium-extra.option.sky": "Himmel",
+  "sodium-extra.option.sky.tooltip": "Himmel Rendern lassen umschalten.",
   "sodium-extra.option.sky_colors": "Himmelsfarben",
   "sodium-extra.option.sky_colors.tooltip": "Himmelsfarben basierend auf dem aktuellen Biom verändern",
   "sodium-extra.option.smoke": "Rauch",
   "sodium-extra.option.smoke.tooltip": "Rauchpartikel umschalten",
-  "sodium-extra.option.stars": "Stars",
-  "sodium-extra.option.stars.tooltip": "If enabled, the stars will be rendered.",
-  "sodium-extra.option.sun_moon": "Sun & Moon",
-  "sodium-extra.option.sun_moon.tooltip": "If enabled, the sun and moon will be rendered.",
-  "sodium-extra.option.toasts": "Toasts",
+  "sodium-extra.option.stars": "Sterne",
+  "sodium-extra.option.stars.tooltip": "Himmel Rendern Lassen umschalten.",
+  "sodium-extra.option.sun_moon": "Sonne & Mond",
+  "sodium-extra.option.sun_moon.tooltip": "Sonne & Mond Rendern Lassen umschlaten.",
+  "sodium-extra.option.toasts": "Nachrichten",
   "sodium-extra.option.toasts.tooltip": "Popups für Fortschritte und Handwerksrezepte",
-  "sodium-extra.option.use_adaptive_sync.name": "Use Adaptive Sync",
-  "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness.",
+  "sodium-extra.option.use_adaptive_sync.name": "Adaptive Synchronisierung benutzten",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "Wenn aktiviert, kann V-Sync den mittleren Frame austauschen und sich manchmal selbst deaktivieren. Normalerweise zeigt sich V-Sync erkenntlich bei der Reaktion.",
   "sodium-extra.option.use_fast_random": "Schnellen Zufallsgenerator verwenden",
   "sodium-extra.option.use_fast_random.tooltip": "Falls aktiviert wird eine schnelle Zufallsgeneratorfunktion für das Block-Rendering genutzt. Dies kann die Rotation von einigen zufällig gedrehten Texturen im Vergleich zum Vanilla-Verhalten verändern.",
   "sodium-extra.option.villagers.tooltip": "Dorfbewohnerpartikel umschalten",
   "sodium-extra.option.water.tooltip": "Wasserpartikel umschalten",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
-  "sodium-extra.overlay.fps_extended": "(max. %s / avg. %s / min. %s)",
-  "sodium-extra.overlay.light_updates": "Light updates disabled",
-  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
-  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
+  "sodium-extra.overlay.fps_extended": "(Max. %s / Dsl. %s / Min. %s)",
+  "sodium-extra.overlay.light_updates": "Schatten Aktualisierung deaktiviert",
+  "sodium-extra.suggestRSO.header": "Vorschlag: Installiere Reese's Sodium Options Mod",
+  "sodium-extra.suggestRSO.message": "Es wird dringend empfohlen, dass du Reese's Sodium Optionen neben Sodium Extra. Aufgrund der wachsenden Anzahl an Funktionen passt es nicht mehr richtig in die Videooptionen von Sodium rein."
 }
diff --git a/src/main/resources/assets/sodium-extra/lang/es_mx.json b/src/main/resources/assets/sodium-extra/lang/es_mx.json
@@ -7,8 +7,8 @@
   "sodium-extra.option.animations": "Animaciones",
   "sodium-extra.option.animations_all.tooltip": "Si está habilitado, se procesan las animaciones.",
   "sodium-extra.option.armor_stands.tooltip": "Si está habilitado, se renderizan los soportes de armadura.",
-  "sodium-extra.option.beacon_beam": "Beacon Beam",
-  "sodium-extra.option.beacon_beam.tooltip": "If enabled, beacon beams are processed.",
+  "sodium-extra.option.beacon_beam": "Haz de luz del faro",
+  "sodium-extra.option.beacon_beam.tooltip": "Si está habilitado, se procesan el haz de luz del faro.",
   "sodium-extra.option.biome_colors": "Colores del bioma",
   "sodium-extra.option.biome_colors.tooltip": "Si está habilitado, los colores del bioma se cambian según el bioma.",
   "sodium-extra.option.block_animations": "Animaciones de bloques",