refactor: TabVanillaHiddenItems creative mode tab

auioc · Mar 28, 2022 · 16e8542 · 16e8542
1 parent 28edc5a
commit 16e8542
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 22 deletions.
diff --git a/src/main/java/org/auioc/mods/arnicalib/Initialization.java b/src/main/java/org/auioc/mods/arnicalib/Initialization.java
@@ -3,7 +3,7 @@
 import org.auioc.mods.arnicalib.client.config.ClientConfig;
 import org.auioc.mods.arnicalib.client.event.ClientEventHandler;
 import org.auioc.mods.arnicalib.common.command.AHCommandArguments;
-import org.auioc.mods.arnicalib.common.itemgroup.AHItemGroups;
+import org.auioc.mods.arnicalib.common.itemgroup.AHCreativeModeTabs;
 import org.auioc.mods.arnicalib.common.network.AHPacketHandler;
 import org.auioc.mods.arnicalib.server.event.ServerEventHandler;
 import org.auioc.mods.arnicalib.server.loot.AHGlobalLootModifiers;
@@ -65,7 +65,7 @@ private void modSetup() {
         }
 
         private void forgeSetup() {
-            AHItemGroups.init();
+            AHCreativeModeTabs.init();
             forgeEventBus.register(ServerEventHandler.class);
         }
 

diff --git a/src/main/java/org/auioc/mods/arnicalib/common/itemgroup/AHCreativeModeTabs.java b/src/main/java/org/auioc/mods/arnicalib/common/itemgroup/AHCreativeModeTabs.java
@@ -0,0 +1,12 @@
+package org.auioc.mods.arnicalib.common.itemgroup;
+
+import org.auioc.mods.arnicalib.common.itemgroup.impl.TabVanillaHiddenItems;
+import net.minecraft.world.item.CreativeModeTab;
+
+public final class AHCreativeModeTabs {
+
+    public static void init() {}
+
+    public static final CreativeModeTab TAB_VANILLA_HIDDEN_ITEMS = new TabVanillaHiddenItems();
+
+}
diff --git a/src/main/java/org/auioc/mods/arnicalib/common/itemgroup/AHItemGroups.java b/src/main/java/org/auioc/mods/arnicalib/common/itemgroup/AHItemGroups.java
diff --git a/...temgroup/impl/VanillaHiddenItemGroup.java → ...itemgroup/impl/TabVanillaHiddenItems.java b/...temgroup/impl/VanillaHiddenItemGroup.java → ...itemgroup/impl/TabVanillaHiddenItems.java
@@ -6,10 +6,10 @@
 import net.minecraft.world.item.Items;
 import net.minecraftforge.registries.ForgeRegistries;
 
-public class VanillaHiddenItemGroup extends CreativeModeTab {
+public class TabVanillaHiddenItems extends CreativeModeTab {
 
-    public VanillaHiddenItemGroup() {
-        super("vanilla_hidden_item");
+    public TabVanillaHiddenItems() {
+        super("vanillaHiddenItems");
     }
 
     @Override
@@ -19,12 +19,13 @@ public ItemStack makeIcon() {
 
     @Override
     public void fillItemList(NonNullList<ItemStack> list) {
-        ForgeRegistries.ITEMS.getValues().stream()
+        ForgeRegistries.ITEMS.getValues()
+            .stream()
             .filter((item) -> item != Items.AIR)
             .filter((item) -> item.getItemCategory() == null)
             .filter((item) -> item.getRegistryName().getNamespace().equals("minecraft"))
-            .forEach((item) -> list.add(new ItemStack(item)));
-
+            .map(ItemStack::new)
+            .forEach(list::add);
     }
 
 }
diff --git a/src/main/resources/assets/arnicalib/lang/en_us.json b/src/main/resources/assets/arnicalib/lang/en_us.json
@@ -2,7 +2,7 @@
     "arnicalib.title": "ArnicaLib",
 
     "itemGroup.arnicalib": "ArnicaLib",
-    "itemGroup.vanilla_hidden_item": "Vanilla Hidden Items",
+    "itemGroup.vanillaHiddenItems": "Vanilla Hidden Items",
 
     "arnicalib.command.failure.internal": "An internal error occurred trying to execute that command",
     "arnicalib.command.failure.not_server": "This command must be executed by the server",

diff --git a/src/main/resources/assets/arnicalib/lang/zh_cn.json b/src/main/resources/assets/arnicalib/lang/zh_cn.json
@@ -2,7 +2,7 @@
     "arnicalib.title": "ArnicaLib",
 
     "itemGroup.arnicalib": "ArnicaLib",
-    "itemGroup.vanilla_hidden_item": "原版隐藏物品",
+    "itemGroup.vanillaHiddenItems": "原版隐藏物品",
 
     "arnicalib.command.failure.internal": "试图执行该命令时出现内部错误",
     "arnicalib.command.failure.not_server": "此命令必须由服务器执行",