Merge branch 'version/1.21' into cleanup-item-utils

ldtteam · Nov 27, 2024 · c5c6ca6 · c5c6ca6
2 parents 405743d + 914b3be
commit c5c6ca6
Show file tree

Hide file tree

Showing 62 changed files with 823 additions and 477 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -28,7 +28,7 @@ minecraft_range=[1.21, 1.22)
 
 dataGeneratorsVersion=1.20.4-0.1.57-ALPHA
 blockUI_version=1.0.192-1.21.1-snapshot
-structurize_version=1.0.754-1.21.1-snapshot
+structurize_version=1.0.755-1.21.1-snapshot
 domumOrnamentumVersion=1.0.204-1.21.1-snapshot
 multiPistonVersion=1.2.51-1.21.1-snapshot
 

diff --git a/src/datagen/generated/minecolonies/data/c/tags/item/foods.json b/src/datagen/generated/minecolonies/data/c/tags/item/foods.json
@@ -1,8 +1,63 @@
 {
   "values": [
-    "minecolonies:milky_bread",
-    "minecolonies:sugary_bread",
-    "minecolonies:golden_bread",
-    "minecolonies:chorus_bread"
+    "minecolonies:cheddar_cheese",
+    "minecolonies:feta_cheese",
+    "minecolonies:cooked_rice",
+    "minecolonies:tofu",
+    "minecolonies:flatbread",
+    "minecolonies:cheese_ravioli",
+    "minecolonies:chicken_broth",
+    "minecolonies:meat_ravioli",
+    "minecolonies:mint_jelly",
+    "minecolonies:mint_tea",
+    "minecolonies:polenta",
+    "minecolonies:potato_soup",
+    "minecolonies:veggie_ravioli",
+    "minecolonies:yogurt",
+    "minecolonies:squash_soup",
+    "minecolonies:pea_soup",
+    "minecolonies:corn_chowder",
+    "minecolonies:tortillas",
+    "minecolonies:spicy_grilled_chicken",
+    "minecolonies:manchet_bread",
+    "minecolonies:lembas_scone",
+    "minecolonies:muffin",
+    "minecolonies:pottage",
+    "minecolonies:pasta_plain",
+    "minecolonies:apple_pie",
+    "minecolonies:plain_cheesecake",
+    "minecolonies:baked_salmon",
+    "minecolonies:eggdrop_soup",
+    "minecolonies:fish_n_chips",
+    "minecolonies:pierogi",
+    "minecolonies:veggie_soup",
+    "minecolonies:yogurt_with_berries",
+    "minecolonies:cabochis",
+    "minecolonies:veggie_quiche",
+    "minecolonies:rice_ball",
+    "minecolonies:mutton_dinner",
+    "minecolonies:pasta_tomato",
+    "minecolonies:cheese_pizza",
+    "minecolonies:pepper_hummus",
+    "minecolonies:kebab",
+    "minecolonies:congee",
+    "minecolonies:kimchi",
+    "minecolonies:hand_pie",
+    "minecolonies:mintchoco_cheesecake",
+    "minecolonies:borscht",
+    "minecolonies:schnitzel",
+    "minecolonies:steak_dinner",
+    "minecolonies:lamb_stew",
+    "minecolonies:fish_dinner",
+    "minecolonies:sushi_roll",
+    "minecolonies:ramen",
+    "minecolonies:eggplant_dolma",
+    "minecolonies:stuffed_pita",
+    "minecolonies:mushroom_pizza",
+    "minecolonies:pita_hummus",
+    "minecolonies:spicy_eggplant",
+    "minecolonies:stew_trencher",
+    "minecolonies:stuffed_pepper",
+    "minecolonies:tacos"
   ]
 }
diff --git a/src/datagen/generated/minecolonies/data/c/tags/item/foods/bread.json b/src/datagen/generated/minecolonies/data/c/tags/item/foods/bread.json
@@ -3,6 +3,13 @@
     "minecolonies:milky_bread",
     "minecolonies:sugary_bread",
     "minecolonies:golden_bread",
-    "minecolonies:chorus_bread"
+    "minecolonies:chorus_bread",
+    "minecolonies:flatbread",
+    "minecolonies:hand_pie",
+    "minecolonies:lembas_scone",
+    "minecolonies:manchet_bread",
+    "minecolonies:muffin",
+    "minecolonies:stew_trencher",
+    "minecolonies:stuffed_pita"
   ]
 }
diff --git a/src/datagen/generated/minecolonies/data/c/tags/item/foods/candy.json b/src/datagen/generated/minecolonies/data/c/tags/item/foods/candy.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "minecolonies:hand_pie",
+    "minecolonies:muffin"
+  ]
+}
diff --git a/src/datagen/generated/minecolonies/data/c/tags/item/foods/cooked_meat.json b/src/datagen/generated/minecolonies/data/c/tags/item/foods/cooked_meat.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecolonies:lamb_stew"
+  ]
+}
diff --git a/src/datagen/generated/minecolonies/data/c/tags/item/foods/soup.json b/src/datagen/generated/minecolonies/data/c/tags/item/foods/soup.json
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "minecolonies:cabochis",
+    "minecolonies:lamb_stew",
+    "minecolonies:pottage"
+  ]
+}
diff --git a/src/datagen/generated/minecolonies/data/c/tags/item/foods/vegetable.json b/src/datagen/generated/minecolonies/data/c/tags/item/foods/vegetable.json
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "minecolonies:cabochis",
+    "minecolonies:eggplant_dolma",
+    "minecolonies:pottage",
+    "minecolonies:stuffed_pepper",
+    "minecolonies:stuffed_pita"
+  ]
+}
diff --git a/...gen/generated/minecolonies/data/minecolonies/loot_table/loot_tables/miner/lucky_ore1.json b/...gen/generated/minecolonies/data/minecolonies/loot_table/loot_tables/miner/lucky_ore1.json
@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:coal_ore",
+          "weight": 64
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:copper_ore",
+          "weight": 48
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "minecolonies:loot_tables/miner/lucky_ore1"
+}
diff --git a/...gen/generated/minecolonies/data/minecolonies/loot_table/loot_tables/miner/lucky_ore2.json b/...gen/generated/minecolonies/data/minecolonies/loot_table/loot_tables/miner/lucky_ore2.json
@@ -0,0 +1,32 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:coal_ore",
+          "weight": 64
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:copper_ore",
+          "weight": 48
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:iron_ore",
+          "weight": 32
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:gold_ore",
+          "weight": 16
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "minecolonies:loot_tables/miner/lucky_ore2"
+}
diff --git a/...gen/generated/minecolonies/data/minecolonies/loot_table/loot_tables/miner/lucky_ore3.json b/...gen/generated/minecolonies/data/minecolonies/loot_table/loot_tables/miner/lucky_ore3.json
@@ -0,0 +1,42 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:coal_ore",
+          "weight": 64
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:copper_ore",
+          "weight": 48
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:iron_ore",
+          "weight": 32
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:gold_ore",
+          "weight": 16
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:redstone_ore",
+          "weight": 8
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:lapis_ore",
+          "weight": 4
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "minecolonies:loot_tables/miner/lucky_ore3"
+}
diff --git a/...gen/generated/minecolonies/data/minecolonies/loot_table/loot_tables/miner/lucky_ore4.json b/...gen/generated/minecolonies/data/minecolonies/loot_table/loot_tables/miner/lucky_ore4.json
@@ -0,0 +1,51 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:coal_ore",
+          "weight": 64
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:copper_ore",
+          "weight": 48
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:iron_ore",
+          "weight": 32
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:gold_ore",
+          "weight": 16
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:redstone_ore",
+          "weight": 8
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:lapis_ore",
+          "weight": 4
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:diamond_ore",
+          "weight": 2
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:emerald_ore"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "minecolonies:loot_tables/miner/lucky_ore4"
+}
diff --git a/...gen/generated/minecolonies/data/minecolonies/loot_table/loot_tables/miner/lucky_ore5.json b/...gen/generated/minecolonies/data/minecolonies/loot_table/loot_tables/miner/lucky_ore5.json
@@ -0,0 +1,51 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:coal_ore",
+          "weight": 64
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:copper_ore",
+          "weight": 48
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:iron_ore",
+          "weight": 32
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:gold_ore",
+          "weight": 16
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:redstone_ore",
+          "weight": 8
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:lapis_ore",
+          "weight": 4
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:diamond_ore",
+          "weight": 2
+        },
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:emerald_ore"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "minecolonies:loot_tables/miner/lucky_ore5"
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/tags/block/protectionexception.json b/src/datagen/generated/minecolonies/data/minecolonies/tags/block/protectionexception.json
@@ -1,15 +1,7 @@
 {
   "values": [
     {
-      "id": "waystones:waystone",
-      "required": false
-    },
-    {
-      "id": "waystones:sandy_waystone",
-      "required": false
-    },
-    {
-      "id": "waystones:mossy_waystone",
+      "id": "#waystones:waystones",
       "required": false
     }
   ]

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/tags/block/tree.json b/src/datagen/generated/minecolonies/data/minecolonies/tags/block/tree.json
@@ -2,6 +2,10 @@
   "values": [
     "#minecraft:logs",
     "#minecolonies:mangrove_tree",
-    "minecraft:mushroom_stem"
+    "minecraft:mushroom_stem",
+    {
+      "id": "#productivebees:nests/wood_nests",
+      "required": false
+    }
   ]
 }
diff --git a/src/main/java/com/minecolonies/api/colony/ICitizenData.java b/src/main/java/com/minecolonies/api/colony/ICitizenData.java
@@ -4,10 +4,7 @@
 import com.minecolonies.api.colony.jobs.IJob;
 import com.minecolonies.api.entity.citizen.AbstractEntityCitizen;
 import com.minecolonies.api.entity.citizen.VisibleCitizenStatus;
-import com.minecolonies.api.entity.citizen.citizenhandlers.ICitizenFoodHandler;
-import com.minecolonies.api.entity.citizen.citizenhandlers.ICitizenHappinessHandler;
-import com.minecolonies.api.entity.citizen.citizenhandlers.ICitizenMournHandler;
-import com.minecolonies.api.entity.citizen.citizenhandlers.ICitizenSkillHandler;
+import com.minecolonies.api.entity.citizen.citizenhandlers.*;
 import com.minecolonies.api.quests.IQuestGiver;
 import com.minecolonies.api.quests.IQuestParticipant;
 import com.minecolonies.api.util.Tuple;
@@ -18,7 +15,10 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.List;
+import java.util.Optional;
+import java.util.Random;
+import java.util.UUID;
 
 public interface ICitizenData extends ICivilianData, IQuestGiver, IQuestParticipant
 {
@@ -151,6 +151,8 @@ public interface ICitizenData extends ICivilianData, IQuestGiver, IQuestParticip
      */
     ICitizenSkillHandler getCitizenSkillHandler();
 
+    ICitizenDiseaseHandler getCitizenDiseaseHandler();
+
     /**
      * Schedule restart and cleanup.
      *