From d36be34eb6351d9ccf867dea439e123d0c845d55 Mon Sep 17 00:00:00 2001 From: WakelessSloth56 Date: Wed, 28 Sep 2022 01:40:57 +0800 Subject: [PATCH] refactor(next): remove TabVanillaHiddenItems --- .../auioc/mcmod/arnicalib/Initialization.java | 2 -- .../common/itemgroup/AHCreativeModeTabs.java | 12 ------- .../itemgroup/impl/TabVanillaHiddenItems.java | 33 ------------------- .../assets/arnicalib/lang/en_us.json | 3 -- .../assets/arnicalib/lang/zh_cn.json | 3 -- 5 files changed, 53 deletions(-) delete mode 100644 src/main/java/org/auioc/mcmod/arnicalib/common/itemgroup/AHCreativeModeTabs.java delete mode 100644 src/main/java/org/auioc/mcmod/arnicalib/common/itemgroup/impl/TabVanillaHiddenItems.java diff --git a/src/main/java/org/auioc/mcmod/arnicalib/Initialization.java b/src/main/java/org/auioc/mcmod/arnicalib/Initialization.java index 005d96ee..9d68211d 100644 --- a/src/main/java/org/auioc/mcmod/arnicalib/Initialization.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/Initialization.java @@ -2,7 +2,6 @@ import org.auioc.mcmod.arnicalib.client.config.AHClientConfig; import org.auioc.mcmod.arnicalib.client.event.AHClientEventHandler; -import org.auioc.mcmod.arnicalib.common.itemgroup.AHCreativeModeTabs; import org.auioc.mcmod.arnicalib.server.event.AHServerEventHandler; import org.auioc.mcmod.arnicalib.server.loot.AHGlobalLootModifiers; import org.auioc.mcmod.arnicalib.server.loot.AHLootItemConditions; @@ -55,7 +54,6 @@ private void modSetup() { } private void forgeSetup() { - AHCreativeModeTabs.init(); forgeEventBus.register(AHServerEventHandler.class); } diff --git a/src/main/java/org/auioc/mcmod/arnicalib/common/itemgroup/AHCreativeModeTabs.java b/src/main/java/org/auioc/mcmod/arnicalib/common/itemgroup/AHCreativeModeTabs.java deleted file mode 100644 index 08f0af46..00000000 --- a/src/main/java/org/auioc/mcmod/arnicalib/common/itemgroup/AHCreativeModeTabs.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.auioc.mcmod.arnicalib.common.itemgroup; - -import org.auioc.mcmod.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/mcmod/arnicalib/common/itemgroup/impl/TabVanillaHiddenItems.java b/src/main/java/org/auioc/mcmod/arnicalib/common/itemgroup/impl/TabVanillaHiddenItems.java deleted file mode 100644 index 7468a813..00000000 --- a/src/main/java/org/auioc/mcmod/arnicalib/common/itemgroup/impl/TabVanillaHiddenItems.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.auioc.mcmod.arnicalib.common.itemgroup.impl; - -import org.auioc.mcmod.arnicalib.game.item.ItemPredicates; -import org.auioc.mcmod.arnicalib.utils.game.VanillaPredicates; -import net.minecraft.core.NonNullList; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraftforge.registries.ForgeRegistries; - -public class TabVanillaHiddenItems extends CreativeModeTab { - - public TabVanillaHiddenItems() { - super("vanillaHiddenItems"); - } - - @Override - public ItemStack makeIcon() { - return new ItemStack(Items.COMMAND_BLOCK); - } - - @Override - public void fillItemList(NonNullList list) { - ForgeRegistries.ITEMS.getValues() - .stream() - .filter(ItemPredicates.IS_AIR.negate()) - .filter(ItemPredicates.IS_CATEGORIZED.negate()) - .filter(VanillaPredicates.REGISTRY_ENTRY) - .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 index 602b00eb..8c6c4f4b 100644 --- a/src/main/resources/assets/arnicalib/lang/en_us.json +++ b/src/main/resources/assets/arnicalib/lang/en_us.json @@ -1,9 +1,6 @@ { "arnicalib.title": "ArnicaLib", - "itemGroup.arnicalib": "ArnicaLib", - "itemGroup.vanillaHiddenItems": "Vanilla Hidden Items", - "arnicalib.advanced_tooltip.nbt": "NBT: ", "arnicalib.advanced_tooltip.tag": "Tags: ", diff --git a/src/main/resources/assets/arnicalib/lang/zh_cn.json b/src/main/resources/assets/arnicalib/lang/zh_cn.json index 7cb64cb0..4c4e83d3 100644 --- a/src/main/resources/assets/arnicalib/lang/zh_cn.json +++ b/src/main/resources/assets/arnicalib/lang/zh_cn.json @@ -1,9 +1,6 @@ { "arnicalib.title": "ArnicaLib", - "itemGroup.arnicalib": "ArnicaLib", - "itemGroup.vanillaHiddenItems": "原版隐藏物品", - "arnicalib.advanced_tooltip.nbt": "NBT:", "arnicalib.advanced_tooltip.tag": "标签:",