Improve research parsing code

gradle.properties

@@ -30,7 +30,7 @@ mappingsChannel=official
 mappingsVersion=1.20.1
 
 dataGeneratorsVersion=1.19.3-0.1.54-ALPHA
-blockUI_version=1.20.1-1.0.187-BETA
+blockUI_version=1.20.1-1.0.187-snapshot
 structurize_version=1.20.1-1.0.765-snapshot
 domumOrnamentumVersion=1.20.1-1.0.184-BETA
 multiPistonVersion=1.20-1.2.30-ALPHA

src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/academic.json

@@ -1,19 +1,20 @@
 {
   "branch": "minecolonies:civilian",
-  "effects": [
-    {
-      "minecolonies:effects/levelingmultiplier": 5
-    }
-  ],
-  "icon": "minecraft:experience_bottle:5",
-  "parentResearch": "minecolonies:civilian/reflective",
-  "requirements": [
+  "costs": [
     {
       "type": "minecolonies:item_simple",
       "item": "minecraft:book",
       "quantity": 128
     }
   ],
+  "effects": [
+    {
+      "id": "minecolonies:effects/levelingmultiplier",
+      "level": 5
+    }
+  ],
+  "icon": "minecraft:experience_bottle:5",
+  "parentResearch": "minecolonies:civilian/reflective",
   "researchLevel": 6,
   "subtitle": "com.minecolonies.research.civilian.academic.subtitle"
-}
+}

src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/agile.json

@@ -1,8 +1,16 @@
 {
   "branch": "minecolonies:civilian",
+  "costs": [
+    {
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:rabbit_foot",
+      "quantity": 8
+    }
+  ],
   "effects": [
     {
-      "minecolonies:effects/walkingmultiplier": 3
+      "id": "minecolonies:effects/walkingmultiplier",
+      "level": 3
     }
   ],
   "icon": "minecolonies:textures/icons/research/speed2.png",
@@ -12,11 +20,6 @@
       "type": "minecolonies:building",
       "building": "townhall",
       "level": 4
-    },
-    {
-      "type": "minecolonies:item_simple",
-      "item": "minecraft:rabbit_foot",
-      "quantity": 8
     }
   ],
   "researchLevel": 4,

src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/air.json

@@ -1,19 +1,20 @@
 {
   "branch": "minecolonies:civilian",
-  "effects": [
-    {
-      "minecolonies:effects/air": 1
-    }
-  ],
-  "icon": "minecraft:potion",
-  "parentResearch": "minecolonies:civilian/ambition",
-  "requirements": [
+  "costs": [
     {
       "type": "minecolonies:item_simple",
       "item": "minecraft:heart_of_the_sea",
       "quantity": 1
     }
   ],
+  "effects": [
+    {
+      "id": "minecolonies:effects/air",
+      "level": 1
+    }
+  ],
+  "icon": "minecraft:potion",
+  "parentResearch": "minecolonies:civilian/ambition",
   "researchLevel": 2,
   "sortOrder": 1
-}
+}

src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/ambition.json

@@ -1,18 +1,19 @@
 {
   "branch": "minecolonies:civilian",
-  "effects": [
-    {
-      "minecolonies:effects/blockhutmysticalsite": 1
-    }
-  ],
-  "icon": "minecolonies:blockhutmysticalsite",
-  "requirements": [
+  "costs": [
     {
       "type": "minecolonies:item_simple",
       "item": "minecraft:diamond",
       "quantity": 1
     }
   ],
+  "effects": [
+    {
+      "id": "minecolonies:effects/blockhutmysticalsite",
+      "level": 1
+    }
+  ],
+  "icon": "minecolonies:blockhutmysticalsite",
   "researchLevel": 1,
   "sortOrder": 5
-}
+}

src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/athlete.json

@@ -1,19 +1,20 @@
 {
   "branch": "minecolonies:civilian",
-  "effects": [
-    {
-      "minecolonies:effects/walkingmultiplier": 5
-    }
-  ],
-  "icon": "minecolonies:textures/icons/research/speed4.png",
-  "parentResearch": "minecolonies:civilian/swift",
-  "requirements": [
+  "costs": [
     {
       "type": "minecolonies:item_simple",
       "item": "minecraft:rabbit_foot",
       "quantity": 64
     }
   ],
+  "effects": [
+    {
+      "id": "minecolonies:effects/walkingmultiplier",
+      "level": 5
+    }
+  ],
+  "icon": "minecolonies:textures/icons/research/speed4.png",
+  "parentResearch": "minecolonies:civilian/swift",
   "researchLevel": 6,
   "subtitle": "com.minecolonies.research.civilian.athlete.subtitle"
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bachelor.json

@@ -1,8 +1,16 @@
 {
   "branch": "minecolonies:civilian",
+  "costs": [
+    {
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:bookshelf",
+      "quantity": 12
+    }
+  ],
   "effects": [
     {
-      "minecolonies:effects/teachingmultiplier": 3
+      "id": "minecolonies:effects/teachingmultiplier",
+      "level": 3
     }
   ],
   "icon": "minecolonies:textures/icons/research/xpgain3.png",
@@ -12,11 +20,6 @@
       "type": "minecolonies:building",
       "building": "library",
       "level": 3
-    },
-    {
-      "type": "minecolonies:item_simple",
-      "item": "minecraft:bookshelf",
-      "quantity": 12
     }
   ],
   "researchLevel": 4,

src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bandages.json

@@ -1,8 +1,16 @@
 {
   "branch": "minecolonies:civilian",
+  "costs": [
+    {
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:golden_carrot",
+      "quantity": 16
+    }
+  ],
   "effects": [
     {
-      "minecolonies:effects/regenerationmultiplier": 3
+      "id": "minecolonies:effects/regenerationmultiplier",
+      "level": 3
     }
   ],
   "icon": "minecolonies:textures/icons/research/regeneration3.png",
@@ -12,11 +20,6 @@
       "type": "minecolonies:building",
       "building": "library",
       "level": 4
-    },
-    {
-      "type": "minecolonies:item_simple",
-      "item": "minecraft:golden_carrot",
-      "quantity": 16
     }
   ],
   "researchLevel": 4

src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bandaid.json

@@ -1,8 +1,16 @@
 {
   "branch": "minecolonies:civilian",
+  "costs": [
+    {
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:golden_carrot",
+      "quantity": 1
+    }
+  ],
   "effects": [
     {
-      "minecolonies:effects/regenerationmultiplier": 1
+      "id": "minecolonies:effects/regenerationmultiplier",
+      "level": 1
     }
   ],
   "icon": "minecolonies:textures/icons/research/regeneration1.png",
@@ -12,11 +20,6 @@
       "type": "minecolonies:building",
       "building": "library",
       "level": 2
-    },
-    {
-      "type": "minecolonies:item_simple",
-      "item": "minecraft:golden_carrot",
-      "quantity": 1
     }
   ],
   "researchLevel": 2

src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/beanstalk.json

@@ -1,19 +1,20 @@
 {
   "branch": "minecolonies:civilian",
-  "effects": [
-    {
-      "minecolonies:effects/growthmultiplier": 5
-    }
-  ],
-  "icon": "minecolonies:textures/icons/research/childgrowth5.png",
-  "parentResearch": "minecolonies:civilian/growth",
-  "requirements": [
+  "costs": [
     {
       "type": "minecolonies:item_simple",
       "item": "minecraft:cooked_chicken",
       "quantity": 512
     }
   ],
+  "effects": [
+    {
+      "id": "minecolonies:effects/growthmultiplier",
+      "level": 5
+    }
+  ],
+  "icon": "minecolonies:textures/icons/research/childgrowth5.png",
+  "parentResearch": "minecolonies:civilian/growth",
   "researchLevel": 6,
   "subtitle": "com.minecolonies.research.civilian.beanstalk.subtitle"
-}
+}

src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bookworm.json

@@ -1,8 +1,16 @@
 {
   "branch": "minecolonies:civilian",
+  "costs": [
+    {
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:bookshelf",
+      "quantity": 6
+    }
+  ],
   "effects": [
     {
-      "minecolonies:effects/teachingmultiplier": 2
+      "id": "minecolonies:effects/teachingmultiplier",
+      "level": 2
     }
   ],
   "icon": "minecolonies:textures/icons/research/xpgain2.png",
@@ -12,11 +20,6 @@
       "type": "minecolonies:building",
       "building": "school",
       "level": 3
-    },
-    {
-      "type": "minecolonies:item_simple",
-      "item": "minecraft:bookshelf",
-      "quantity": 6
     }
   ],
   "researchLevel": 3,

src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/cast.json

@@ -1,18 +1,19 @@
 {
   "branch": "minecolonies:civilian",
-  "effects": [
-    {
-      "minecolonies:effects/regenerationmultiplier": 5
-    }
-  ],
-  "icon": "minecolonies:textures/icons/research/regeneration5.png",
-  "parentResearch": "minecolonies:civilian/compress",
-  "requirements": [
+  "costs": [
     {
       "type": "minecolonies:item_simple",
       "item": "minecraft:golden_carrot",
       "quantity": 64
     }
   ],
+  "effects": [
+    {
+      "id": "minecolonies:effects/regenerationmultiplier",
+      "level": 5
+    }
+  ],
+  "icon": "minecolonies:textures/icons/research/regeneration5.png",
+  "parentResearch": "minecolonies:civilian/compress",
   "researchLevel": 6
-}
+}

src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/circus.json

@@ -1,8 +1,16 @@
 {
   "branch": "minecolonies:civilian",
+  "costs": [
+    {
+      "type": "minecolonies:item_simple",
+      "item": "minecraft:cake",
+      "quantity": 1
+    }
+  ],
   "effects": [
     {
-      "minecolonies:effects/happinessmultiplier": 1
+      "id": "minecolonies:effects/happinessmultiplier",
+      "level": 1
     }
   ],
   "icon": "minecolonies:textures/icons/research/happy1.png",
@@ -12,11 +20,6 @@
       "type": "minecolonies:building",
       "building": "cook",
       "level": 2
-    },
-    {
-      "type": "minecolonies:item_simple",
-      "item": "minecraft:cake",
-      "quantity": 1
     }
   ],
   "researchLevel": 2,