From c5c4c4d8a60bb0e779ee7d60ae7621f23e851b9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Henke?= <joerg.henke@uni-greifswald.de>
Date: Wed, 27 Nov 2024 22:32:15 +0100
Subject: [PATCH] corrected loot table for grass crop drops

---
 .../de/jottyfan/quickiemod/Quickiemod.java    | 17 ++++----
 .../loot_table/chests/seeds_in_chest.json     | 40 -------------------
 2 files changed, 9 insertions(+), 48 deletions(-)
 delete mode 100644 src/main/resources/data/quickiemod/loot_table/chests/seeds_in_chest.json

diff --git a/src/main/java/de/jottyfan/quickiemod/Quickiemod.java b/src/main/java/de/jottyfan/quickiemod/Quickiemod.java
index 8f7e491..c719053 100644
--- a/src/main/java/de/jottyfan/quickiemod/Quickiemod.java
+++ b/src/main/java/de/jottyfan/quickiemod/Quickiemod.java
@@ -16,12 +16,11 @@ import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents;
 import net.fabricmc.fabric.api.loot.v3.LootTableEvents;
 import net.fabricmc.fabric.api.registry.CompostingChanceRegistry;
 import net.minecraft.block.Block;
-import net.minecraft.block.Blocks;
 import net.minecraft.item.Item;
+import net.minecraft.item.Items;
 import net.minecraft.loot.LootPool;
 import net.minecraft.loot.condition.SurvivesExplosionLootCondition;
 import net.minecraft.loot.entry.ItemEntry;
-import net.minecraft.loot.entry.LeafEntry.Builder;
 
 /**
  *
@@ -40,15 +39,17 @@ public class Quickiemod implements ModInitializer {
 	}
 
 	private void registerLootTableChanges() {
-		// does not work yet right
 		LootTableEvents.MODIFY.register((key, tableBuilder, source, registries) -> {
 			if (source.isBuiltin()) {
-				if (Blocks.SHORT_GRASS.getLootTableKey().get().getRegistry().equals(key.getRegistry())) {
-					tableBuilder.pool(LootPool.builder().with(ItemEntry.builder(ModItems.ITEM_COTTONSEED))
+				if ("minecraft:blocks/short_grass".equals(key.getValue().toString())) {
+					tableBuilder.pool(LootPool.builder()
+							.with(ItemEntry.builder(ModItems.ITEM_COTTONSEED).weight(1))
+							.with(ItemEntry.builder(Items.AIR).weight(4))
 							.conditionally(SurvivesExplosionLootCondition.builder()));
-				}
-				if (Blocks.TALL_GRASS.getLootTableKey().get().getRegistry().equals(key.getRegistry())) {
-					tableBuilder.pool(LootPool.builder().with(ItemEntry.builder(ModItems.ITEM_CANOLASEED))
+				} else if ("minecraft:blocks/tall_grass".equals(key.getValue().toString())) {
+					tableBuilder.pool(LootPool.builder()
+							.with(ItemEntry.builder(ModItems.ITEM_CANOLASEED).weight(1))
+							.with(ItemEntry.builder(Items.AIR).weight(7))
 							.conditionally(SurvivesExplosionLootCondition.builder()));
 				}
 			}
diff --git a/src/main/resources/data/quickiemod/loot_table/chests/seeds_in_chest.json b/src/main/resources/data/quickiemod/loot_table/chests/seeds_in_chest.json
deleted file mode 100644
index 1772dfe..0000000
--- a/src/main/resources/data/quickiemod/loot_table/chests/seeds_in_chest.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "type": "minecraft:chest",
-  "pools": [
-    {
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:item",
-          "functions": [
-            {
-              "add": false,
-              "count": {
-                "type": "minecraft:uniform",
-                "max": 9.0,
-                "min": 1.0
-              },
-              "function": "minecraft:set_count"
-            }
-          ],
-          "name": "quickiemod:canolaseed"
-        },
-        {
-          "type": "minecraft:item",
-          "functions": [
-            {
-              "add": false,
-              "count": {
-                "type": "minecraft:uniform",
-                "max": 9.0,
-                "min": 1.0
-              },
-              "function": "minecraft:set_count"
-            }
-          ],
-          "name": "quickiemod:cottonseed"
-        }
-      ]
-    }
-  ]
-}