From 1c58ae9539508ee786a9402f3b58a8a76c8bec90 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Thu, 15 Dec 2022 10:12:40 +0000
Subject: [PATCH] Only drop seeds from the bottom-most oats plant, and only
 drop oats from the other two

---
 .../unicopia/loot_tables/blocks/oats.json     | 13 -----
 .../loot_tables/blocks/oats_crown.json        | 51 +++----------------
 .../loot_tables/blocks/oats_stem.json         | 47 +++--------------
 3 files changed, 12 insertions(+), 99 deletions(-)

diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/oats.json b/src/main/resources/data/unicopia/loot_tables/blocks/oats.json
index 3adf5caf..17b0d17a 100644
--- a/src/main/resources/data/unicopia/loot_tables/blocks/oats.json
+++ b/src/main/resources/data/unicopia/loot_tables/blocks/oats.json
@@ -12,19 +12,6 @@
         {
           "type": "minecraft:alternatives",
           "children": [
-            {
-              "type": "minecraft:item",
-              "conditions": [
-                {
-                  "block": "unicopia:oats",
-                  "condition": "minecraft:block_state_property",
-                  "properties": {
-                    "age": "11"
-                  }
-                }
-              ],
-              "name": "unicopia:oats"
-            },
             {
               "type": "minecraft:item",
               "name": "unicopia:oat_seeds"
diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/oats_crown.json b/src/main/resources/data/unicopia/loot_tables/blocks/oats_crown.json
index 4d3e6bd0..fe5807ed 100644
--- a/src/main/resources/data/unicopia/loot_tables/blocks/oats_crown.json
+++ b/src/main/resources/data/unicopia/loot_tables/blocks/oats_crown.json
@@ -8,58 +8,19 @@
   "pools": [
     {
       "bonus_rolls": 0.0,
-      "entries": [
-        {
-          "type": "minecraft:alternatives",
-          "children": [
-            {
-              "type": "minecraft:item",
-              "conditions": [
-                {
-                  "block": "unicopia:oats_crown",
-                  "condition": "minecraft:block_state_property",
-                  "properties": {
-                    "age": "1"
-                  }
-                }
-              ],
-              "name": "unicopia:oats"
-            },
-            {
-              "type": "minecraft:item",
-              "name": "unicopia:oat_seeds"
-            }
-          ]
-        }
-      ],
-      "rolls": 1.0
-    },
-    {
-      "bonus_rolls": 0.0,
-      "conditions": [
-        {
-          "block": "unicopia:oats_crown",
-          "condition": "minecraft:block_state_property",
-          "properties": {
-            "age": "1"
-          }
-        }
-      ],
       "entries": [
         {
           "type": "minecraft:item",
-          "functions": [
+          "conditions": [
             {
-              "enchantment": "minecraft:fortune",
-              "formula": "minecraft:binomial_with_bonus_count",
-              "function": "minecraft:apply_bonus",
-              "parameters": {
-                "extra": 3,
-                "probability": 0.5714286
+              "block": "unicopia:oats_crown",
+              "condition": "minecraft:block_state_property",
+              "properties": {
+                "age": "1"
               }
             }
           ],
-          "name": "unicopia:oat_seeds"
+          "name": "unicopia:oats"
         }
       ],
       "rolls": 1.0
diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/oats_stem.json b/src/main/resources/data/unicopia/loot_tables/blocks/oats_stem.json
index 5cadc205..72ea00c4 100644
--- a/src/main/resources/data/unicopia/loot_tables/blocks/oats_stem.json
+++ b/src/main/resources/data/unicopia/loot_tables/blocks/oats_stem.json
@@ -8,54 +8,19 @@
   "pools": [
     {
       "bonus_rolls": 0.0,
-      "entries": [
-        {
-          "type": "minecraft:alternatives",
-          "children": [
-            {
-              "type": "minecraft:item",
-              "conditions": [
-                {
-                  "block": "unicopia:oats_stem",
-                  "condition": "minecraft:block_state_property",
-                  "properties": {
-                    "age": "6"
-                  }
-                }
-              ],
-              "name": "unicopia:oats"
-            }
-          ]
-        }
-      ],
-      "rolls": 1.0
-    },
-    {
-      "bonus_rolls": 0.0,
-      "conditions": [
-        {
-          "block": "unicopia:oats_stem",
-          "condition": "minecraft:block_state_property",
-          "properties": {
-            "age": "6"
-          }
-        }
-      ],
       "entries": [
         {
           "type": "minecraft:item",
-          "functions": [
+          "conditions": [
             {
-              "enchantment": "minecraft:fortune",
-              "formula": "minecraft:binomial_with_bonus_count",
-              "function": "minecraft:apply_bonus",
-              "parameters": {
-                "extra": 3,
-                "probability": 0.5714286
+              "block": "unicopia:oats_stem",
+              "condition": "minecraft:block_state_property",
+              "properties": {
+                "age": "6"
               }
             }
           ],
-          "name": "unicopia:oat_seeds"
+          "name": "unicopia:oats"
         }
       ],
       "rolls": 1.0