diff --git a/src/main/java/slimeknights/mantle/client/CreativeTab.java b/src/main/java/slimeknights/mantle/client/CreativeTab.java deleted file mode 100644 index 268dec5..0000000 --- a/src/main/java/slimeknights/mantle/client/CreativeTab.java +++ /dev/null @@ -1,36 +0,0 @@ -package slimeknights.mantle.client; - -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -public class CreativeTab extends ItemGroup { - - private ItemStack icon; - - // a vanilla icon in case the other one isn't present - public CreativeTab(String label, ItemStack backupIcon) { - super(label); - - this.icon = backupIcon; - } - - public void setDisplayIcon(ItemStack displayIcon) { - if (!displayIcon.isEmpty()) { - this.icon = displayIcon; - } - } - - @OnlyIn(Dist.CLIENT) - @Override - public ItemStack getIcon() { - return this.icon; - } - - @OnlyIn(Dist.CLIENT) - @Override - public ItemStack createIcon() { - return this.icon; - } -} diff --git a/src/main/java/slimeknights/mantle/util/SupplierItemGroup.java b/src/main/java/slimeknights/mantle/util/SupplierItemGroup.java new file mode 100644 index 0000000..5e66e26 --- /dev/null +++ b/src/main/java/slimeknights/mantle/util/SupplierItemGroup.java @@ -0,0 +1,33 @@ +package slimeknights.mantle.util; + +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +import java.util.function.Supplier; + +/** + * Item group that sets its item based on an item supplier + */ +public class SupplierItemGroup extends ItemGroup { + private final Supplier supplier; + + /** + * Creates a new item group + * @param modId Tab owner mod ID + * @param name Tab name + * @param supplier Item stack supplier + */ + public SupplierItemGroup(String modId, String name, Supplier supplier) { + super(String.format("%s.%s", modId, name)); + this.setTabPath(String.format("%s/%s", modId, name)); + this.supplier = supplier; + } + + @OnlyIn(Dist.CLIENT) + @Override + public ItemStack createIcon() { + return supplier.get(); + } +}