From 829b8f1519f6449d560b4946d4c3ad8637272cc7 Mon Sep 17 00:00:00 2001
From: KnightMiner <knightminer4@gmail.com>
Date: Fri, 14 May 2021 15:15:43 -0400
Subject: [PATCH] Make heartbeets drop again

---
 gradle.properties                             |  4 +--
 .../inspirations/common/Config.java           |  7 ----
 .../common/data/ConfigEnabledCondition.java   |  1 +
 .../loot_modifiers/global_loot_modifiers.json |  6 ++++
 .../loot_modifiers/heartbeet.json             | 32 +++++++++++++++++++
 5 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json
 create mode 100644 src/main/resources/data/inspirations/loot_modifiers/heartbeet.json

diff --git a/gradle.properties b/gradle.properties
index df179476..4ef196f9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,8 +6,8 @@ minecraft_range=[1.16.5,1.17)
 
 # Forge Version Information
 loader_range=[33.0,)
-forge_version=36.0.1
-forge_range=[36.0.1,)
+forge_version=36.0.14
+forge_range=[36.0.14,)
 mappings_version=20200916-1.16.2
 
 # Dependencies
diff --git a/src/main/java/knightminer/inspirations/common/Config.java b/src/main/java/knightminer/inspirations/common/Config.java
index ed33e91d..17949f02 100644
--- a/src/main/java/knightminer/inspirations/common/Config.java
+++ b/src/main/java/knightminer/inspirations/common/Config.java
@@ -144,8 +144,6 @@ public class Config {
   public static final CachedBoolean enableHeartbeet;
   public static final CachedBoolean brewHeartbeet;
 
-  public static final CachedValue<Integer> heartbeetChance;
-
   // seeds
   public static final CachedBoolean enableBlockCrops;
   public static final CachedBoolean smoothBlockCropGrowth;
@@ -575,11 +573,6 @@ public class Config {
           .worldRestart()
           .define("heartbeet.brewRegeneration", true));
 
-      // TODO: move to loot tables
-      heartbeetChance = server(server
-          .comment("Chance of a heartbeet to drop instead of a normal drop. Formula is two 1 in [chance] chances for it to drop each harvest")
-          .defineInRange("heartbeet.chance", 75, 10, 1000));
-
       // dispensers place anvils
       dispensersPlaceAnvils = and(tweaksModule, server
           .comment("Dispensers will place anvils instead of dropping them. Plays well with anvil smashing.")
diff --git a/src/main/java/knightminer/inspirations/common/data/ConfigEnabledCondition.java b/src/main/java/knightminer/inspirations/common/data/ConfigEnabledCondition.java
index 7e1f9a5d..860e6ec5 100644
--- a/src/main/java/knightminer/inspirations/common/data/ConfigEnabledCondition.java
+++ b/src/main/java/knightminer/inspirations/common/data/ConfigEnabledCondition.java
@@ -142,6 +142,7 @@ private static ConfigEnabledCondition add(String prop, BooleanSupplier supplier)
   public static final ConfigEnabledCondition UNSTACKABLE_ALTS = add("unstackable_alts", Config.unstackableRecipeAlts);
   public static final ConfigEnabledCondition SKELETON_SKULL = add("skeleton_skull", Config.skeletonSkull);
   public static final ConfigEnabledCondition CAVE_SPIDER_WEB = add("cave_spider_web", Config.caveSpiderDrops);
+  public static final ConfigEnabledCondition HEARTBEETS = add("heartbeets", Config.enableHeartbeet);
 
   // recipes
   public static final ConfigEnabledCondition CAULDRON_RECIPES = add("cauldron_recipes", Config.cauldronRecipes);
diff --git a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json
new file mode 100644
index 00000000..8d7ac6b4
--- /dev/null
+++ b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "entries": [
+    "inspirations:heartbeet"
+  ]
+}
diff --git a/src/main/resources/data/inspirations/loot_modifiers/heartbeet.json b/src/main/resources/data/inspirations/loot_modifiers/heartbeet.json
new file mode 100644
index 00000000..9e36002d
--- /dev/null
+++ b/src/main/resources/data/inspirations/loot_modifiers/heartbeet.json
@@ -0,0 +1,32 @@
+{
+  "type": "mantle:replace_item",
+  "conditions": [
+    {
+      "condition": "forge:loot_table_id",
+      "loot_table_id": "minecraft:blocks/beetroots"
+    },
+    {
+      "condition": "inspirations:config",
+      "prop": "heartbeets"
+    },
+    {
+      "condition": "minecraft:block_state_property",
+      "block": "minecraft:beetroots",
+      "properties": {
+        "age": "3"
+      }
+    },
+    {
+      "condition": "minecraft:table_bonus",
+      "enchantment": "minecraft:fortune",
+      "chances": [
+        0.05,
+        0.0625,
+        0.083333336,
+        0.1
+      ]
+    }
+  ],
+  "original": "minecraft:beetroot",
+  "replacement": "inspirations:heartbeet"
+}