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

FlashyReese · Mar 9, 2022 · ca8cf75 · ca8cf75
2 parents a943083 + 24ceabb
commit ca8cf75
Show file tree

Hide file tree

Showing 21 changed files with 58 additions and 68 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -21,13 +21,24 @@ jobs:
         run: ./gradlew build
         env:
           BUILD_RELEASE: ${{ github.event.prerelease == false }}
-      - name: Publish to Modrinth
-        run: ./gradlew publishModrinth
-        env:
-          MODRINTH_API: ${{ secrets.MODRINTH_API }}
-          CHANGELOG: ${{ github.event.release.body }}
-      - name: Upload assets to GitHub
-        uses: AButler/[email protected]
+      - name: Publish to Modrinth & CurseForge
+        uses: Kir-Antipov/[email protected]
         with:
-          files: 'build/libs/*;LICENSE.txt'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          modrinth-id: PtjYWJkn
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+
+          curseforge-id: 447673
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+          version-type: release
+
+          loaders: fabric
+
+          version-resolver: latest
+          dependencies: |
+            sodium | depends | *
+            reeses-sodium-options | recommends | *
+            irisshaders | recommends | *
+            iris | recommends | *
diff --git a/build.gradle b/build.gradle
@@ -1,9 +1,6 @@
-import com.modrinth.minotaur.TaskModrinthUpload
-
 plugins {
     id 'fabric-loom' version '0.11-SNAPSHOT'
     id 'maven-publish'
-    id "com.modrinth.minotaur" version "1.2.1"
 }
 
 sourceCompatibility = JavaVersion.VERSION_1_8
@@ -92,20 +89,4 @@ publishing {
         // uncomment to publish to the local maven
         // mavenLocal()
     }
-}
-
-task publishModrinth (type: TaskModrinthUpload){ // Make sure it runs after build!
-    onlyIf {
-        System.getenv("MODRINTH_API") // Only attempt to run this task if the MODRINTH variable is set, otherwise SKIP it
-    }
-
-    token = System.getenv("MODRINTH_API") // An environment property called MODRINTH that is your token, set via Gradle CLI, GitHub Actions, Idea Run Configuration, or other
-    projectId = 'PtjYWJkn'
-    versionName = "Sodium Extra ${project.mod_version} for Minecraft ${project.minecraft_version}"
-    versionNumber = "mc${project.minecraft_version}-${project.mod_version}" // Will fail if Modrinth has this version already
-    changelog = System.getenv("CHANGELOG")
-    // On fabric, use 'remapJar' instead of 'jar'
-    uploadFile = remapJar // This is the java jar task. If it can't find the jar, try 'jar.outputs.getFiles().asPath' in place of 'jar'
-    addGameVersion("${project.minecraft_version}") // Call this multiple times to add multiple game versions. There are tools that can help you generate the list of versions
-    addLoader('fabric')
 }
diff --git a/gradle.properties b/gradle.properties
@@ -7,11 +7,11 @@ org.gradle.jvmargs=-Xmx1G
     loader_version=0.13.3
 
 # Mod Properties
-    mod_version=0.4.1
+    mod_version=0.4.2
     maven_group=me.flashyreese.mods
     archives_base_name=sodium-extra
 
 # Dependencies
-    reeses_sodium_options=mc1.16.5-1.4.1
+    reeses_sodium_options=mc1.16.5-1.4.2
     sodium_version=mc1.16.5-0.2.0
     fabric_version=0.42.0+1.16
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
@@ -7,13 +7,15 @@
 import me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl;
 import me.jellysquid.mods.sodium.client.gui.options.control.SliderControl;
 import me.jellysquid.mods.sodium.client.gui.options.control.TickBoxControl;
+import me.jellysquid.mods.sodium.client.gui.options.storage.MinecraftOptionsStorage;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.TranslatableText;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class SodiumExtraGameOptionPages {
+    private static final MinecraftOptionsStorage vanillaOpts = new MinecraftOptionsStorage();
     public static final SodiumExtraOptionsStorage sodiumExtraOpts = new SodiumExtraOptionsStorage();
 
     public static OptionPage animation() {
@@ -297,6 +299,13 @@ public static OptionPage render() {
     public static OptionPage extra() {
         List<OptionGroup> groups = new ArrayList<>();
         groups.add(OptionGroup.createBuilder()
+                .add(OptionImpl.createBuilder(boolean.class, vanillaOpts)
+                        .setName(new TranslatableText("sodium-extra.option.gl_debug_verbosity").getString())
+                        .setTooltip(new TranslatableText("sodium-extra.option.gl_debug_verbosity.tooltip").getString())
+                        .setControl(TickBoxControl::new)
+                        .setBinding((options, value) -> options.glDebugVerbosity = value ? 1 : 0, options -> options.glDebugVerbosity == 1)
+                        .build()
+                )
                 .add(OptionImpl.createBuilder(boolean.class, SodiumExtraGameOptionPages.sodiumExtraOpts)
                         .setName(new TranslatableText("sodium-extra.option.use_fast_random").getString())
                         .setTooltip(new TranslatableText("sodium-extra.option.use_fast_random.tooltip").getString())

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java
@@ -15,8 +15,6 @@ protected CaffeineConfig createConfig() {
                 .addMixinOption("biome_colors", true)
                 .addMixinOption("cloud", true)
                 .addMixinOption("compat", true) // Should not allow users to turn this off
-                .addMixinOption("compat.reeses_sodium_options", true)
-                .addMixinOption("compat.sodium", true) // Should not allow users to turn this off
                 .addMixinOption("entity", true)
                 .addMixinOption("fog", true)
                 .addMixinOption("gui", true)

diff --git a/.../compat/sodium/MixinSodiumOptionsGUI.java → ...a/mixin/compat/MixinSodiumOptionsGUI.java b/.../compat/sodium/MixinSodiumOptionsGUI.java → ...a/mixin/compat/MixinSodiumOptionsGUI.java
@@ -1,4 +1,4 @@
-package me.flashyreese.mods.sodiumextra.mixin.compat.sodium;
+package me.flashyreese.mods.sodiumextra.mixin.compat;
 
 import me.flashyreese.mods.sodiumextra.client.gui.SodiumExtraGameOptionPages;
 import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI;

diff --git a/...se/mods/sodiumextra/mixin/compat/reeses_sodium_options/MixinSodiumVideoOptionsScreen.java b/...se/mods/sodiumextra/mixin/compat/reeses_sodium_options/MixinSodiumVideoOptionsScreen.java
diff --git a/src/main/resources/assets/sodium-extra/lang/cs_cz.json b/src/main/resources/assets/sodium-extra/lang/cs_cz.json
@@ -25,6 +25,8 @@
   "sodium-extra.option.fireworks.tooltip": "Přepnout částice rachejtlí",
   "sodium-extra.option.fog": "Mlha",
   "sodium-extra.option.fog.tooltip": "Upraví vzdálenost efektu mlhy na terénu. \n0 - použít výchozí nastavení mlhy\n1-32 - nastavit vzdálenost mlhy v chuncích\n33 - maximální vzdálenost mlhy (v podstatě vypne mlhu)",
+  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
+  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "Instantní plížení",
   "sodium-extra.option.instant_sneak.tooltip": "Neprovádět animaci plížení",
   "sodium-extra.option.item_frames.tooltip": "Přepnout vykreslování rámečků",

diff --git a/src/main/resources/assets/sodium-extra/lang/de_de.json b/src/main/resources/assets/sodium-extra/lang/de_de.json
@@ -25,6 +25,8 @@
   "sodium-extra.option.fireworks.tooltip": "Feuerwerkspartikel umschalten",
   "sodium-extra.option.fog": "Nebel",
   "sodium-extra.option.fog.tooltip": "Passt die Nebeleffekt-Distanz im Gelände an. \n0 - Vanilla Nebeleinstellungen benutzen\n1-32 - Nebeldistanz in Chunks setzen\n33 - Max. Nebeldistanz (deaktiviert Nebel im Grunde)",
+  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
+  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "Sofort-Schleichen",
   "sodium-extra.option.instant_sneak.tooltip": "Kamera zum Schleichen nicht schwenken",
   "sodium-extra.option.item_frames.tooltip": "Darstellung von Rahmen umschalten",

diff --git a/src/main/resources/assets/sodium-extra/lang/en_us.json b/src/main/resources/assets/sodium-extra/lang/en_us.json
@@ -25,6 +25,8 @@
   "sodium-extra.option.fireworks.tooltip": "If enabled, fireworks particles are processed.",
   "sodium-extra.option.fog": "Fog",
   "sodium-extra.option.fog.tooltip": "Adjusts the fog effect distance on the terrain. \n0 - use vanilla fog settings\n1-32 - set fog distance in chunks\n33 - max fog distance (essentially disables fog)",
+  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
+  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "Instant Sneak",
   "sodium-extra.option.instant_sneak.tooltip": "If enabled, the camera will not lerp upon sneaking.",
   "sodium-extra.option.item_frames.tooltip": "If enabled, item frames are rendered.",

diff --git a/src/main/resources/assets/sodium-extra/lang/es_mx.json b/src/main/resources/assets/sodium-extra/lang/es_mx.json
@@ -25,6 +25,8 @@
   "sodium-extra.option.fireworks.tooltip": "Si está habilitado, se procesan las partículas de fuegos artificiales.",
   "sodium-extra.option.fog": "Niebla",
   "sodium-extra.option.fog.tooltip": "Ajusta la distancia del efecto de niebla en el terreno.\n0 - use la configuración de niebla vainilla\n1-32 - establezca la distancia de niebla en trozos\n33 - distancia máxima de niebla (niebla esencialmente desactivada)",
+  "sodium-extra.option.gl_debug_verbosity": "Salida de depuración de OpenGL",
+  "sodium-extra.option.gl_debug_verbosity.tooltip": "La salida de depuración es una característica de OpenGL que facilita la depuración y optimización de aplicaciones OpenGL. Brevemente, esta función proporciona un método para que el controlador proporcione información de mensajes de texto a la aplicación.\nModificar esta opción requerirá reiniciar el juego.",
   "sodium-extra.option.instant_sneak": "Agachar instantáneo",
   "sodium-extra.option.instant_sneak.tooltip": "Si está habilitada, la cámara no moverá al agacharse.",
   "sodium-extra.option.item_frames.tooltip": "Si está habilitado, se renderizan los marcos.",

diff --git a/src/main/resources/assets/sodium-extra/lang/et_ee.json b/src/main/resources/assets/sodium-extra/lang/et_ee.json
@@ -25,6 +25,8 @@
   "sodium-extra.option.fireworks.tooltip": "Lülita ilutulestiku osakesed sisse/välja",
   "sodium-extra.option.fog": "Udu",
   "sodium-extra.option.fog.tooltip": "Reguleerib maastikul uduefekti kaugust.\n0 - kasuta vanilli udusätteid\n1-32 - määra udukaugus kamakates\n33 - maksimaalne udukaugus (sisuliselt keelab udu)",
+  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
+  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "Kohene hiilimine",
   "sodium-extra.option.instant_sneak.tooltip": "Väldi hiilimisel kaamera hüplemist",
   "sodium-extra.option.item_frames.tooltip": "Lülita esemeraamide renderdamine sisse/välja",

diff --git a/src/main/resources/assets/sodium-extra/lang/fr_fr.json b/src/main/resources/assets/sodium-extra/lang/fr_fr.json
@@ -25,6 +25,8 @@
   "sodium-extra.option.fireworks.tooltip": "Activer les particules des feux d'artifice",
   "sodium-extra.option.fog": "Brouillard",
   "sodium-extra.option.fog.tooltip": "Ajuster la distance de l'effet de brouillard sur le terrain. \n0 - Paramètre par défaut du jeu\n1-32 - Défini la distance du brouillard en chunks\n33 - Distance maximum (Désactiver le brouillard entre autres)",
+  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
+  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "Accroupissement instantané",
   "sodium-extra.option.instant_sneak.tooltip": "Désactiver l'animation de la caméra lors de l'accroupissement",
   "sodium-extra.option.item_frames.tooltip": "Activer le rendu des cadres",

diff --git a/src/main/resources/assets/sodium-extra/lang/it_it.json b/src/main/resources/assets/sodium-extra/lang/it_it.json
@@ -25,6 +25,8 @@
   "sodium-extra.option.fireworks.tooltip": "Attiva/disattiva le particelle dei fuochi d'artificio",
   "sodium-extra.option.fog": "Nebbia",
   "sodium-extra.option.fog.tooltip": "Regola la distanza dell'effetto nebbia sul terreno. \n0 - usa le impostazioni nebbia predefinite\n1-32 - imposta la distanza nebbia in chunk\n33 - distanza nebbia massima (disabilita la nebbia)",
+  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
+  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "Accovacciamento istantaneo",
   "sodium-extra.option.instant_sneak.tooltip": "Non animare la telecamera per accovacciarsi",
   "sodium-extra.option.item_frames.tooltip": "Attiva/disattiva il rendering delle cornici",

diff --git a/src/main/resources/assets/sodium-extra/lang/pt_br.json b/src/main/resources/assets/sodium-extra/lang/pt_br.json
@@ -25,6 +25,8 @@
   "sodium-extra.option.fireworks.tooltip": "Alterna as partículas de fogos de artifício",
   "sodium-extra.option.fog": "Neblina",
   "sodium-extra.option.fog.tooltip": "Ajusta a distância do efeito de neblina no terreno. \n0 - utiliza os valores padrões.\n1-32 - determina o valor em 'Chunks' da distância.\n33 - Distância máxima da neblina (basicamente a desabilita)",
+  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
+  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "Agachamento instantâneo",
   "sodium-extra.option.instant_sneak.tooltip": "A câmera não é suavisada ao agachar-se",
   "sodium-extra.option.item_frames.tooltip": "Renderizar molduras",

diff --git a/src/main/resources/assets/sodium-extra/lang/ru_ru.json b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
@@ -25,6 +25,8 @@
   "sodium-extra.option.fireworks.tooltip": "Переключение частиц фейерверка",
   "sodium-extra.option.fog": "Туман",
   "sodium-extra.option.fog.tooltip": "Регулирует дальность тумана на территории. \n0 - обычный ванильный туман\n1-32 - расстояние до тумана в чанках\n33 - максимальное расстояние тумана (по сути, отключает туман)",
+  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
+  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "Моментальное приседание",
   "sodium-extra.option.instant_sneak.tooltip": "Отключает плавную камеру при приседании",
   "sodium-extra.option.item_frames.tooltip": "Переключение видимости рамок",

diff --git a/src/main/resources/assets/sodium-extra/lang/th_th.json b/src/main/resources/assets/sodium-extra/lang/th_th.json
@@ -25,6 +25,8 @@
   "sodium-extra.option.fireworks.tooltip": "ถ้าเปิดตัวเลือกนี้ อนุภาคจากดอกไม้ไฟจะทำงาน",
   "sodium-extra.option.fog": "หมอก",
   "sodium-extra.option.fog.tooltip": "ปรับระยะห่างของเอฟเฟกต์หมอกในภูมิประเทศ \n0 - ใช้ค่าของหมอกจากวานิลลาดั้งเดิม \n1-32 - กำหนดระยะห่างของหมอก นับเป็นชังก์ \n33 - ระยะห่างของหมอกสูงสุด (หลัก ๆ แล้ว จะเป็นการปิดหมอก)",
+  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
+  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "ย่อแบบทันที",
   "sodium-extra.option.instant_sneak.tooltip": "ถ้าเปิดตัวเลือกนี้ ตัวกล้องจะไม่เลื่อนลงแบบช้า ๆ เมื่อย่อลงไป",
   "sodium-extra.option.item_frames.tooltip": "ถ้าเปิดตัวเลือกนี้ กรอบไอเท็มจะได้รับการเรนเดอร์",

diff --git a/src/main/resources/assets/sodium-extra/lang/tr_TR.json b/src/main/resources/assets/sodium-extra/lang/tr_TR.json
@@ -25,6 +25,8 @@
   "sodium-extra.option.fireworks.tooltip": "Havai fişek parçacıkları için aç/kapa",
   "sodium-extra.option.fog": "Sis",
   "sodium-extra.option.fog.tooltip": "Arazideki sis efekt menzilini ayarlar. \n0 - varsayılan sis ayarlarını kullan\n1-32 - yığın (chunk) olarak sis menzili ayarla\n33 - maksimum sis menzili (bir bakıma sisi devre dışı bırakır)",
+  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
+  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "Hızlı Eğilme",
   "sodium-extra.option.instant_sneak.tooltip": "Eğilirken kameraya lineer enterpolasyon yapma",
   "sodium-extra.option.item_frames.tooltip": "Eşya çerçevelerini göstermek için aç/kapa",

diff --git a/src/main/resources/assets/sodium-extra/lang/zh_cn.json b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
@@ -25,6 +25,8 @@
   "sodium-extra.option.fireworks.tooltip": "开启或关闭烟花粒子效果",
   "sodium-extra.option.fog": "迷雾",
   "sodium-extra.option.fog.tooltip": "设置地形开始显示迷雾效果的距离.\n0 - 使用原版的迷雾设置\n1-32 - 以方块为单位设置迷雾距离\n33 - 最大迷雾距离(基本上禁用迷雾)",
+  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
+  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
   "sodium-extra.option.instant_sneak": "直接潜行",
   "sodium-extra.option.instant_sneak.tooltip": "潜行时视角直接下移而不是缓慢地",
   "sodium-extra.option.item_frames.tooltip": "开启或关闭显示物品展示框",

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -43,6 +43,6 @@
     "sodium": ["0.1.x", "0.2.0+IRIS_rev.400af47", ">=0.3.0"]
   },
   "recommends": {
-    "reeses-sodium-options": ">=1.4.1"
+    "reeses-sodium-options": ">=1.4.2"
   }
 }