Merge remote-tracking branch 'origin/1.19.4-fabric' into 1.20-fabric

constellation-mc · Jul 16, 2023 · 6611aca · 6611aca
2 parents bd473cd + dd8998d
commit 6611aca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## What's new:
 
+### Content
+
+* Fixed item groups not having a name by default. (1.19.3+)
+
 ### Danger
 
 * Fixed InstrumentationAccess failing to locate the agent jar.

diff --git a/dark-matter-content/src/main/java/me/melontini/dark_matter/content/ContentBuilder.java b/dark-matter-content/src/main/java/me/melontini/dark_matter/content/ContentBuilder.java
@@ -3,6 +3,7 @@
 import com.mojang.datafixers.types.Type;
 import me.melontini.dark_matter.DarkMatterLog;
 import me.melontini.dark_matter.content.interfaces.AnimatedItemGroup;
+import me.melontini.dark_matter.minecraft.util.TextUtil;
 import me.melontini.dark_matter.util.MakeSure;
 import me.melontini.dark_matter.util.Utilities;
 import net.fabricmc.api.EnvType;
@@ -282,7 +283,7 @@ public ItemGroup build() {
             });
             builder.icon(() -> ItemGroupBuilder.this.icon.get());
 
-            if (this.displayName != null) builder.displayName(this.displayName);
+            builder.displayName(Objects.requireNonNullElseGet(this.displayName, () -> TextUtil.translatable("itemGroup." + this.identifier.toString().replace(":", "."))));
             if (this.texture != null) builder.texture(this.texture);
 
             ItemGroup group = builder.build();