From cf7da8e7c6a67068cd41faeeaae71aa7e782fcdb Mon Sep 17 00:00:00 2001
From: patience <nearmisses@protonmail.com>
Date: Thu, 4 Sep 2025 23:28:05 +0100
Subject: [PATCH] Altered portal and test villager data

---
 .../loot_tables/blocks/ancient_debris.json    | 92 +++++++++----------
 .../loot_tables/chests/ruined_portal.json     | 82 ++++-------------
 .../villager/professions/farmer.json          | 24 +++++
 3 files changed, 84 insertions(+), 114 deletions(-)
 create mode 100644 data/minecraft/villager/professions/farmer.json

diff --git a/data/minecraft/loot_tables/blocks/ancient_debris.json b/data/minecraft/loot_tables/blocks/ancient_debris.json
index c1b1230..e6980ee 100644
--- a/data/minecraft/loot_tables/blocks/ancient_debris.json
+++ b/data/minecraft/loot_tables/blocks/ancient_debris.json
@@ -1,51 +1,47 @@
 {
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "bonus_rolls": 0.0,
-      "entries": [
-        {
-          "type": "minecraft:alternatives",
-          "children": [
-            {
-              "type": "minecraft:item",
-              "conditions": [
-                {
-                  "condition": "minecraft:match_tool",
-                  "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
-                        }
-                      }
-                    ]
-                  }
-                }
-              ],
-              "name": "minecraft:ancient_debris"
-            },
-            {
-              "type": "minecraft:item",
-              "functions": [
-                {
-                  "enchantment": "minecraft:fortune",
-                  "formula": "minecraft:ore_drops",
-                  "function": "minecraft:apply_bonus"
-                },
-                {
-                  "function": "minecraft:explosion_decay"
-                }
-              ],
-              "name": "minecraft:netherite_scrap"
-            }
-          ]
-        }
-      ],
-      "rolls": 1.0
-    }
-  ],
-  "random_sequence": "minecraft:blocks/ancient_debris"
+	"type": "minecraft:block",
+	"pools": [
+		{
+			"bonus_rolls": 0.0,
+			"entries": [
+				{
+					"type": "minecraft:alternatives",
+					"children": [
+						{
+							"type": "minecraft:item",
+							"conditions": [
+								{
+									"condition": "minecraft:match_tool",
+									"predicate": {
+										"enchantments": [
+											{
+												"enchantment": "minecraft:silk_touch",
+												"levels": {"min": 1}
+											}
+										]
+									}
+								}
+							],
+							"name": "minecraft:ancient_debris"
+						},
+						{
+							"type": "minecraft:item",
+							"functions": [
+								{
+									"enchantment": "minecraft:fortune",
+									"formula": "minecraft:ore_drops",
+									"function": "minecraft:apply_bonus"
+								},
+								{"function": "minecraft:explosion_decay"}
+							],
+							"name": "minecraft:netherite_scrap"
+						}
+					]
+				}
+			],
+			"rolls": 1.0
+		}
+	],
+	"random_sequence": "minecraft:blocks/ancient_debris"
 }
 
diff --git a/data/minecraft/loot_tables/chests/ruined_portal.json b/data/minecraft/loot_tables/chests/ruined_portal.json
index 01739a6..3971712 100644
--- a/data/minecraft/loot_tables/chests/ruined_portal.json
+++ b/data/minecraft/loot_tables/chests/ruined_portal.json
@@ -64,93 +64,48 @@
 				},
 				{
 					"type": "minecraft:item",
-					"functions": [
-						{
-							"function": "minecraft:enchant_randomly"
-						}
-					],
-					"name": "minecraft:stone_sword",
-					"weight": 15
+					"functions": [{"function": "minecraft:enchant_randomly"}],
+					"name": "paxelsfordummies:wooden_paxel",
+					"weight": 35
 				},
 				{
 					"type": "minecraft:item",
-					"functions": [
-						{
-							"function": "minecraft:enchant_randomly"
-						}
-					],
 					"name": "minecraft:stone_axe",
 					"weight": 15
 				},
 				{
 					"type": "minecraft:item",
-					"functions": [
-						{
-							"function": "minecraft:enchant_randomly"
-						}
-					],
 					"name": "minecraft:stone_hoe",
 					"weight": 15
 				},
 				{
 					"type": "minecraft:item",
-					"functions": [
-						{
-							"function": "minecraft:enchant_randomly"
-						}
-					],
 					"name": "minecraft:stone_shovel",
 					"weight": 15
 				},
 				{
 					"type": "minecraft:item",
-					"functions": [
-						{
-							"function": "minecraft:enchant_randomly"
-						}
-					],
-					"name": "minecraft:wooden_pickaxe",
-					"weight": 15
-				},
-				{
-					"type": "minecraft:item",
-					"functions": [
-						{
-							"function": "minecraft:enchant_randomly"
-						}
-					],
+					"functions": [{"function": "minecraft:enchant_randomly"}],
 					"name": "minecraft:leather_boots",
-					"weight": 15
+					"weight": 5
 				},
 				{
 					"type": "minecraft:item",
-					"functions": [
-						{
-							"function": "minecraft:enchant_randomly"
-						}
-					],
+					"functions": [{"function": "minecraft:enchant_randomly"}],
 					"name": "minecraft:leather_chestplate",
-					"weight": 15
+					"weight": 5
 				},
 				{
 					"type": "minecraft:item",
-					"functions": [
-						{
-							"function": "minecraft:enchant_randomly"
-						}
-					],
+					"functions": [{"function": "minecraft:enchant_randomly"}],
 					"name": "minecraft:leather_helmet",
-					"weight": 15
+					"weight": 5
 				},
 				{
 					"type": "minecraft:item",
-					"functions": [
-						{
-							"function": "minecraft:enchant_randomly"
-						}
-					],
+					"functions": [{"function": "minecraft:enchant_randomly"}],
 					"name": "minecraft:leather_leggings",
-					"weight": 15
+					"weight": 5
 				},
 				{
 					"type": "minecraft:item",
@@ -166,12 +121,12 @@
 						}
 					],
 					"name": "minecraft:glistering_melon_slice",
-					"weight": 5
+					"weight": 15
 				},
 				{
 					"type": "minecraft:item",
 					"name": "minecraft:leather_horse_armor",
-					"weight": 5
+					"weight": 15
 				},
 				{
 					"type": "minecraft:item",
@@ -187,12 +142,7 @@
 						}
 					],
 					"name": "minecraft:golden_carrot",
-					"weight": 5
-				},
-				{
-					"type": "minecraft:item",
-					"name": "minecraft:clock",
-					"weight": 5
+					"weight": 15
 				},
 				{
 					"type": "minecraft:item",
@@ -221,8 +171,8 @@
 							"add": false,
 							"count": {
 								"type": "minecraft:uniform",
-								"max": 2,
-								"min": 1
+								"max": 11,
+								"min": 4
 							},
 							"function": "minecraft:set_count"
 						}
diff --git a/data/minecraft/villager/professions/farmer.json b/data/minecraft/villager/professions/farmer.json
new file mode 100644
index 0000000..cd45592
--- /dev/null
+++ b/data/minecraft/villager/professions/farmer.json
@@ -0,0 +1,24 @@
+{
+	"levels": {
+		"1": {
+			"take": {
+				"type": "constant",
+				"value": 2
+			},
+			"trades": [
+				{
+					"sells": {"item": "emerald","count": 1},
+					"wants": [{"item": "golden_carrot","count":3}]
+				},
+				{
+					"sells": {"item": "cake","count": 1},
+					"wants": [{"item": "emerald","count":3}]
+				},
+				{
+					"sells": {"item": "glistering_melon_slice","count": 8},
+					"wants": [{"item": "emerald"}]
+				}
+			]
+		}
+	}
+}