Fixed some items not appearing, or appearing in the incorrect creative tab

src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java

@@ -56,8 +56,8 @@ public class AlicornAmuletItem extends ArmorItem implements AddictiveMagicalItem
             UUID.fromString("2AD3F246-FEE1-4E67-B886-69FD380BB150")
     };
 
-    public AlicornAmuletItem() {
+    public AlicornAmuletItem(Settings settings) {
-        super(new Material(), EquipmentSlot.CHEST, new Settings().maxCount(1));
+        super(new Material(), EquipmentSlot.CHEST, settings);
     }
 
     @Override

src/main/java/com/minelittlepony/unicopia/item/AppleItem.java

@@ -9,9 +9,7 @@ import com.minelittlepony.unicopia.toxin.Toxicity;
 import net.minecraft.client.item.TooltipContext;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.ItemEntity;
-import net.minecraft.item.FoodComponent;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.text.Text;
@@ -21,10 +19,8 @@ import net.minecraft.world.World;
 
 public class AppleItem extends Item implements ItemEntityCapabilities.TickableItem {
 
-    public AppleItem(FoodComponent components) {
+    public AppleItem(Settings settings) {
-        super(new Item.Settings()
+        super(settings);
-                .group(ItemGroup.FOOD)
-                .food(components));
     }
 
     @Override

src/main/java/com/minelittlepony/unicopia/item/BagOfHoldingItem.java

@@ -23,7 +23,6 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.Text;
@@ -39,8 +38,8 @@ import net.minecraft.world.World;
 
 public class BagOfHoldingItem extends Item implements MagicalItem {
 
-    public BagOfHoldingItem() {
+    public BagOfHoldingItem(Settings settings) {
-        super(new Settings().maxCount(1).group(ItemGroup.TRANSPORTATION));
+        super(settings);
     }
 
     @Override

src/main/java/com/minelittlepony/unicopia/item/CursedMagicGemItem.java

@@ -15,6 +15,10 @@ import net.minecraft.world.explosion.Explosion.DestructionType;
 
 public class CursedMagicGemItem extends MagicGemItem {
 
+    public CursedMagicGemItem(Settings settings) {
+        super(settings);
+    }
+
     @Override
     public CastResult onDispenseSpell(BlockPointer source, ItemStack stack, DispenceableMagicEffect effect) {
 

src/main/java/com/minelittlepony/unicopia/item/ExtendedShearsItem.java

@@ -8,8 +8,6 @@ import net.minecraft.block.BlockState;
 import net.minecraft.block.DispenserBlock;
 import net.minecraft.block.dispenser.DispenserBehavior;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.item.Items;
@@ -21,8 +19,8 @@ import net.minecraft.world.World;
 
 public class ExtendedShearsItem extends ShearsItem {
 
-    public ExtendedShearsItem() {
+    public ExtendedShearsItem(Settings settings) {
-        super(new Item.Settings().maxDamage(238).group(ItemGroup.TOOLS));
+        super(settings);
         final Optional<DispenserBehavior> vanillaDispenserBehaviour = Dispensable.getBehavior(new ItemStack(Items.SHEARS));
         DispenserBlock.registerBehavior(Items.SHEARS, Dispensable.setDispenseable(this, (source, stack) -> {
 

src/main/java/com/minelittlepony/unicopia/item/MagicGemItem.java

@@ -37,10 +37,8 @@ import net.minecraft.world.World;
 
 public class MagicGemItem extends Item implements Castable {
 
-    public MagicGemItem() {
+    public MagicGemItem(Settings settings) {
-        super(new Settings()
+        super(settings);
-                .maxCount(16)
-                .group(ItemGroup.BREWING));
         Dispensable.setDispenseable(this, this::dispenseStack);
     }
 

src/main/java/com/minelittlepony/unicopia/item/RottenAppleItem.java

@@ -3,13 +3,12 @@ package com.minelittlepony.unicopia.item;
 import com.minelittlepony.unicopia.ducks.IItemEntity;
 
 import net.fabricmc.fabric.api.registry.FuelRegistry;
-import net.minecraft.item.FoodComponent;
 import net.minecraft.util.ActionResult;
 
 public class RottenAppleItem extends AppleItem {
 
-    public RottenAppleItem(FoodComponent components) {
+    public RottenAppleItem(Settings settings) {
-        super(components);
+        super(settings);
         FuelRegistry.INSTANCE.add(this, 150);
     }
 

src/main/java/com/minelittlepony/unicopia/item/SpellbookItem.java

@@ -10,8 +10,6 @@ import com.minelittlepony.unicopia.magic.Dispensable;
 import net.minecraft.block.DispenserBlock;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.BookItem;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.TypedActionResult;
@@ -21,10 +19,8 @@ import net.minecraft.world.World;
 
 public class SpellbookItem extends BookItem {
 
-    public SpellbookItem() {
+    public SpellbookItem(Settings settings) {
-        super(new Item.Settings()
+        super(settings);
-                .maxCount(1)
-                .group(ItemGroup.BREWING));
         Dispensable.setDispenseable(this, (source, stack) -> {
             Direction facing = source.getBlockState().get(DispenserBlock.FACING);
             BlockPos pos = source.getBlockPos().offset(facing);

src/main/java/com/minelittlepony/unicopia/item/StickItem.java

@@ -7,7 +7,6 @@ import com.minelittlepony.unicopia.block.UBlocks;
 import net.minecraft.advancement.criterion.Criterions;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -19,8 +18,8 @@ import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
 
 public class StickItem extends Item {
-    public StickItem() {
+    public StickItem(Settings settings) {
-        super(new Item.Settings().group(ItemGroup.MATERIALS));
+        super(settings);
     }
 
     @Override

src/main/java/com/minelittlepony/unicopia/item/UFoodComponents.java

@@ -19,6 +19,11 @@ public interface UFoodComponents {
     FoodComponent BURNED_JUICE = builder(3, 1).build();
     FoodComponent WORMS = builder(1, 0).alwaysEdible().build();
 
+    FoodComponent CEREAL = builder(9, 0.8F).build();
+    FoodComponent SUGAR = builder(20, -2).build();
+
+    FoodComponent ZAP_APPLE = builder(4, 0.3F).alwaysEdible().snack().build();
+
     static FoodComponent.Builder builder(int hunger, float saturation) {
         return new FoodComponent.Builder()
                 .hunger(hunger)

src/main/java/com/minelittlepony/unicopia/item/UItems.java

@@ -16,7 +16,6 @@ import net.minecraft.item.Item.Settings;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.AliasedBlockItem;
 import net.minecraft.item.BlockItem;
-import net.minecraft.item.FoodComponent;
 import net.minecraft.item.FoodComponents;
 import net.minecraft.item.Items;
 import net.minecraft.item.MusicDiscItem;
@@ -30,14 +29,14 @@ import net.minecraft.util.registry.Registry;
 
 public interface UItems {
 
-    AppleItem GREEN_APPLE = register(new AppleItem(FoodComponents.APPLE), "apple_green");
+    AppleItem GREEN_APPLE = register(new AppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), "apple_green");
-    AppleItem SWEET_APPLE = register(new AppleItem(FoodComponents.APPLE), "apple_sweet");
+    AppleItem SWEET_APPLE = register(new AppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), "apple_sweet");
-    AppleItem SOUR_APPLE = register(new AppleItem(FoodComponents.APPLE), "apple_sour");
+    AppleItem SOUR_APPLE = register(new AppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), "apple_sour");
 
-    ZapAppleItem ZAP_APPLE = register(new ZapAppleItem(), "zap_apple");
+    ZapAppleItem ZAP_APPLE = register(new ZapAppleItem(new Item.Settings().group(ItemGroup.FOOD).food(UFoodComponents.ZAP_APPLE)), "zap_apple");
 
-    AppleItem ROTTEN_APPLE = register(new RottenAppleItem(FoodComponents.APPLE), "rotten_apple");
+    AppleItem ROTTEN_APPLE = register(new RottenAppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), "rotten_apple");
-    AppleItem COOKED_ZAP_APPLE = register(new AppleItem(FoodComponents.APPLE), "cooked_zap_apple");
+    AppleItem COOKED_ZAP_APPLE = register(new AppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), "cooked_zap_apple");
 
     Item CLOUD_MATTER = register(new Item(new Settings().group(ItemGroup.MATERIALS)), "cloud_matter");
     Item DEW_DROP = register(new Item(new Settings().group(ItemGroup.MATERIALS)), "dew_drop");
@@ -79,45 +78,33 @@ public interface UItems {
     Item ENCHANTED_CLOUD_SLAB = register(new PredicatedBlockItem(UBlocks.ENCHANTED_CLOUD_SLAB, new Settings().group(ItemGroup.BUILDING_BLOCKS), INTERACT_WITH_CLOUDS), "enchanted_cloud_slab");
     Item DENSE_CLOUD_SLAB = register(new PredicatedBlockItem(UBlocks.DENSE_CLOUD_SLAB, new Settings().group(ItemGroup.BUILDING_BLOCKS), INTERACT_WITH_CLOUDS), "dense_cloud_slab");
 
-    MagicGemItem GEM = register(new MagicGemItem(), "gem");
+    MagicGemItem GEM = register(new MagicGemItem(new Settings().maxCount(16).group(ItemGroup.BREWING)), "gem");
-    MagicGemItem CORRUPTED_GEM = register(new CursedMagicGemItem(), "corrupted_gem");
+    MagicGemItem CORRUPTED_GEM = register(new CursedMagicGemItem(new Settings().maxCount(16).group(ItemGroup.BREWING)), "corrupted_gem");
 
-    BagOfHoldingItem BAG_OF_HOLDING = register(new BagOfHoldingItem(), "bag_of_holding");
+    BagOfHoldingItem BAG_OF_HOLDING = register(new BagOfHoldingItem(new Settings().group(ItemGroup.TRANSPORTATION).rarity(Rarity.UNCOMMON).maxCount(1)), "bag_of_holding");
-    AlicornAmuletItem ALICORN_AMULET = register(new AlicornAmuletItem(), "alicorn_amulet");
+    AlicornAmuletItem ALICORN_AMULET = register(new AlicornAmuletItem(new Settings().group(ItemGroup.COMBAT).rarity(Rarity.RARE).maxCount(1)), "alicorn_amulet");
 
-    SpellbookItem SPELLBOOK = register(new SpellbookItem(), "spellbook");
+    SpellbookItem SPELLBOOK = register(new SpellbookItem(new Item.Settings().maxCount(1).group(ItemGroup.BREWING)), "spellbook");
-    Item STAFF_MEADOW_BROOK = register(new StaffItem(new Settings().maxCount(1).maxDamage(2)), "staff_meadow_brook");
+    Item STAFF_MEADOW_BROOK = register(new StaffItem(new Settings().group(ItemGroup.TOOLS).rarity(Rarity.UNCOMMON).maxCount(1).maxDamage(2)), "staff_meadow_brook");
-    Item STAFF_REMEMBERANCE = register(new EnchantedStaffItem(new Settings(), new ScorchSpell()), "staff_remembrance");
+    Item STAFF_REMEMBERANCE = register(new EnchantedStaffItem(new Settings().group(ItemGroup.TOOLS).rarity(Rarity.UNCOMMON).maxCount(1), new ScorchSpell()), "staff_remembrance");
 
-    Item SPEAR = register(new SpearItem(new Settings().maxCount(1).maxDamage(500)), "spear");
+    Item SPEAR = register(new SpearItem(new Settings().group(ItemGroup.TOOLS).maxCount(1).maxDamage(500)), "spear");
 
-    MossItem MOSS = register(new MossItem(new Settings()
+    MossItem MOSS = register(new MossItem(new Settings().group(ItemGroup.FOOD).food(UFoodComponents.RANDOM_FOLIAGE)), "moss");
-            .food(UFoodComponents.RANDOM_FOLIAGE)), "moss");
 
-    Item ALFALFA_SEEDS = register(new AliasedBlockItem(UBlocks.ALFALFA_CROPS, new Settings()
+    Item ALFALFA_SEEDS = register(new AliasedBlockItem(UBlocks.ALFALFA_CROPS, new Settings().group(ItemGroup.MATERIALS).food(UFoodComponents.ALFALFA_SEEDS)), "alfalfa_seeds");
-            .group(ItemGroup.MATERIALS)
+    Item ALFALFA_LEAVES = register(new Item(new Settings().group(ItemGroup.FOOD).food(UFoodComponents.ALFALFA_LEAVES)), "alfalfa_leaves");
-            .food(UFoodComponents.ALFALFA_SEEDS)), "alfalfa_seeds");
-    Item ALFALFA_LEAVES = register(new Item(new Settings()
-            .group(ItemGroup.FOOD)
-            .food(UFoodComponents.ALFALFA_LEAVES)), "alfalfa_leaves");
 
     Item ENCHANTED_TORCH = register(new BlockItem(UBlocks.ENCHANTED_TORCH, new Settings().group(ItemGroup.DECORATIONS)), "enchanted_torch");
 
-
     Item CEREAL = register(new SugaryItem(new Settings()
             .group(ItemGroup.FOOD)
-            .food(new FoodComponent.Builder()
+            .food(UFoodComponents.CEREAL)
-                    .hunger(9)
-                    .saturationModifier(0.8F)
-                    .build())
             .maxCount(1)
             .recipeRemainder(Items.BOWL), 1), "cereal");
     Item SUGAR_CEREAL = register(new SugaryItem(new Settings()
             .group(ItemGroup.FOOD)
-            .food(new FoodComponent.Builder()
+            .food(UFoodComponents.SUGAR)
-                    .hunger(20)
-                    .saturationModifier(-2)
-                    .build())
             .maxCount(1)
             .recipeRemainder(Items.BOWL), 110), "sugar_cereal");
 
@@ -130,35 +117,45 @@ public interface UItems {
             .food(UFoodComponents.BAD_TOMATO)), "rotten_tomato");
 
     TomatoItem CLOUDSDALE_TOMATO = register(new TomatoItem(new Settings()
+            .rarity(Rarity.UNCOMMON)
             .group(ItemGroup.FOOD)
             .food(UFoodComponents.GOOD_TOMATO)), "cloudsdale_tomato");
     RottenTomatoItem ROTTEN_CLOUDSDALE_TOMATO = register(new RottenTomatoItem(new Settings()
             .group(ItemGroup.FOOD)
+            .rarity(Rarity.UNCOMMON)
             .food(UFoodComponents.BAD_TOMATO)), "rotten_cloudsdale_tomato");
 
     Item APPLE_SEEDS = register(new BlockItem(UBlocks.APPLE_SAPLING, new Settings().group(ItemGroup.DECORATIONS)), "apple_seeds");
     Item APPLE_LEAVES = register(new BlockItem(UBlocks.APPLE_LEAVES, new Settings().group(ItemGroup.DECORATIONS)), "apple_leaves");
 
     Item DAFFODIL_DAISY_SANDWICH = register(new ToxicItem(new Settings()
+            .group(ItemGroup.FOOD)
             .food(UFoodComponents.DAFODIL_DAISY_SANDWICH), UseAction.EAT, Toxicity::fromStack, Toxin.FOOD), "daffodil_daisy_sandwich");
     Item HAY_BURGER = register(new ToxicItem(new Settings()
+            .group(ItemGroup.FOOD)
             .food(UFoodComponents.HAY_BURGER), UseAction.EAT, Toxicity::fromStack, Toxin.FOOD), "hay_burger");
     Item HAY_FRIES = register(new ToxicItem(new Settings()
+            .group(ItemGroup.FOOD)
             .food(UFoodComponents.HAY_FRIES), UseAction.EAT, Toxicity.SAFE, Toxin.FOOD), "hay_fries");
     Item SALAD = register(new ToxicItem(new Settings()
+            .group(ItemGroup.FOOD)
             .food(UFoodComponents.SALAD)
             .recipeRemainder(Items.BOWL), UseAction.EAT, Toxicity::fromStack, Toxin.FOOD), "salad");
 
     Item WHEAT_WORMS = register(new ToxicItem(new Settings()
+            .group(ItemGroup.MISC)
             .food(UFoodComponents.WORMS), UseAction.EAT, Toxicity.SEVERE, Toxin.FOOD), "wheat_worms");
     Item MUG = register(new Item(new Settings().group(ItemGroup.MATERIALS)), "mug");
     Item CIDER = register(new ToxicItem(new Settings()
+            .group(ItemGroup.FOOD)
             .food(UFoodComponents.SALAD)
             .recipeRemainder(MUG), UseAction.DRINK, Toxicity.MILD, Toxin.FOOD), "apple_cider");
     Item JUICE = register(new ToxicItem(new Settings()
+            .group(ItemGroup.FOOD)
             .recipeRemainder(Items.GLASS_BOTTLE)
             .food(UFoodComponents.JUICE), UseAction.DRINK, Toxicity.SAFE, Toxin.FOOD), "juice");
     Item BURNED_JUICE = register(new ToxicItem(new Settings()
+            .group(ItemGroup.FOOD)
             .recipeRemainder(Items.GLASS_BOTTLE)
             .food(UFoodComponents.BURNED_JUICE), UseAction.DRINK, Toxicity.FAIR, Toxin.FOOD), "burned_juice");
 
@@ -186,10 +183,10 @@ public interface UItems {
     }
 
     interface VanillaOverrides {
-        StickItem STICK = register(new StickItem(), Items.STICK);
+        StickItem STICK = register(new StickItem(new Item.Settings().group(ItemGroup.MATERIALS)), Items.STICK);
-        ExtendedShearsItem SHEARS = register(new ExtendedShearsItem(), Items.SHEARS);
+        ExtendedShearsItem SHEARS = register(new ExtendedShearsItem(new Item.Settings().maxDamage(238).group(ItemGroup.TOOLS)), Items.SHEARS);
 
-        AppleItem APPLE = register(new AppleItem(FoodComponents.APPLE), Items.APPLE);
+        AppleItem APPLE = register(new AppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), Items.APPLE);
 
         static <T extends Item> T register(T newItem, Item oldItem) {
             return Registry.ITEM.set(Registry.ITEM.getRawId(oldItem), Registry.ITEM.getId(oldItem), newItem);

src/main/java/com/minelittlepony/unicopia/item/ZapAppleItem.java

@@ -15,7 +15,6 @@ import net.minecraft.entity.mob.CreeperEntity;
 import net.minecraft.entity.passive.PigEntity;
 import net.minecraft.entity.passive.VillagerEntity;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.FoodComponent;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
@@ -43,11 +42,8 @@ public class ZapAppleItem extends AppleItem {
             UItems.COOKED_ZAP_APPLE
     );
 
-    public ZapAppleItem() {
+    public ZapAppleItem(Settings settings) {
-        super(new FoodComponent.Builder()
+        super(settings);
-                .hunger(4)
-                .saturationModifier(0.3F)
-                .alwaysEdible().build());
     }
 
     @Override

src/main/java/com/minelittlepony/unicopia/toxin/ToxicItem.java

@@ -9,7 +9,6 @@ import net.minecraft.client.item.TooltipContext;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.Text;
 import net.minecraft.util.Hand;
@@ -26,7 +25,7 @@ public class ToxicItem extends Item {
     }
 
     public ToxicItem(Item.Settings settings, UseAction action, Function<ItemStack, Toxicity> toxicity, Toxin toxin) {
-        super(settings.group(ItemGroup.FOOD));
+        super(settings);
         this.toxic = new Toxic(this, action, toxin, toxicity);
     }