Fix university in 1.21 (#10142)

Fixes the research window not opening at all in 1.21. Sorts the Item NBT datagen keys so that they stop swapping around each datagen. Breaking: modifies the research data format to use SizedIngredient rather than our own hand-rolled types, producing simpler code and JSON.
ldtteam · Aug 20, 2024 · f97fb99 · f97fb99
1 parent 179c19a
commit f97fb99
Show file tree

Hide file tree

Showing 222 changed files with 1,600 additions and 2,848 deletions.
diff --git a/src/datagen/generated/minecolonies/data/minecolonies/compatibility/itemnbtmatching.json b/src/datagen/generated/minecolonies/data/minecolonies/compatibility/itemnbtmatching.json
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,13 +9,10 @@
   "parentResearch": "minecolonies:civilian/reflective",
   "requirements": [
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:book"
-        ]
-      },
-      "quantity": 128
+      "items": {
+        "count": 128,
+        "item": "minecraft:book"
+      }
     }
   ],
   "researchLevel": 6,

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/agile.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/agile.json
@@ -13,13 +13,10 @@
       "level": 4
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:rabbit_foot"
-        ]
-      },
-      "quantity": 10
+      "items": {
+        "count": 10,
+        "item": "minecraft:rabbit_foot"
+      }
     }
   ],
   "researchLevel": 4,

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,13 +9,10 @@
   "parentResearch": "minecolonies:civilian/ambition",
   "requirements": [
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:heart_of_the_sea"
-        ]
-      },
-      "quantity": 1
+      "items": {
+        "count": 1,
+        "item": "minecraft:heart_of_the_sea"
+      }
     }
   ],
   "researchLevel": 2,

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,13 +8,10 @@
   "icon": "minecolonies:blockhutmysticalsite",
   "requirements": [
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:diamond"
-        ]
-      },
-      "quantity": 1
+      "items": {
+        "count": 1,
+        "item": "minecraft:diamond"
+      }
     }
   ],
   "researchLevel": 1,

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,13 +9,10 @@
   "parentResearch": "minecolonies:civilian/swift",
   "requirements": [
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:rabbit_foot"
-        ]
-      },
-      "quantity": 64
+      "items": {
+        "count": 64,
+        "item": "minecraft:rabbit_foot"
+      }
     }
   ],
   "researchLevel": 6,

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bachelor.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bachelor.json
@@ -13,13 +13,10 @@
       "level": 3
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:bookshelf"
-        ]
-      },
-      "quantity": 12
+      "items": {
+        "count": 12,
+        "item": "minecraft:bookshelf"
+      }
     }
   ],
   "researchLevel": 4,

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bandages.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bandages.json
@@ -13,13 +13,10 @@
       "level": 4
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:golden_carrot"
-        ]
-      },
-      "quantity": 16
+      "items": {
+        "count": 16,
+        "item": "minecraft:golden_carrot"
+      }
     }
   ],
   "researchLevel": 4

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bandaid.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bandaid.json
@@ -13,13 +13,10 @@
       "level": 2
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:golden_carrot"
-        ]
-      },
-      "quantity": 1
+      "items": {
+        "count": 1,
+        "item": "minecraft:golden_carrot"
+      }
     }
   ],
   "researchLevel": 2

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,13 +9,10 @@
   "parentResearch": "minecolonies:civilian/growth",
   "requirements": [
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:cooked_chicken"
-        ]
-      },
-      "quantity": 512
+      "items": {
+        "count": 512,
+        "item": "minecraft:cooked_chicken"
+      }
     }
   ],
   "researchLevel": 6,

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bookworm.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bookworm.json
@@ -13,13 +13,10 @@
       "level": 3
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:bookshelf"
-        ]
-      },
-      "quantity": 6
+      "items": {
+        "count": 6,
+        "item": "minecraft:bookshelf"
+      }
     }
   ],
   "researchLevel": 3,

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,13 +9,10 @@
   "parentResearch": "minecolonies:civilian/compress",
   "requirements": [
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:golden_carrot"
-        ]
-      },
-      "quantity": 64
+      "items": {
+        "count": 64,
+        "item": "minecraft:golden_carrot"
+      }
     }
   ],
   "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
@@ -13,13 +13,10 @@
       "level": 2
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:cake"
-        ]
-      },
-      "quantity": 1
+      "items": {
+        "count": 1,
+        "item": "minecraft:cake"
+      }
     }
   ],
   "researchLevel": 2,

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/city.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/city.json
@@ -13,13 +13,10 @@
       "level": 5
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:cooked_beef"
-        ]
-      },
-      "quantity": 512
+      "items": {
+        "count": 512,
+        "item": "minecraft:cooked_beef"
+      }
     }
   ],
   "researchLevel": 5

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/compress.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/compress.json
@@ -13,13 +13,10 @@
       "level": 5
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:golden_carrot"
-        ]
-      },
-      "quantity": 32
+      "items": {
+        "count": 32,
+        "item": "minecraft:golden_carrot"
+      }
     }
   ],
   "researchLevel": 5

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/diligent.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/diligent.json
@@ -13,13 +13,10 @@
       "level": 2
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:book"
-        ]
-      },
-      "quantity": 6
+      "items": {
+        "count": 6,
+        "item": "minecraft:book"
+      }
     }
   ],
   "researchLevel": 2,

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/epicure.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/epicure.json
@@ -13,13 +13,10 @@
       "level": 5
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:cookie"
-        ]
-      },
-      "quantity": 256
+      "items": {
+        "count": 256,
+        "item": "minecraft:cookie"
+      }
     }
   ],
   "researchLevel": 5

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/festival.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/festival.json
@@ -13,13 +13,10 @@
       "level": 3
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:cake"
-        ]
-      },
-      "quantity": 9
+      "items": {
+        "count": 9,
+        "item": "minecraft:cake"
+      }
     }
   ],
   "researchLevel": 3,

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/firstaid.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/firstaid.json
@@ -12,13 +12,10 @@
       "level": 1
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:hay_block"
-        ]
-      },
-      "quantity": 8
+      "items": {
+        "count": 8,
+        "item": "minecraft:hay_block"
+      }
     }
   ],
   "researchLevel": 1,

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/firstaid2.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/firstaid2.json
@@ -13,13 +13,10 @@
       "level": 2
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:hay_block"
-        ]
-      },
-      "quantity": 16
+      "items": {
+        "count": 16,
+        "item": "minecraft:hay_block"
+      }
     }
   ],
   "researchLevel": 2,

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/fortitude.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/fortitude.json
@@ -13,13 +13,10 @@
       "level": 5
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:golden_apple"
-        ]
-      },
-      "quantity": 32
+      "items": {
+        "count": 32,
+        "item": "minecraft:golden_apple"
+      }
     }
   ],
   "researchLevel": 5

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/glutton.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/glutton.json
@@ -9,13 +9,10 @@
   "parentResearch": "minecolonies:civilian/epicure",
   "requirements": [
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:cookie"
-        ]
-      },
-      "quantity": 512
+      "items": {
+        "count": 512,
+        "item": "minecraft:cookie"
+      }
     }
   ],
   "researchLevel": 6,

diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gorger.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gorger.json
@@ -13,13 +13,10 @@
       "level": 3
     },
     {
-      "type": "minecolonies:item_list",
-      "item": {
-        "items": [
-          "minecraft:cookie"
-        ]
-      },
-      "quantity": 64
+      "items": {
+        "count": 64,
+        "item": "minecraft:cookie"
+      }
     }
   ],
   "researchLevel": 3,