Merge branch '1.20' into 1.20.2

# Conflicts: # gradle.properties # src/main/java/io/wispforest/owo/mixin/text/stapi/SystemDelegatedLanguageFixin.java
wisp-forest · Oct 2, 2023 · fb02f3b · fb02f3b
2 parents a2c842d + deff18c
commit fb02f3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/io/wispforest/owo/itemgroup/OwoItemGroup.java b/src/main/java/io/wispforest/owo/itemgroup/OwoItemGroup.java
@@ -110,6 +110,8 @@ public void initialize() {
                 if (!this.tabs.get(tabIdx).primary()) continue;
                 this.activeTabs.add(tabIdx);
             }
+
+            if (this.activeTabs.isEmpty()) this.activeTabs.add(0);
         } else {
             this.activeTabs.add(0);
         }

diff --git a/src/main/java/io/wispforest/owo/mixin/text/stapi/SystemDelegatedLanguageFixin.java b/src/main/java/io/wispforest/owo/mixin/text/stapi/SystemDelegatedLanguageFixin.java
@@ -3,6 +3,7 @@
 import io.wispforest.owo.text.TextLanguage;
 import net.minecraft.text.Text;
 import net.minecraft.util.Language;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.Shadow;
@@ -12,15 +13,17 @@
 @Pseudo
 @Mixin(SystemDelegatedLanguage.class)
 public abstract class SystemDelegatedLanguageFixin implements TextLanguage {
+    @Final
     @Shadow private Language vanilla;
 
     @Shadow
     protected abstract ServerLanguage getSystemLanguage();
 
     @Override
     public Text getText(String key) {
-        if (!(vanilla instanceof TextLanguage lang) || this.getSystemLanguage().serverTranslations().contains(key))
+        if (!(vanilla instanceof TextLanguage lang) || this.getSystemLanguage().serverTranslations().contains(key)) {
             return null;
+        }
 
         return lang.getText(key);
     }