Remove Fried Rice

common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt

@@ -434,28 +434,19 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
         .food(FoodProperties.Builder()
             .nutrition(10) // todo get final values for this from vera
             .saturationModifier(1.2F) // todo get final values for this from vera
-            .alwaysEdible()
-            .build())) {})
-    @JvmField
-    val FRIED_RICE = create("fried_rice", object : Item(Properties().stacksTo(16)
-        .food(FoodProperties.Builder()
-            .nutrition(10) // todo get final values for this from vera
-            .saturationModifier(1.2F) // todo get final values for this from vera
-            .alwaysEdible()
             .build())) {})
     @JvmField
     val CANDIED_APPLE = create("candied_apple", object : Item(Properties().stacksTo(16)
         .food(FoodProperties.Builder()
             .nutrition(10) // todo get final values for this from vera
             .saturationModifier(1.2F) // todo get final values for this from vera
-            .alwaysEdible()
             .build())) {})
     @JvmField
     val CANDIED_BERRY = create("candied_berry", object : Item(Properties().stacksTo(16)
         .food(FoodProperties.Builder()
             .nutrition(10) // todo get final values for this from vera
             .saturationModifier(1.2F) // todo get final values for this from vera
-            .alwaysEdible()
+            .usingConvertsTo(Items.STICK)
             .build())) {})
 
     //@JvmField

common/src/main/kotlin/com/cobblemon/mod/common/item/group/CobblemonItemGroups.kt

@@ -398,7 +398,6 @@ object CobblemonItemGroups {
 
         entries.accept(CobblemonItems.CANDIED_APPLE)
         entries.accept(CobblemonItems.CANDIED_BERRY)
-        entries.accept(CobblemonItems.FRIED_RICE)
         entries.accept(CobblemonItems.POTATO_MOCHI)
 
         entries.accept(CobblemonItems.PEWTER_CRUNCHIES)
@@ -741,8 +740,7 @@ object CobblemonItemGroups {
 
         injector.putAfter(CobblemonItems.CANDIED_APPLE, CobblemonItems.RIBBON_SWEET)
         injector.putAfter(CobblemonItems.CANDIED_BERRY, CobblemonItems.CANDIED_APPLE)
-        injector.putAfter(CobblemonItems.FRIED_RICE, CobblemonItems.CANDIED_BERRY)
-        injector.putAfter(CobblemonItems.POTATO_MOCHI, CobblemonItems.FRIED_RICE)
+        injector.putAfter(CobblemonItems.POTATO_MOCHI, CobblemonItems.CANDIED_BERRY)
 
         injector.putAfter(CobblemonItems.PEWTER_CRUNCHIES, CobblemonItems.POTATO_MOCHI)
         injector.putAfter(CobblemonItems.RAGE_CANDY_BAR, CobblemonItems.PEWTER_CRUNCHIES)

common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/SinisterTeaItem.kt

@@ -17,6 +17,7 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.food.FoodProperties
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
+import net.minecraft.world.item.Items
 import net.minecraft.world.item.UseAnim
 import net.minecraft.world.level.Level
 
@@ -38,6 +39,14 @@ class SinisterTeaItem : Item(
                     user.addEffect(effectCopy)
                 }
             }
+
+            if (user is Player && !user.isCreative) {
+                val bowl = ItemStack(Items.BOWL)
+
+                if (!user.inventory.add(bowl)) {
+                    user.drop(bowl, false)
+                }
+            }
         }
 
         return super.finishUsingItem(stack, world, user)

common/src/main/resources/data/cobblemon/advancement/recipes/cooking_pot/fried_rice_from_cooking_pot.json

@@ -1,32 +0,0 @@
-{
-  "parent": "cobblemon:recipes/root",
-  "criteria": {
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "cobblemon:cooking_pot/fried_rice_from_cooking_pot"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    },
-    "has_grain": {
-      "conditions": {
-        "items": [
-          {
-            "items": "cobblemon:hearty_grains"
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    }
-  },
-  "requirements": [
-    [
-      "has_the_recipe",
-	  "has_grain"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "cobblemon:cooking_pot/fried_rice_from_cooking_pot"
-    ]
-  }
-}