Fix some items being added to the creative search tab multiple times

pupnewfster · pupnewfster · commit 954201a3e8d3 · 2024-05-14T09:56:08.000-05:00
diff --git a/src/generators/java/mekanism/generators/common/item/ItemHohlraum.java b/src/generators/java/mekanism/generators/common/item/ItemHohlraum.java
@@ -1,6 +1,7 @@
 package mekanism.generators.common.item;
 
 import java.util.List;
+import java.util.function.Consumer;
 import mekanism.api.chemical.gas.GasStack;
 import mekanism.api.chemical.gas.IGasHandler;
 import mekanism.api.text.EnumColor;
@@ -12,13 +13,10 @@
 import mekanism.generators.common.GeneratorsLang;
 import mekanism.generators.common.registries.GeneratorsGases;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class ItemHohlraum extends Item implements ICustomCreativeTabContents {
 
@@ -62,7 +60,7 @@ public int getBarColor(@NotNull ItemStack stack) {
     }
 
     @Override
-    public void addItems(CreativeModeTab.Output tabOutput) {
+    public void addItems(Consumer<ItemStack> tabOutput) {
         tabOutput.accept(ChemicalUtil.getFilledVariant(new ItemStack(this), GeneratorsGases.FUSION_FUEL));
     }
 }
diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java
@@ -1,11 +1,11 @@
 package mekanism.common.item;
 
 import java.util.List;
+import java.util.function.Consumer;
 import mekanism.common.config.MekanismConfig;
 import mekanism.common.registration.impl.CreativeTabDeferredRegister.ICustomCreativeTabContents;
 import mekanism.common.util.StorageUtils;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
@@ -39,7 +39,7 @@ public void appendHoverText(@NotNull ItemStack stack, @NotNull Item.TooltipConte
     }
 
     @Override
-    public void addItems(CreativeModeTab.Output tabOutput) {
+    public void addItems(Consumer<ItemStack> tabOutput) {
         tabOutput.accept(StorageUtils.getFilledEnergyVariant(new ItemStack(this)));
     }
 
diff --git a/src/main/java/mekanism/common/item/block/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/block/ItemBlockEnergyCube.java
@@ -25,7 +25,6 @@
 import mekanism.common.util.text.EnergyDisplay;
 import net.minecraft.Util;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
@@ -93,7 +92,7 @@ public int getBarColor(@NotNull ItemStack stack) {
     }
 
     @Override
-    public void addItems(CreativeModeTab.Output tabOutput) {
+    public void addItems(Consumer<ItemStack> tabOutput) {
         EnergyCubeTier tier = getTier();
         if (tier == EnergyCubeTier.CREATIVE) {
             //Add the empty and charged variants
diff --git a/src/main/java/mekanism/common/item/gear/ItemCanteen.java b/src/main/java/mekanism/common/item/gear/ItemCanteen.java
@@ -1,6 +1,7 @@
 package mekanism.common.item.gear;
 
 import java.util.List;
+import java.util.function.Consumer;
 import mekanism.common.MekanismLang;
 import mekanism.common.capabilities.Capabilities;
 import mekanism.common.config.MekanismConfig;
@@ -13,7 +14,6 @@
 import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Rarity;
@@ -25,7 +25,6 @@
 import net.neoforged.neoforge.fluids.capability.IFluidHandler.FluidAction;
 import net.neoforged.neoforge.fluids.capability.IFluidHandlerItem;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class ItemCanteen extends Item implements ICustomCreativeTabContents {
 
@@ -54,7 +53,7 @@ public int getBarColor(@NotNull ItemStack stack) {
     }
 
     @Override
-    public void addItems(CreativeModeTab.Output tabOutput) {
+    public void addItems(Consumer<ItemStack> tabOutput) {
         tabOutput.accept(FluidUtils.getFilledVariant(new ItemStack(this), MekanismFluids.NUTRITIONAL_PASTE.getFluid()));
     }
 
diff --git a/src/main/java/mekanism/common/item/gear/ItemElectricBow.java b/src/main/java/mekanism/common/item/gear/ItemElectricBow.java
@@ -1,6 +1,7 @@
 package mekanism.common.item.gear;
 
 import java.util.List;
+import java.util.function.Consumer;
 import mekanism.api.Action;
 import mekanism.api.AutomationType;
 import mekanism.api.energy.IEnergyContainer;
@@ -26,7 +27,6 @@
 import net.minecraft.world.entity.projectile.AbstractArrow;
 import net.minecraft.world.item.ArrowItem;
 import net.minecraft.world.item.BowItem;
-import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
@@ -180,7 +180,7 @@ public int getBarColor(@NotNull ItemStack stack) {
     }
 
     @Override
-    public void addItems(CreativeModeTab.Output tabOutput) {
+    public void addItems(Consumer<ItemStack> tabOutput) {
         tabOutput.accept(StorageUtils.getFilledEnergyVariant(new ItemStack(this)));
     }
 
diff --git a/src/main/java/mekanism/common/item/gear/ItemFlamethrower.java b/src/main/java/mekanism/common/item/gear/ItemFlamethrower.java
@@ -40,7 +40,6 @@
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Rarity;
@@ -151,7 +150,7 @@ public int getBarColor(@NotNull ItemStack stack) {
     }
 
     @Override
-    public void addItems(CreativeModeTab.Output tabOutput) {
+    public void addItems(Consumer<ItemStack> tabOutput) {
         tabOutput.accept(ChemicalUtil.getFilledVariant(new ItemStack(this), MekanismGases.HYDROGEN));
     }
 
diff --git a/src/main/java/mekanism/common/item/gear/ItemFreeRunners.java b/src/main/java/mekanism/common/item/gear/ItemFreeRunners.java
@@ -33,7 +33,6 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ArmorItem;
 import net.minecraft.world.item.ArmorMaterial;
-import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Rarity;
@@ -66,7 +65,7 @@ public void appendHoverText(@NotNull ItemStack stack, @NotNull Item.TooltipConte
     }
 
     @Override
-    public void addItems(CreativeModeTab.Output tabOutput) {
+    public void addItems(Consumer<ItemStack> tabOutput) {
         tabOutput.accept(StorageUtils.getFilledEnergyVariant(new ItemStack(this)));
     }
 
diff --git a/src/main/java/mekanism/common/item/gear/ItemGasArmor.java b/src/main/java/mekanism/common/item/gear/ItemGasArmor.java
@@ -1,6 +1,7 @@
 package mekanism.common.item.gear;
 
 import java.util.List;
+import java.util.function.Consumer;
 import mekanism.api.providers.IGasProvider;
 import mekanism.common.item.interfaces.IGasItem;
 import mekanism.common.registration.impl.CreativeTabDeferredRegister.ICustomCreativeTabContents;
@@ -10,7 +11,6 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ArmorItem;
 import net.minecraft.world.item.ArmorMaterial;
-import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Rarity;
@@ -46,7 +46,7 @@ public int getBarColor(@NotNull ItemStack stack) {
     }
 
     @Override
-    public void addItems(CreativeModeTab.Output tabOutput) {
+    public void addItems(Consumer<ItemStack> tabOutput) {
         tabOutput.accept(ChemicalUtil.getFilledVariant(new ItemStack(this), getGasType()));
     }
 }
diff --git a/src/main/java/mekanism/common/item/gear/ItemMekaSuitArmor.java b/src/main/java/mekanism/common/item/gear/ItemMekaSuitArmor.java
@@ -81,7 +81,6 @@
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ArmorItem;
-import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Rarity;
@@ -261,7 +260,7 @@ public ItemEnchantments getAllEnchantments(@NotNull ItemStack stack) {
     }
 
     @Override
-    public void addItems(CreativeModeTab.Output tabOutput) {
+    public void addItems(Consumer<ItemStack> tabOutput) {
         tabOutput.accept(StorageUtils.getFilledEnergyVariant(new ItemStack(this)));
     }
 
diff --git a/src/main/java/mekanism/common/registration/impl/CreativeTabDeferredRegister.java b/src/main/java/mekanism/common/registration/impl/CreativeTabDeferredRegister.java
@@ -12,6 +12,7 @@
 import net.minecraft.core.registries.Registries;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.Block;
 import net.neoforged.bus.api.IEventBus;
@@ -65,13 +66,21 @@ public static void addToDisplay(CreativeModeTab.Output output, ItemLike... items
     }
 
     public static void addToDisplay(CreativeModeTab.Output output, ItemLike itemLike) {
+        CreativeModeTab.TabVisibility visibility;
+        if (output instanceof BuildCreativeModeTabContentsEvent) {
+            //If we are added from the event, only add the item to the parent tab, as we will already be contained in the search tab
+            // from when we are adding to our tabs
+            visibility = CreativeModeTab.TabVisibility.PARENT_TAB_ONLY;
+        } else {
+            visibility = CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS;
+        }
         if (itemLike.asItem() instanceof ICustomCreativeTabContents contents) {
             if (contents.addDefault()) {
-                output.accept(itemLike);
+                output.accept(itemLike, visibility);
             }
-            contents.addItems(output);
+            contents.addItems(stack -> output.accept(stack, visibility));
         } else {
-            output.accept(itemLike);
+            output.accept(itemLike, visibility);
         }
     }
 
@@ -99,7 +108,7 @@ public static void addToDisplay(FluidDeferredRegister register, CreativeModeTab.
 
     public interface ICustomCreativeTabContents {
 
-        void addItems(CreativeModeTab.Output tabOutput);
+        void addItems(Consumer<ItemStack> addToTab);
 
         default boolean addDefault() {
             return true;
diff --git a/src/main/java/mekanism/common/registries/MekanismCreativeTabs.java b/src/main/java/mekanism/common/registries/MekanismCreativeTabs.java
@@ -139,7 +139,7 @@ private static void addToExistingTabs(BuildCreativeModeTabContentsEvent event) {
                   MekanismItems.ARMORED_FREE_RUNNERS, MekanismItems.ARMORED_JETPACK);
         } else if (tabKey == CreativeModeTabs.FOOD_AND_DRINKS) {
             //Only add the filled canteen
-            MekanismItems.CANTEEN.get().addItems(event);
+            MekanismItems.CANTEEN.get().addItems(stack -> event.accept(stack, CreativeModeTab.TabVisibility.PARENT_TAB_ONLY));
         } else if (tabKey == CreativeModeTabs.INGREDIENTS) {
             CreativeTabDeferredRegister.addToDisplay(event,
                   MekanismItems.MODULE_BASE, MekanismItems.INFUSED_ALLOY, MekanismItems.REINFORCED_ALLOY, MekanismItems.ATOMIC_ALLOY,

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@`
`40`	`40`	`import net.minecraft.world.entity.EquipmentSlot;`
`41`	`41`	`import net.minecraft.world.entity.LivingEntity;`
`42`	`42`	`import net.minecraft.world.entity.player.Player;`
`43`		`-import net.minecraft.world.item.CreativeModeTab;`
`44`	`43`	`import net.minecraft.world.item.Item;`
`45`	`44`	`import net.minecraft.world.item.ItemStack;`
`46`	`45`	`import net.minecraft.world.item.Rarity;`
`@@ -151,7 +150,7 @@ public int getBarColor(@NotNull ItemStack stack) {`
`151`	`150`	`}`
`152`	`151`
`153`	`152`	`@Override`
`154`		`- public void addItems(CreativeModeTab.Output tabOutput) {`
	`153`	`+ public void addItems(Consumer<ItemStack> tabOutput) {`
`155`	`154`	`tabOutput.accept(ChemicalUtil.getFilledVariant(new ItemStack(this), MekanismGases.HYDROGEN));`
`156`	`155`	`}`
`157`	`156`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@`
`33`	`33`	`import net.minecraft.world.entity.player.Player;`
`34`	`34`	`import net.minecraft.world.item.ArmorItem;`
`35`	`35`	`import net.minecraft.world.item.ArmorMaterial;`
`36`		`-import net.minecraft.world.item.CreativeModeTab;`
`37`	`36`	`import net.minecraft.world.item.Item;`
`38`	`37`	`import net.minecraft.world.item.ItemStack;`
`39`	`38`	`import net.minecraft.world.item.Rarity;`
`@@ -66,7 +65,7 @@ public void appendHoverText(@NotNull ItemStack stack, @NotNull Item.TooltipConte`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`@Override`
`69`		`- public void addItems(CreativeModeTab.Output tabOutput) {`
	`68`	`+ public void addItems(Consumer<ItemStack> tabOutput) {`
`70`	`69`	`tabOutput.accept(StorageUtils.getFilledEnergyVariant(new ItemStack(this)));`
`71`	`70`	`}`
`72`	`71`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,6 @@`
`81`	`81`	`import net.minecraft.world.entity.player.Inventory;`
`82`	`82`	`import net.minecraft.world.entity.player.Player;`
`83`	`83`	`import net.minecraft.world.item.ArmorItem;`
`84`		`-import net.minecraft.world.item.CreativeModeTab;`
`85`	`84`	`import net.minecraft.world.item.Item;`
`86`	`85`	`import net.minecraft.world.item.ItemStack;`
`87`	`86`	`import net.minecraft.world.item.Rarity;`
`@@ -261,7 +260,7 @@ public ItemEnchantments getAllEnchantments(@NotNull ItemStack stack) {`
`261`	`260`	`}`
`262`	`261`
`263`	`262`	`@Override`
`264`		`- public void addItems(CreativeModeTab.Output tabOutput) {`
	`263`	`+ public void addItems(Consumer<ItemStack> tabOutput) {`
`265`	`264`	`tabOutput.accept(StorageUtils.getFilledEnergyVariant(new ItemStack(this)));`
`266`	`265`	`}`
`267`	`266`