Mark item costs to actually be a singular item, not an item list, giv…

…e building requirements explicit types (for the wiki) (#10507) Changed the generation from item costs lists to simple items (unintentional reuse of functions inside the research provider) Make sure that building requirements have a type This is quick and dirty generation code which has no effect on runtime, I need this to better generate data for the wiki
ldtteam · Dec 5, 2024 · 53ccec7 · 53ccec7
1 parent f2b2311
commit 53ccec7
Show file tree

Hide file tree

Showing 202 changed files with 642 additions and 1,324 deletions.
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
-}
+}
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/circus.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/circus.json
@@ -9,16 +9,13 @@
   "parentResearch": "minecolonies:civilian/firstaid",
   "requirements": [
     {
+      "type": "minecolonies:building",
       "building": "cook",
       "level": 2
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:cake"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:cake",
       "quantity": 1
     }
   ],

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/city.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/city.json
@@ -9,16 +9,13 @@
   "parentResearch": "minecolonies:civilian/village",
   "requirements": [
     {
+      "type": "minecolonies:building",
       "building": "townhall",
       "level": 5
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:cooked_beef"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:cooked_beef",
       "quantity": 512
     }
   ],

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

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

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/epicure.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/epicure.json
@@ -9,16 +9,13 @@
   "parentResearch": "minecolonies:civilian/stuffer",
   "requirements": [
     {
+      "type": "minecolonies:building",
       "building": "cook",
       "level": 5
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:cookie"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:cookie",
       "quantity": 256
     }
   ],

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/festival.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/festival.json
@@ -9,16 +9,13 @@
   "parentResearch": "minecolonies:civilian/circus",
   "requirements": [
     {
+      "type": "minecolonies:building",
       "building": "cook",
       "level": 3
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:cake"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:cake",
       "quantity": 9
     }
   ],

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/firstaid.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/firstaid.json
@@ -8,16 +8,13 @@
   "icon": "minecolonies:textures/icons/research/hp1.png",
   "requirements": [
     {
+      "type": "minecolonies:building",
       "building": "townhall",
       "level": 1
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:hay_block"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:hay_block",
       "quantity": 8
     }
   ],

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

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/fortitude.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/fortitude.json
@@ -9,16 +9,13 @@
   "parentResearch": "minecolonies:civilian/vitality",
   "requirements": [
     {
+      "type": "minecolonies:building",
       "building": "cook",
       "level": 5
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:golden_apple"
-        ]
-      },
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:golden_apple",
       "quantity": 32
     }
   ],