Skip to content

Commit 60f0d0b

Browse files
committed
Improve research parsing code
1 parent 439d192 commit 60f0d0b

253 files changed

Lines changed: 3431 additions & 3276 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"branch": "minecolonies:civilian",
33
"effects": [
44
{
5-
"minecolonies:effects/levelingmultiplier": 5
5+
"id": "minecolonies:effects/levelingmultiplier",
6+
"level": 5
67
}
78
],
89
"icon": "minecraft:experience_bottle:5",
910
"parentResearch": "minecolonies:civilian/reflective",
1011
"requirements": [
1112
{
12-
"items": {
13-
"count": 128,
14-
"item": "minecraft:book"
15-
}
13+
"type": "minecolonies:item_simple",
14+
"item": "minecraft:book",
15+
"quantity": 128
1616
}
1717
],
1818
"researchLevel": 6,

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22
"branch": "minecolonies:civilian",
33
"effects": [
44
{
5-
"minecolonies:effects/walkingmultiplier": 2
5+
"id": "minecolonies:effects/walkingmultiplier",
6+
"level": 2
67
}
78
],
89
"icon": "minecolonies:textures/icons/research/speed2.png",
910
"parentResearch": "minecolonies:civilian/nimble",
1011
"requirements": [
1112
{
13+
"type": "minecolonies:building",
1214
"building": "townhall",
1315
"level": 4
1416
},
1517
{
16-
"items": {
17-
"count": 10,
18-
"item": "minecraft:rabbit_foot"
19-
}
18+
"type": "minecolonies:item_simple",
19+
"item": "minecraft:rabbit_foot",
20+
"quantity": 10
2021
}
2122
],
2223
"researchLevel": 4,

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"branch": "minecolonies:civilian",
33
"effects": [
44
{
5-
"minecolonies:effects/air": 1
5+
"id": "minecolonies:effects/air",
6+
"level": 1
67
}
78
],
89
"icon": "minecraft:potion",
910
"parentResearch": "minecolonies:civilian/ambition",
1011
"requirements": [
1112
{
12-
"items": {
13-
"count": 1,
14-
"item": "minecraft:heart_of_the_sea"
15-
}
13+
"type": "minecolonies:item_simple",
14+
"item": "minecraft:heart_of_the_sea",
15+
"quantity": 1
1616
}
1717
],
1818
"researchLevel": 2,

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
"branch": "minecolonies:civilian",
33
"effects": [
44
{
5-
"minecolonies:effects/blockhutmysticalsite": 1
5+
"id": "minecolonies:effects/blockhutmysticalsite",
6+
"level": 1
67
}
78
],
89
"icon": "minecolonies:blockhutmysticalsite",
910
"requirements": [
1011
{
11-
"items": {
12-
"count": 1,
13-
"item": "minecraft:diamond"
14-
}
12+
"type": "minecolonies:item_simple",
13+
"item": "minecraft:diamond",
14+
"quantity": 1
1515
}
1616
],
1717
"researchLevel": 1,

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"branch": "minecolonies:civilian",
33
"effects": [
44
{
5-
"minecolonies:effects/walkingmultiplier": 4
5+
"id": "minecolonies:effects/walkingmultiplier",
6+
"level": 4
67
}
78
],
89
"icon": "minecolonies:textures/icons/research/speed4.png",
910
"parentResearch": "minecolonies:civilian/swift",
1011
"requirements": [
1112
{
12-
"items": {
13-
"count": 64,
14-
"item": "minecraft:rabbit_foot"
15-
}
13+
"type": "minecolonies:item_simple",
14+
"item": "minecraft:rabbit_foot",
15+
"quantity": 64
1616
}
1717
],
1818
"researchLevel": 6,

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22
"branch": "minecolonies:civilian",
33
"effects": [
44
{
5-
"minecolonies:effects/teachingmultiplier": 3
5+
"id": "minecolonies:effects/teachingmultiplier",
6+
"level": 3
67
}
78
],
89
"icon": "minecolonies:textures/icons/research/xpgain3.png",
910
"parentResearch": "minecolonies:civilian/bookworm",
1011
"requirements": [
1112
{
13+
"type": "minecolonies:building",
1214
"building": "library",
1315
"level": 3
1416
},
1517
{
16-
"items": {
17-
"count": 12,
18-
"item": "minecraft:bookshelf"
19-
}
18+
"type": "minecolonies:item_simple",
19+
"item": "minecraft:bookshelf",
20+
"quantity": 12
2021
}
2122
],
2223
"researchLevel": 4,

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22
"branch": "minecolonies:civilian",
33
"effects": [
44
{
5-
"minecolonies:effects/regenerationmultiplier": 3
5+
"id": "minecolonies:effects/regenerationmultiplier",
6+
"level": 3
67
}
78
],
89
"icon": "minecolonies:textures/icons/research/regeneration3.png",
910
"parentResearch": "minecolonies:civilian/healingcream",
1011
"requirements": [
1112
{
13+
"type": "minecolonies:building",
1214
"building": "library",
1315
"level": 4
1416
},
1517
{
16-
"items": {
17-
"count": 16,
18-
"item": "minecraft:golden_carrot"
19-
}
18+
"type": "minecolonies:item_simple",
19+
"item": "minecraft:golden_carrot",
20+
"quantity": 16
2021
}
2122
],
2223
"researchLevel": 4

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22
"branch": "minecolonies:civilian",
33
"effects": [
44
{
5-
"minecolonies:effects/regenerationmultiplier": 1
5+
"id": "minecolonies:effects/regenerationmultiplier",
6+
"level": 1
67
}
78
],
89
"icon": "minecolonies:textures/icons/research/regeneration1.png",
910
"parentResearch": "minecolonies:civilian/stamina",
1011
"requirements": [
1112
{
13+
"type": "minecolonies:building",
1214
"building": "library",
1315
"level": 2
1416
},
1517
{
16-
"items": {
17-
"count": 1,
18-
"item": "minecraft:golden_carrot"
19-
}
18+
"type": "minecolonies:item_simple",
19+
"item": "minecraft:golden_carrot",
20+
"quantity": 1
2021
}
2122
],
2223
"researchLevel": 2

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"branch": "minecolonies:civilian",
33
"effects": [
44
{
5-
"minecolonies:effects/growthmultiplier": 5
5+
"id": "minecolonies:effects/growthmultiplier",
6+
"level": 5
67
}
78
],
89
"icon": "minecolonies:textures/icons/research/childgrowth5.png",
910
"parentResearch": "minecolonies:civilian/growth",
1011
"requirements": [
1112
{
12-
"items": {
13-
"count": 512,
14-
"item": "minecraft:cooked_chicken"
15-
}
13+
"type": "minecolonies:item_simple",
14+
"item": "minecraft:cooked_chicken",
15+
"quantity": 512
1616
}
1717
],
1818
"researchLevel": 6,

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22
"branch": "minecolonies:civilian",
33
"effects": [
44
{
5-
"minecolonies:effects/teachingmultiplier": 2
5+
"id": "minecolonies:effects/teachingmultiplier",
6+
"level": 2
67
}
78
],
89
"icon": "minecolonies:textures/icons/research/xpgain2.png",
910
"parentResearch": "minecolonies:civilian/morebooks",
1011
"requirements": [
1112
{
13+
"type": "minecolonies:building",
1214
"building": "school",
1315
"level": 3
1416
},
1517
{
16-
"items": {
17-
"count": 6,
18-
"item": "minecraft:bookshelf"
19-
}
18+
"type": "minecolonies:item_simple",
19+
"item": "minecraft:bookshelf",
20+
"quantity": 6
2021
}
2122
],
2223
"researchLevel": 3,

0 commit comments

Comments
 (0)