Merge branch 'version/main' into fix/cookery_holding_bottles

# Conflicts: # src/main/java/com/minecolonies/core/entity/ai/workers/service/EntityAIWorkDeliveryman.java
ldtteam · Dec 24, 2024 · e37842a · e37842a
2 parents ab4bafa + 7c1f25e
commit e37842a
Show file tree

Hide file tree

Showing 570 changed files with 6,390 additions and 5,081 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -31,7 +31,7 @@ mappingsVersion=1.20.1
 
 dataGeneratorsVersion=1.19.3-0.1.54-ALPHA
 blockUI_version=1.20.1-1.0.139-BETA
-structurize_version=1.20.1-1.0.740-BETA
+structurize_version=1.20.1-1.0.759-snapshot
 domumOrnamentumVersion=1.20.1-1.0.184-BETA
 multiPistonVersion=1.20-1.2.30-ALPHA
 
@@ -93,6 +93,6 @@ usesSonarQube=true
 
 usesCrowdInTranslationManagement=true
 crowdInDownloadDirectory=src/main/resources/assets/minecolonies/lang
-usesCrowdInUploadWithFilteredBranchesSpec=(version|release)\/.+
+usesCrowdInUploadWithFilteredBranchesSpec=(version|release)\/1\.21
 
 additionalModsInDataGen=structurize;domum_ornamentum
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campamazon.json b/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campamazon.json
@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "entity.minecolonies.campamazon",
+  "scaling": "always"
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campamazonchief.json b/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campamazonchief.json
@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "entity.minecolonies.campamazonchief",
+  "scaling": "always"
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campamazonspearman.json b/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campamazonspearman.json
@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "entity.minecolonies.campamazonspearman",
+  "scaling": "always"
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/damage_type/camparcherbarbarian.json b/src/datagen/generated/minecolonies/data/minecolonies/damage_type/camparcherbarbarian.json
@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "entity.minecolonies.camparcherbarbarian",
+  "scaling": "always"
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/damage_type/camparchermummy.json b/src/datagen/generated/minecolonies/data/minecolonies/damage_type/camparchermummy.json
@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "entity.minecolonies.camparchermummy",
+  "scaling": "always"
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/damage_type/camparcherpirate.json b/src/datagen/generated/minecolonies/data/minecolonies/damage_type/camparcherpirate.json
@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "entity.minecolonies.camparcherpirate",
+  "scaling": "always"
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campbarbarian.json b/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campbarbarian.json
@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "entity.minecolonies.campbarbarian",
+  "scaling": "always"
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campchiefpirate.json b/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campchiefpirate.json
@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "entity.minecolonies.campchiefpirate",
+  "scaling": "always"
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campmummy.json b/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campmummy.json
@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "entity.minecolonies.campmummy",
+  "scaling": "always"
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campnorsemenarcher.json b/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campnorsemenarcher.json
@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "entity.minecolonies.campnorsemenarcher",
+  "scaling": "always"
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campnorsemenchief.json b/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campnorsemenchief.json
@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "entity.minecolonies.campnorsemenchief",
+  "scaling": "always"
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/damage_type/camppharao.json b/src/datagen/generated/minecolonies/data/minecolonies/damage_type/camppharao.json
@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "entity.minecolonies.camppharao",
+  "scaling": "always"
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/damage_type/camppirate.json b/src/datagen/generated/minecolonies/data/minecolonies/damage_type/camppirate.json
@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "entity.minecolonies.camppirate",
+  "scaling": "always"
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campshieldmaiden.json b/src/datagen/generated/minecolonies/data/minecolonies/damage_type/campshieldmaiden.json
@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "entity.minecolonies.campshieldmaiden",
+  "scaling": "always"
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/damage_type/ccamphiefbarbarian.json b/src/datagen/generated/minecolonies/data/minecolonies/damage_type/ccamphiefbarbarian.json
@@ -0,0 +1,5 @@
+{
+  "exhaustion": 0.1,
+  "message_id": "entity.minecolonies.campchiefbarbarian",
+  "scaling": "always"
+}
diff --git a/..._tables/loot_tables/miner/lucky_ore1.json → ...olonies/loot_tables/miner/lucky_ore1.json b/..._tables/loot_tables/miner/lucky_ore1.json → ...olonies/loot_tables/miner/lucky_ore1.json
@@ -17,5 +17,5 @@
       "rolls": 1.0
     }
   ],
-  "random_sequence": "minecolonies:loot_tables/miner/lucky_ore1"
+  "random_sequence": "minecolonies:miner/lucky_ore1"
 }
diff --git a/..._tables/loot_tables/miner/lucky_ore2.json → ...olonies/loot_tables/miner/lucky_ore2.json b/..._tables/loot_tables/miner/lucky_ore2.json → ...olonies/loot_tables/miner/lucky_ore2.json
@@ -27,5 +27,5 @@
       "rolls": 1.0
     }
   ],
-  "random_sequence": "minecolonies:loot_tables/miner/lucky_ore2"
+  "random_sequence": "minecolonies:miner/lucky_ore2"
 }
diff --git a/..._tables/loot_tables/miner/lucky_ore3.json → ...olonies/loot_tables/miner/lucky_ore3.json b/..._tables/loot_tables/miner/lucky_ore3.json → ...olonies/loot_tables/miner/lucky_ore3.json
@@ -37,5 +37,5 @@
       "rolls": 1.0
     }
   ],
-  "random_sequence": "minecolonies:loot_tables/miner/lucky_ore3"
+  "random_sequence": "minecolonies:miner/lucky_ore3"
 }
diff --git a/..._tables/loot_tables/miner/lucky_ore4.json → ...olonies/loot_tables/miner/lucky_ore4.json b/..._tables/loot_tables/miner/lucky_ore4.json → ...olonies/loot_tables/miner/lucky_ore4.json
@@ -46,5 +46,5 @@
       "rolls": 1.0
     }
   ],
-  "random_sequence": "minecolonies:loot_tables/miner/lucky_ore4"
+  "random_sequence": "minecolonies:miner/lucky_ore4"
 }
diff --git a/..._tables/loot_tables/miner/lucky_ore5.json → ...olonies/loot_tables/miner/lucky_ore5.json b/..._tables/loot_tables/miner/lucky_ore5.json → ...olonies/loot_tables/miner/lucky_ore5.json
@@ -46,5 +46,5 @@
       "rolls": 1.0
     }
   ],
-  "random_sequence": "minecolonies:loot_tables/miner/lucky_ore5"
+  "random_sequence": "minecolonies:miner/lucky_ore5"
 }
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/academic.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/academic.json
@@ -9,15 +9,11 @@
   "parentResearch": "minecolonies:civilian/reflective",
   "requirements": [
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:book"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:book",
       "quantity": 128
     }
   ],
   "researchLevel": 6,
   "subtitle": "com.minecolonies.research.civilian.academic.subtitle"
-}
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/agile.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/agile.json
@@ -9,16 +9,13 @@
   "parentResearch": "minecolonies:civilian/nimble",
   "requirements": [
     {
+      "type": "minecolonies:building",
       "building": "townhall",
       "level": 4
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:rabbit_foot"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:rabbit_foot",
       "quantity": 10
     }
   ],

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/air.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/air.json
@@ -9,15 +9,11 @@
   "parentResearch": "minecolonies:civilian/ambition",
   "requirements": [
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:heart_of_the_sea"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:heart_of_the_sea",
       "quantity": 1
     }
   ],
   "researchLevel": 2,
   "sortOrder": 1
-}
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/ambition.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/ambition.json
@@ -8,15 +8,11 @@
   "icon": "minecolonies:blockhutmysticalsite",
   "requirements": [
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:diamond"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:diamond",
       "quantity": 1
     }
   ],
   "researchLevel": 1,
   "sortOrder": 5
-}
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/athlete.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/athlete.json
@@ -9,15 +9,11 @@
   "parentResearch": "minecolonies:civilian/swift",
   "requirements": [
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:rabbit_foot"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:rabbit_foot",
       "quantity": 64
     }
   ],
   "researchLevel": 6,
   "subtitle": "com.minecolonies.research.civilian.athlete.subtitle"
-}
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bachelor.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bachelor.json
@@ -9,16 +9,13 @@
   "parentResearch": "minecolonies:civilian/bookworm",
   "requirements": [
     {
+      "type": "minecolonies:building",
       "building": "library",
       "level": 3
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:bookshelf"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:bookshelf",
       "quantity": 12
     }
   ],

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bandages.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bandages.json
@@ -9,16 +9,13 @@
   "parentResearch": "minecolonies:civilian/healingcream",
   "requirements": [
     {
+      "type": "minecolonies:building",
       "building": "library",
       "level": 4
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:golden_carrot"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:golden_carrot",
       "quantity": 16
     }
   ],

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bandaid.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bandaid.json
@@ -9,16 +9,13 @@
   "parentResearch": "minecolonies:civilian/stamina",
   "requirements": [
     {
+      "type": "minecolonies:building",
       "building": "library",
       "level": 2
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:golden_carrot"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:golden_carrot",
       "quantity": 1
     }
   ],

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/beanstalk.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/beanstalk.json
@@ -9,15 +9,11 @@
   "parentResearch": "minecolonies:civilian/growth",
   "requirements": [
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:cooked_chicken"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:cooked_chicken",
       "quantity": 512
     }
   ],
   "researchLevel": 6,
   "subtitle": "com.minecolonies.research.civilian.beanstalk.subtitle"
-}
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bookworm.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bookworm.json
@@ -9,16 +9,13 @@
   "parentResearch": "minecolonies:civilian/morebooks",
   "requirements": [
     {
+      "type": "minecolonies:building",
       "building": "school",
       "level": 3
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:bookshelf"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:bookshelf",
       "quantity": 6
     }
   ],

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/cast.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/cast.json
@@ -9,14 +9,10 @@
   "parentResearch": "minecolonies:civilian/compress",
   "requirements": [
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:golden_carrot"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:golden_carrot",
       "quantity": 64
     }
   ],
   "researchLevel": 6
-}
+}