From 53ccec723f3a6ccedc6408abb431bb69208be085 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Thu, 5 Dec 2024 21:09:41 +0100 Subject: [PATCH] Mark item costs to actually be a singular item, not an item list, give 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 --- .../researches/civilian/academic.json | 10 +++---- .../researches/civilian/agile.json | 9 +++---- .../minecolonies/researches/civilian/air.json | 10 +++---- .../researches/civilian/ambition.json | 10 +++---- .../researches/civilian/athlete.json | 10 +++---- .../researches/civilian/bachelor.json | 9 +++---- .../researches/civilian/bandages.json | 9 +++---- .../researches/civilian/bandaid.json | 9 +++---- .../researches/civilian/beanstalk.json | 10 +++---- .../researches/civilian/bookworm.json | 9 +++---- .../researches/civilian/cast.json | 10 +++---- .../researches/civilian/circus.json | 9 +++---- .../researches/civilian/city.json | 9 +++---- .../researches/civilian/compress.json | 9 +++---- .../researches/civilian/diligent.json | 9 +++---- .../researches/civilian/epicure.json | 9 +++---- .../researches/civilian/festival.json | 9 +++---- .../researches/civilian/firstaid.json | 9 +++---- .../researches/civilian/firstaid2.json | 9 +++---- .../researches/civilian/fortitude.json | 9 +++---- .../researches/civilian/glutton.json | 10 +++---- .../researches/civilian/gorger.json | 9 +++---- .../researches/civilian/gourmand.json | 9 +++---- .../researches/civilian/gravedecaybonus1.json | 9 +++---- .../researches/civilian/gravedecaybonus2.json | 9 +++---- .../researches/civilian/growth.json | 9 +++---- .../researches/civilian/guardianangel.json | 9 +++---- .../researches/civilian/guardianangel2.json | 10 +++---- .../researches/civilian/hamlet.json | 9 +++---- .../researches/civilian/healingcream.json | 9 +++---- .../researches/civilian/higherlearning.json | 9 +++---- .../researches/civilian/hormones.json | 9 +++---- .../researches/civilian/indefatigability.json | 10 +++---- .../researches/civilian/keen.json | 9 +++---- .../researches/civilian/lifesaver.json | 9 +++---- .../researches/civilian/lifesaver2.json | 9 +++---- .../researches/civilian/masks.json | 9 +++---- .../researches/civilian/master.json | 9 +++---- .../minecolonies/researches/civilian/moq.json | 17 ++++-------- .../researches/civilian/morebooks.json | 9 +++---- .../researches/civilian/nightowl.json | 9 +++---- .../researches/civilian/nightowl2.json | 9 +++---- .../researches/civilian/nimble.json | 9 +++---- .../researches/civilian/nurture.json | 9 +++---- .../researches/civilian/opera.json | 9 +++---- .../researches/civilian/outpost.json | 9 +++---- .../minecolonies/researches/civilian/phd.json | 10 +++---- .../researches/civilian/puberty.json | 9 +++---- .../researches/civilian/rails.json | 9 +++---- .../researches/civilian/raisingthedead.json | 9 +++---- .../researches/civilian/reflective.json | 9 +++---- .../researches/civilian/remembrance.json | 9 +++---- .../researches/civilian/resilience.json | 9 +++---- .../researches/civilian/resistance.json | 9 +++---- .../researches/civilian/resurrectchance1.json | 9 +++---- .../researches/civilian/resurrectchance2.json | 9 +++---- .../researches/civilian/scholarly.json | 9 +++---- .../researches/civilian/spectacle.json | 9 +++---- .../researches/civilian/stamina.json | 10 +++---- .../researches/civilian/studious.json | 9 +++---- .../researches/civilian/stuffer.json | 9 +++---- .../researches/civilian/swift.json | 9 +++---- .../researches/civilian/theater.json | 10 +++---- .../civilian/undertakeremergency.json | 9 +++---- .../researches/civilian/vaccines.json | 9 +++---- .../researches/civilian/village.json | 9 +++---- .../researches/civilian/vines.json | 9 +++---- .../researches/civilian/vitality.json | 9 +++---- .../researches/combat/accuracy.json | 9 +++---- .../researches/combat/agilearcher.json | 10 +++---- .../researches/combat/arrowpierce.json | 17 ++++-------- .../researches/combat/arrowuse.json | 9 +++---- .../minecolonies/researches/combat/avoid.json | 9 +++---- .../researches/combat/avoidance.json | 9 +++---- .../researches/combat/boiledleather.json | 9 +++---- .../researches/combat/captainoftheguard.json | 10 +++---- .../researches/combat/captaintraining.json | 9 +++---- .../researches/combat/cleave.json | 9 +++---- .../researches/combat/coffee.json | 10 +++---- .../researches/combat/deadlyaim.json | 10 +++---- .../researches/combat/diamondskin.json | 10 +++---- .../minecolonies/researches/combat/dodge.json | 9 +++---- .../researches/combat/druidpotion.json | 9 +++---- .../researches/combat/duelist.json | 9 +++---- .../minecolonies/researches/combat/evade.json | 9 +++---- .../researches/combat/evasion.json | 9 +++---- .../minecolonies/researches/combat/fear.json | 9 +++---- .../minecolonies/researches/combat/feint.json | 9 +++---- .../minecolonies/researches/combat/flee.json | 9 +++---- .../researches/combat/fullretreat.json | 10 +++---- .../researches/combat/hotfoot.json | 10 +++---- .../researches/combat/improvedbows.json | 9 +++---- .../researches/combat/improveddodge.json | 9 +++---- .../researches/combat/improvedevasion.json | 9 +++---- .../researches/combat/improvedleather.json | 9 +++---- .../researches/combat/improvedswords.json | 9 +++---- .../researches/combat/ironarmor.json | 9 +++---- .../researches/combat/ironskin.json | 9 +++---- .../researches/combat/knighttraining.json | 9 +++---- .../researches/combat/masterbowman.json | 10 +++---- .../researches/combat/masterswordsman.json | 10 +++---- .../researches/combat/mightycleave.json | 9 +++---- .../researches/combat/multishot.json | 9 +++---- .../minecolonies/researches/combat/parry.json | 9 +++---- .../researches/combat/penetratingshot.json | 9 +++---- .../researches/combat/piercingshot.json | 9 +++---- .../researches/combat/platearmor.json | 9 +++---- .../researches/combat/powerattack.json | 9 +++---- .../researches/combat/preciseshot.json | 9 +++---- .../researches/combat/provost.json | 9 +++---- .../researches/combat/quickdraw.json | 9 +++---- .../researches/combat/rapidshot.json | 9 +++---- .../researches/combat/regeneration.json | 9 +++---- .../researches/combat/retreat.json | 9 +++---- .../researches/combat/riposte.json | 9 +++---- .../researches/combat/savagestrike.json | 10 +++---- .../researches/combat/squiretraining.json | 9 +++---- .../researches/combat/standard.json | 9 +++---- .../researches/combat/steelarmor.json | 9 +++---- .../researches/combat/tactictraining.json | 9 +++---- .../minecolonies/researches/combat/taunt.json | 25 +++++------------- .../researches/combat/telescope.json | 9 +++---- .../researches/combat/trickshot.json | 9 +++---- .../researches/combat/whirlwind.json | 25 +++++------------- .../researches/combat/woundingshot.json | 9 +++---- .../researches/technology/ability.json | 9 +++---- .../researches/technology/alchemist.json | 10 +++---- .../researches/technology/amazingveins.json | 1 + .../researches/technology/biodegradable.json | 9 +++---- .../researches/technology/bonemeal.json | 9 +++---- .../researches/technology/buildermodes.json | 9 +++---- .../researches/technology/capacity.json | 9 +++---- .../researches/technology/cheatsheet.json | 9 +++---- .../researches/technology/compost.json | 9 +++---- .../researches/technology/croprotation.json | 17 ++++-------- .../researches/technology/deeppockets.json | 9 +++---- .../researches/technology/depthknowledge.json | 9 +++---- .../researches/technology/diamondcoated.json | 10 +++---- .../researches/technology/dung.json | 9 +++---- .../technology/enhanced_gates1.json | 26 +++++-------------- .../technology/enhanced_gates2.json | 26 +++++-------------- .../researches/technology/exoticfruits.json | 9 +++---- .../researches/technology/fertilizer.json | 9 +++---- .../researches/technology/flowerpower.json | 9 +++---- .../researches/technology/fullstock.json | 9 +++---- .../researches/technology/gargamel.json | 18 +++++-------- .../researches/technology/gildedhammer.json | 25 +++++------------- .../researches/technology/goodveins.json | 1 + .../researches/technology/hardened.json | 9 +++---- .../researches/technology/heavilyloaded.json | 10 +++---- .../researches/technology/heavymachinery.json | 10 +++---- .../researches/technology/hittingiron.json | 9 +++---- .../researches/technology/honeypot.json | 9 +++---- .../researches/technology/hot.json | 9 +++---- .../researches/technology/hotboots.json | 17 ++++-------- .../researches/technology/isthisredstone.json | 10 +++---- .../researches/technology/junglemaster.json | 25 +++++------------- .../researches/technology/knowtheend.json | 9 +++---- .../researches/technology/letitgrow.json | 9 +++---- .../researches/technology/lightning.json | 10 +++---- .../researches/technology/loaded.json | 9 +++---- .../researches/technology/madness.json | 10 +++---- .../researches/technology/magiccompost.json | 10 +++---- .../researches/technology/memoryaid.json | 9 +++---- .../researches/technology/morescrolls.json | 25 +++++------------- .../researches/technology/netherlog.json | 17 ++++-------- .../researches/technology/oceanheart.json | 9 +++---- .../researches/technology/opennether.json | 10 +++---- .../researches/technology/pavetheroad.json | 1 + .../researches/technology/podzolchance.json | 9 +++---- .../researches/technology/podzolchance2.json | 9 +++---- .../researches/technology/rainbowheaven.json | 9 +++---- .../researches/technology/rainman.json | 10 +++---- .../researches/technology/recipebook.json | 9 +++---- .../technology/redstonepowered.json | 10 +++---- .../researches/technology/reinforced.json | 9 +++---- .../researches/technology/richveins.json | 1 + .../researches/technology/rockingroll.json | 9 +++---- .../researches/technology/rtm.json | 9 +++---- .../researches/technology/seemsautomatic.json | 9 +++---- .../researches/technology/sieving.json | 9 +++---- .../researches/technology/skills.json | 9 +++---- .../researches/technology/softshoes.json | 18 ++++--------- .../researches/technology/space.json | 9 +++---- .../researches/technology/steelbracing.json | 9 +++---- .../researches/technology/stonecake.json | 9 +++---- .../researches/technology/stringwork.json | 9 +++---- .../researches/technology/strong.json | 9 +++---- .../technology/takingdivinglessons.json | 25 +++++------------- .../researches/technology/theflintstones.json | 9 +++---- .../researches/technology/thoselungs.json | 9 +++---- .../researches/technology/tools.json | 9 +++---- .../researches/technology/veinminer.json | 1 + .../technology/warehousemaster.json | 9 +++---- .../technology/whatisthisspeed.json | 10 +++---- .../researches/technology/whatyaneed.json | 9 +++---- .../researches/technology/woodwork.json | 1 + .../researches/unlockable/diamondmesh.json | 1 + .../researches/unlockable/flintmesh.json | 1 + .../researches/unlockable/ironmesh.json | 1 + .../researches/unlockable/stringmesh.json | 1 + .../research/AbstractResearchProvider.java | 15 ++++++++--- 202 files changed, 642 insertions(+), 1324 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 index 4e9390e2501..3bd1ecaa83b 100644 --- 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" -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/agile.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/agile.json index 27810aeec31..b0379580af7 100644 --- 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 index 25864ef7daf..2b8bd2a9c3e 100644 --- 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 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/ambition.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/ambition.json index da2e16e1f16..88dccc92b9c 100644 --- 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 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/athlete.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/athlete.json index f018816305e..b0cb1e263e9 100644 --- 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" -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bachelor.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bachelor.json index e7838f1a017..00053ff215d 100644 --- 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 index 6cae5266874..0950d54e6db 100644 --- 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 index 05c17f47d85..4333712fe40 100644 --- 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 index 91be7d2844b..409674e2843 100644 --- 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" -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bookworm.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/bookworm.json index a30eae0e66d..77487a1d53d 100644 --- 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 index 030b7978d1f..d0c2fe39663 100644 --- 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 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/circus.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/circus.json index 03ab7ea5955..6fee42fa8e1 100644 --- 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 index 8a20dc2d506..86b80fc0410 100644 --- 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 index aba4d7fe9ae..df94476504c 100644 --- 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 index 26e4154eeaa..1a3f04efd74 100644 --- 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 index 97208609809..8a6a98e5b70 100644 --- 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 index 06dc04a21ae..91b77cbc58a 100644 --- 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 index b2307930526..aefc58e93ef 100644 --- 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 index 87963c43cc4..a7fa246fa18 100644 --- 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 index b4f338bca03..1b0fb958894 100644 --- 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 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/glutton.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/glutton.json index d510c5131b0..11dbdef90bb 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/glutton.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/glutton.json @@ -9,15 +9,11 @@ "parentResearch": "minecolonies:civilian/epicure", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:cookie" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:cookie", "quantity": 512 } ], "researchLevel": 6, "subtitle": "com.minecolonies.research.civilian.glutton.subtitle" -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gorger.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gorger.json index de793a0df00..79f89c65373 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gorger.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gorger.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/gourmand", "requirements": [ { + "type": "minecolonies:building", "building": "cook", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:cookie" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:cookie", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gourmand.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gourmand.json index f5b2f4dbde8..deccb694622 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gourmand.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gourmand.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/firstaid", "requirements": [ { + "type": "minecolonies:building", "building": "cook", "level": 2 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:cookie" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:cookie", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gravedecaybonus1.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gravedecaybonus1.json index 6870a0d0c51..ca4992ee745 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gravedecaybonus1.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gravedecaybonus1.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/remembrance", "requirements": [ { + "type": "minecolonies:building", "building": "graveyard", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:rotten_flesh" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:rotten_flesh", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gravedecaybonus2.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gravedecaybonus2.json index 12c8fbc8b26..8638af20259 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gravedecaybonus2.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/gravedecaybonus2.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/gravedecaybonus1", "requirements": [ { + "type": "minecolonies:building", "building": "graveyard", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:nether_wart_block" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:nether_wart_block", "quantity": 8 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/growth.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/growth.json index 9d0288d5677..17239caab61 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/growth.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/growth.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/puberty", "requirements": [ { + "type": "minecolonies:building", "building": "library", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:cooked_chicken" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:cooked_chicken", "quantity": 256 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/guardianangel.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/guardianangel.json index ca11483d3bf..c337c0ff2cb 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/guardianangel.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/guardianangel.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/lifesaver2", "requirements": [ { + "type": "minecolonies:building", "building": "townhall", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:hay_block" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:hay_block", "quantity": 128 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/guardianangel2.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/guardianangel2.json index f868c472744..5a977d66dca 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/guardianangel2.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/guardianangel2.json @@ -9,14 +9,10 @@ "parentResearch": "minecolonies:civilian/guardianangel", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:hay_block" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:hay_block", "quantity": 256 } ], "researchLevel": 6 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/hamlet.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/hamlet.json index d3e673ffd9f..6f4fff38591 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/hamlet.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/hamlet.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/outpost", "requirements": [ { + "type": "minecolonies:building", "building": "residence", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:cooked_beef" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:cooked_beef", "quantity": 128 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/healingcream.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/healingcream.json index 2656c128321..ed4a151a249 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/healingcream.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/healingcream.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/bandaid", "requirements": [ { + "type": "minecolonies:building", "building": "library", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:golden_carrot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:golden_carrot", "quantity": 8 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/higherlearning.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/higherlearning.json index 8892cd90659..57031300757 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/higherlearning.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/higherlearning.json @@ -9,16 +9,13 @@ "icon": "minecolonies:blockhutschool", "requirements": [ { + "type": "minecolonies:building", "building": "residence", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:book" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:book", "quantity": 3 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/hormones.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/hormones.json index 64e53192633..574595d2b9f 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/hormones.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/hormones.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/nurture", "requirements": [ { + "type": "minecolonies:building", "building": "school", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:cooked_chicken" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:cooked_chicken", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/indefatigability.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/indefatigability.json index bac460f4583..936877d8e0f 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/indefatigability.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/indefatigability.json @@ -9,14 +9,10 @@ "parentResearch": "minecolonies:civilian/fortitude", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:golden_apple" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:golden_apple", "quantity": 64 } ], "researchLevel": 6 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/keen.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/keen.json index e34a51f3505..0fc12f34df7 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/keen.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/keen.json @@ -8,16 +8,13 @@ "icon": "minecolonies:blockhutlibrary", "requirements": [ { + "type": "minecolonies:building", "building": "residence", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:book" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:book", "quantity": 3 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/lifesaver.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/lifesaver.json index ea5e916abd3..d336d943acf 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/lifesaver.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/lifesaver.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/firstaid2", "requirements": [ { + "type": "minecolonies:building", "building": "townhall", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:hay_block" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:hay_block", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/lifesaver2.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/lifesaver2.json index 8f2b0951ecf..3d96a909298 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/lifesaver2.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/lifesaver2.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/lifesaver", "requirements": [ { + "type": "minecolonies:building", "building": "townhall", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:hay_block" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:hay_block", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/masks.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/masks.json index ead4f9eba0d..f918f0b19d4 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/masks.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/masks.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/firstaid2", "requirements": [ { + "type": "minecolonies:building", "building": "library", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:white_wool" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:white_wool", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/master.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/master.json index 8e57cb2661f..f75bba62bc8 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/master.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/master.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/bachelor", "requirements": [ { + "type": "minecolonies:building", "building": "library", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:bookshelf" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:bookshelf", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/moq.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/moq.json index 0a2fdfa594e..1619a8696fd 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/moq.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/moq.json @@ -9,25 +9,18 @@ "parentResearch": "minecolonies:civilian/rails", "requirements": [ { + "type": "minecolonies:building", "building": "deliveryman", "level": 9 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecolonies:clipboard" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecolonies:clipboard", "quantity": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:book" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:book", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/morebooks.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/morebooks.json index 144bff9784a..4feebceb8f0 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/morebooks.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/morebooks.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/higherlearning", "requirements": [ { + "type": "minecolonies:building", "building": "school", "level": 1 }, { - "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/nightowl.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/nightowl.json index 993922c4f9a..76f40509529 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/nightowl.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/nightowl.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/circus", "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": 25 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/nightowl2.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/nightowl2.json index fd89d0a7260..e442568ebaa 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/nightowl2.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/nightowl2.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/nightowl", "requirements": [ { + "type": "minecolonies:building", "building": "townhall", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:golden_carrot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:golden_carrot", "quantity": 75 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/nimble.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/nimble.json index 05f3b9e3cc8..c366cb82a80 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/nimble.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/nimble.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/rails", "requirements": [ { + "type": "minecolonies:building", "building": "townhall", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:rabbit_foot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:rabbit_foot", "quantity": 1 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/nurture.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/nurture.json index 473849fcb79..703a71d0b24 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/nurture.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/nurture.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/higherlearning", "requirements": [ { + "type": "minecolonies:building", "building": "school", "level": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:cooked_chicken" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:cooked_chicken", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/opera.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/opera.json index 84f7aafc04c..88d12079622 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/opera.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/opera.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/spectacle", "requirements": [ { + "type": "minecolonies:building", "building": "cook", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:cake" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:cake", "quantity": 27 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/outpost.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/outpost.json index a756cf644f7..62eb1a5e7b3 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/outpost.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/outpost.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/keen", "requirements": [ { + "type": "minecolonies:building", "building": "residence", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:cooked_beef" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:cooked_beef", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/phd.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/phd.json index fb35a1178d7..ca21f8f7b44 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/phd.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/phd.json @@ -9,15 +9,11 @@ "parentResearch": "minecolonies:civilian/master", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:bookshelf" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:bookshelf", "quantity": 64 } ], "researchLevel": 6, "subtitle": "com.minecolonies.research.civilian.phd.subtitle" -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/puberty.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/puberty.json index 18b9174d600..5a84474589b 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/puberty.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/puberty.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/hormones", "requirements": [ { + "type": "minecolonies:building", "building": "library", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:cooked_chicken" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:cooked_chicken", "quantity": 128 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/rails.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/rails.json index e2b72e89f7d..30990a65f88 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/rails.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/rails.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/keen", "requirements": [ { + "type": "minecolonies:building", "building": "deliveryman", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:rail" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:rail", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/raisingthedead.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/raisingthedead.json index 230c0494670..c3d6eb9d9fe 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/raisingthedead.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/raisingthedead.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/resurrectchance2", "requirements": [ { + "type": "minecolonies:building", "building": "graveyard", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:totem_of_undying" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:totem_of_undying", "quantity": 1 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/reflective.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/reflective.json index f66ce20bf6a..d53f17374b1 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/reflective.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/reflective.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/scholarly", "requirements": [ { + "type": "minecolonies:building", "building": "library", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:book" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:book", "quantity": 48 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/remembrance.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/remembrance.json index 20167ebd78c..5440d8eed3b 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/remembrance.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/remembrance.json @@ -8,16 +8,13 @@ "icon": "minecolonies:blockhutgraveyard", "requirements": [ { + "type": "minecolonies:building", "building": "townhall", "level": 2 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:bone" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:bone", "quantity": 8 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/resilience.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/resilience.json index de940a0bf7a..e4c29f437c0 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/resilience.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/resilience.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/resistance", "requirements": [ { + "type": "minecolonies:building", "building": "cook", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:golden_apple" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:golden_apple", "quantity": 8 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/resistance.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/resistance.json index 62fae31ab20..513a43b6d51 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/resistance.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/resistance.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/stamina", "requirements": [ { + "type": "minecolonies:building", "building": "cook", "level": 2 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:golden_apple" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:golden_apple", "quantity": 1 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/resurrectchance1.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/resurrectchance1.json index 438ff8d1495..1654f1f893c 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/resurrectchance1.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/resurrectchance1.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/remembrance", "requirements": [ { + "type": "minecolonies:building", "building": "graveyard", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:ghast_tear" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:ghast_tear", "quantity": 1 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/resurrectchance2.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/resurrectchance2.json index ee115727d31..37602d6d0b3 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/resurrectchance2.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/resurrectchance2.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/resurrectchance1", "requirements": [ { + "type": "minecolonies:building", "building": "graveyard", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:chorus_fruit" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:chorus_fruit", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/scholarly.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/scholarly.json index a1e8af1feb3..cf1eecea01a 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/scholarly.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/scholarly.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/studious", "requirements": [ { + "type": "minecolonies:building", "building": "library", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:book" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:book", "quantity": 24 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/spectacle.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/spectacle.json index 7c59e372e95..c8121b30572 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/spectacle.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/spectacle.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/festival", "requirements": [ { + "type": "minecolonies:building", "building": "cook", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:cake" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:cake", "quantity": 18 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/stamina.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/stamina.json index 33e5669d9d4..5fdf6f57e6c 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/stamina.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/stamina.json @@ -9,14 +9,10 @@ "icon": "minecolonies:blockhuthospital", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:carrot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:carrot", "quantity": 1 } ], "researchLevel": 1 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/studious.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/studious.json index e761bd3977d..260cc47991c 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/studious.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/studious.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/diligent", "requirements": [ { + "type": "minecolonies:building", "building": "library", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:book" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:book", "quantity": 12 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/stuffer.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/stuffer.json index 966b8f21feb..984b1d6c8f3 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/stuffer.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/stuffer.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/gorger", "requirements": [ { + "type": "minecolonies:building", "building": "cook", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:cookie" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:cookie", "quantity": 128 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/swift.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/swift.json index 51f9ecaafbe..75fb27a681e 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/swift.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/swift.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/agile", "requirements": [ { + "type": "minecolonies:building", "building": "townhall", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:rabbit_foot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:rabbit_foot", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/theater.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/theater.json index d3abf98497a..8caecfbb025 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/theater.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/theater.json @@ -9,15 +9,11 @@ "parentResearch": "minecolonies:civilian/opera", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:enchanted_golden_apple" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:enchanted_golden_apple", "quantity": 16 } ], "researchLevel": 6, "subtitle": "com.minecolonies.research.civilian.theater.subtitle" -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/undertakeremergency.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/undertakeremergency.json index 99ad526256b..9f4c84fa933 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/undertakeremergency.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/undertakeremergency.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/remembrance", "requirements": [ { + "type": "minecolonies:building", "building": "graveyard", "level": 2 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_boots" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_boots", "quantity": 1 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/vaccines.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/vaccines.json index c1adf3c6572..30eb59b0c54 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/vaccines.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/vaccines.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/masks", "requirements": [ { + "type": "minecolonies:building", "building": "hospital", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:egg" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:egg", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/village.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/village.json index d44088854d6..60a1ef03f9f 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/village.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/village.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/hamlet", "requirements": [ { + "type": "minecolonies:building", "building": "townhall", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:cooked_beef" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:cooked_beef", "quantity": 256 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/vines.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/vines.json index 593155d4651..a671866ea39 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/vines.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/vines.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/keen", "requirements": [ { + "type": "minecolonies:building", "building": "residence", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:vine" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:vine", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/vitality.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/vitality.json index 6de9e9945c2..ee418d8101c 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/vitality.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/civilian/vitality.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:civilian/resilience", "requirements": [ { + "type": "minecolonies:building", "building": "cook", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:golden_apple" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:golden_apple", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/accuracy.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/accuracy.json index dc1004e3e78..5bcc88e53eb 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/accuracy.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/accuracy.json @@ -9,16 +9,13 @@ "icon": "minecraft:iron_sword", "requirements": [ { + "type": "minecolonies:building", "building": "guardtower", "level": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_ingot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_ingot", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/agilearcher.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/agilearcher.json index 2c2379c3745..ae341835075 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/agilearcher.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/agilearcher.json @@ -9,15 +9,11 @@ "parentResearch": "minecolonies:combat/improvedevasion", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:diamond" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:diamond", "quantity": 64 } ], "researchLevel": 6, "subtitle": "com.minecolonies.research.combat.agilearcher.subtitle" -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/arrowpierce.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/arrowpierce.json index bc138a3d25a..c12c32a7653 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/arrowpierce.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/arrowpierce.json @@ -9,25 +9,18 @@ "parentResearch": "minecolonies:combat/arrowuse", "requirements": [ { + "type": "minecolonies:building", "building": "archery", "level": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:arrow" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:arrow", "quantity": 64 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:redstone" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:redstone", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/arrowuse.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/arrowuse.json index b63666b5cf8..08cb1a3c90e 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/arrowuse.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/arrowuse.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/taunt", "requirements": [ { + "type": "minecolonies:building", "building": "guardtower", "level": 2 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:arrow" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:arrow", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/avoid.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/avoid.json index 3e013e62c1b..5b4bfc6923b 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/avoid.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/avoid.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/regeneration", "requirements": [ { + "type": "minecolonies:building", "building": "guardtower", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:emerald" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:emerald", "quantity": 8 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/avoidance.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/avoidance.json index c06a3e3bca5..403cb6c9f37 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/avoidance.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/avoidance.json @@ -9,16 +9,13 @@ "icon": "minecraft:shield", "requirements": [ { + "type": "minecolonies:building", "building": "guardtower", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_block" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_block", "quantity": 3 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/boiledleather.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/boiledleather.json index 83aae4e412b..e8f76e2b227 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/boiledleather.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/boiledleather.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/improvedleather", "requirements": [ { + "type": "minecolonies:building", "building": "townhall", "level": 2 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:leather" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:leather", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/captainoftheguard.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/captainoftheguard.json index e00fad6efe3..6a63c6d09ad 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/captainoftheguard.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/captainoftheguard.json @@ -9,14 +9,10 @@ "parentResearch": "minecolonies:combat/captaintraining", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:shield" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:shield", "quantity": 27 } ], "researchLevel": 6 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/captaintraining.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/captaintraining.json index 5d6c0a5d276..2579ab9bf15 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/captaintraining.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/captaintraining.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/knighttraining", "requirements": [ { + "type": "minecolonies:building", "building": "combatacademy", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:shield" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:shield", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/cleave.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/cleave.json index c3e83066289..55f64be0364 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/cleave.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/cleave.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/powerattack", "requirements": [ { + "type": "minecolonies:building", "building": "guardtower", "level": 10 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_block" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_block", "quantity": 8 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/coffee.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/coffee.json index edad25312a1..a0ce62ee88a 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/coffee.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/coffee.json @@ -9,15 +9,11 @@ "parentResearch": "minecolonies:combat/tactictraining", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:golden_carrot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:golden_carrot", "quantity": 4 } ], "researchLevel": 2, "subtitle": "com.minecolonies.research.combat.coffee.subtitle" -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/deadlyaim.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/deadlyaim.json index d81c0875cca..fc6dd61c61a 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/deadlyaim.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/deadlyaim.json @@ -9,15 +9,11 @@ "parentResearch": "minecolonies:combat/woundingshot", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:flint" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:flint", "quantity": 256 } ], "researchLevel": 6, "subtitle": "com.minecolonies.research.combat.deadlyaim.subtitle" -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/diamondskin.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/diamondskin.json index a1dd6649b5b..23fb7caf532 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/diamondskin.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/diamondskin.json @@ -9,14 +9,10 @@ "parentResearch": "minecolonies:combat/steelarmor", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:diamond" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:diamond", "quantity": 64 } ], "researchLevel": 6 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/dodge.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/dodge.json index 11dbbca1f9d..aee6c90ea21 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/dodge.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/dodge.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/avoidance", "requirements": [ { + "type": "minecolonies:building", "building": "smeltery", "level": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:leather" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:leather", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/druidpotion.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/druidpotion.json index 0e08e8f61e3..bcdb9d63e3f 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/druidpotion.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/druidpotion.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/arrowuse", "requirements": [ { + "type": "minecolonies:building", "building": "barracks", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecolonies:mistletoe" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecolonies:mistletoe", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/duelist.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/duelist.json index 6cf0d906844..7efe924f226 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/duelist.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/duelist.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/riposte", "requirements": [ { + "type": "minecolonies:building", "building": "smeltery", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_ingot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_ingot", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/evade.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/evade.json index ea92cddea2e..36072260bf4 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/evade.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/evade.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/avoid", "requirements": [ { + "type": "minecolonies:building", "building": "guardtower", "level": 8 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:emerald" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:emerald", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/evasion.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/evasion.json index 1408c94b051..d61116a1f29 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/evasion.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/evasion.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/improveddodge", "requirements": [ { + "type": "minecolonies:building", "building": "smeltery", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:leather" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:leather", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/fear.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/fear.json index 46230207f94..1fbec21bda0 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/fear.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/fear.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/feint", "requirements": [ { + "type": "minecolonies:building", "building": "guardtower", "level": 8 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:emerald" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:emerald", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/feint.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/feint.json index be14138ea57..d42585a0385 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/feint.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/feint.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/regeneration", "requirements": [ { + "type": "minecolonies:building", "building": "guardtower", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:emerald" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:emerald", "quantity": 8 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/flee.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/flee.json index 4ef6955c1fb..d131ca6ec9b 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/flee.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/flee.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/evade", "requirements": [ { + "type": "minecolonies:building", "building": "guardtower", "level": 12 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:emerald" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:emerald", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/fullretreat.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/fullretreat.json index 43e8a9b55c5..d0ab09697f0 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/fullretreat.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/fullretreat.json @@ -9,14 +9,10 @@ "parentResearch": "minecolonies:combat/retreat", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:emerald" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:emerald", "quantity": 64 } ], "researchLevel": 6 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/hotfoot.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/hotfoot.json index eaa84d4fe60..a3fd9eb72da 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/hotfoot.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/hotfoot.json @@ -9,14 +9,10 @@ "parentResearch": "minecolonies:combat/flee", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:emerald" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:emerald", "quantity": 64 } ], "researchLevel": 6 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improvedbows.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improvedbows.json index bdd5a973522..652f4c2d326 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improvedbows.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improvedbows.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/tactictraining", "requirements": [ { + "type": "minecolonies:building", "building": "barracks", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_block" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_block", "quantity": 6 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improveddodge.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improveddodge.json index df39f68ab53..28c093017ac 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improveddodge.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improveddodge.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/dodge", "requirements": [ { + "type": "minecolonies:building", "building": "archery", "level": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:leather" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:leather", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improvedevasion.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improvedevasion.json index b63bf42dec4..f8a9d03e1a7 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improvedevasion.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improvedevasion.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/evasion", "requirements": [ { + "type": "minecolonies:building", "building": "archery", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:diamond" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:diamond", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improvedleather.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improvedleather.json index 46f084683d8..d544f942b70 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improvedleather.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improvedleather.json @@ -8,16 +8,13 @@ "icon": "minecraft:leather_helmet", "requirements": [ { + "type": "minecolonies:building", "building": "townhall", "level": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:leather" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:leather", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improvedswords.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improvedswords.json index d273b646836..a51be27b4f4 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improvedswords.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/improvedswords.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/tactictraining", "requirements": [ { + "type": "minecolonies:building", "building": "barracks", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_block" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_block", "quantity": 6 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/ironarmor.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/ironarmor.json index a3a602da586..c0e9c9f9db3 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/ironarmor.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/ironarmor.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/ironskin", "requirements": [ { + "type": "minecolonies:building", "building": "townhall", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_ingot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_ingot", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/ironskin.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/ironskin.json index 9c632809b50..4d2e3028cf9 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/ironskin.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/ironskin.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/boiledleather", "requirements": [ { + "type": "minecolonies:building", "building": "townhall", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_ingot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_ingot", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/knighttraining.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/knighttraining.json index 93b6de1142f..86ab5d206af 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/knighttraining.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/knighttraining.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/squiretraining", "requirements": [ { + "type": "minecolonies:building", "building": "combatacademy", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:shield" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:shield", "quantity": 8 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/masterbowman.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/masterbowman.json index 9aac957c029..d7cf9b9bf68 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/masterbowman.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/masterbowman.json @@ -9,14 +9,10 @@ "parentResearch": "minecolonies:combat/rapidshot", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:bow" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:bow", "quantity": 27 } ], "researchLevel": 6 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/masterswordsman.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/masterswordsman.json index 58e061c6b3a..de8a6038c4d 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/masterswordsman.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/masterswordsman.json @@ -9,14 +9,10 @@ "parentResearch": "minecolonies:combat/provost", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:diamond" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:diamond", "quantity": 64 } ], "researchLevel": 6 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/mightycleave.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/mightycleave.json index f5ec993aa79..c777e4c61eb 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/mightycleave.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/mightycleave.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/cleave", "requirements": [ { + "type": "minecolonies:building", "building": "barracks", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_block" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_block", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/multishot.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/multishot.json index c6efa19bc5a..578e9dc9f72 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/multishot.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/multishot.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/trickshot", "requirements": [ { + "type": "minecolonies:building", "building": "archery", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:bow" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:bow", "quantity": 9 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/parry.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/parry.json index 5ea5c8b7169..fad00333131 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/parry.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/parry.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/avoidance", "requirements": [ { + "type": "minecolonies:building", "building": "smeltery", "level": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_ingot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_ingot", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/penetratingshot.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/penetratingshot.json index 9c7b0a1b17e..6fedd091c62 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/penetratingshot.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/penetratingshot.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/preciseshot", "requirements": [ { + "type": "minecolonies:building", "building": "archery", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:flint" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:flint", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/piercingshot.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/piercingshot.json index f24d93fe98b..7dd48f65696 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/piercingshot.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/piercingshot.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/penetratingshot", "requirements": [ { + "type": "minecolonies:building", "building": "guardtower", "level": 10 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:flint" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:flint", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/platearmor.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/platearmor.json index 81698d80d15..8b48488e9ab 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/platearmor.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/platearmor.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/ironarmor", "requirements": [ { + "type": "minecolonies:mandatory-building", "level": 4, "mandatory-building": "blacksmith" }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_ingot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_ingot", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/powerattack.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/powerattack.json index 4406fb5f1c1..bfb2f0ff337 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/powerattack.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/powerattack.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/quickdraw", "requirements": [ { + "type": "minecolonies:building", "building": "combatacademy", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_block" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_block", "quantity": 4 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/preciseshot.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/preciseshot.json index 7617e88c3e3..ebacc3cafea 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/preciseshot.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/preciseshot.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/accuracy", "requirements": [ { + "type": "minecolonies:building", "building": "barracks", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:flint" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:flint", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/provost.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/provost.json index 6df88e211a3..13b64599d3a 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/provost.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/provost.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/duelist", "requirements": [ { + "type": "minecolonies:building", "building": "combatacademy", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:diamond" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:diamond", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/quickdraw.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/quickdraw.json index abdf810d207..f2553fd6fc0 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/quickdraw.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/quickdraw.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/accuracy", "requirements": [ { + "type": "minecolonies:building", "building": "barracks", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_block" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_block", "quantity": 2 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/rapidshot.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/rapidshot.json index a4bf7c3b17f..6e32f8bbeaf 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/rapidshot.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/rapidshot.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/multishot", "requirements": [ { + "type": "minecolonies:building", "building": "archery", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:bow" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:bow", "quantity": 18 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/regeneration.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/regeneration.json index 20ad7b2b0ae..a2682bc3bf2 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/regeneration.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/regeneration.json @@ -10,16 +10,13 @@ "parentResearch": "minecolonies:combat/improvedleather", "requirements": [ { + "type": "minecolonies:building", "building": "guardtower", "level": 2 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:emerald" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:emerald", "quantity": 1 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/retreat.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/retreat.json index 3bd690afdef..408cc0330da 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/retreat.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/retreat.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/fear", "requirements": [ { + "type": "minecolonies:building", "building": "guardtower", "level": 12 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:emerald" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:emerald", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/riposte.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/riposte.json index d3a7167240b..a90d63546e5 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/riposte.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/riposte.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/parry", "requirements": [ { + "type": "minecolonies:building", "building": "combatacademy", "level": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_ingot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_ingot", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/savagestrike.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/savagestrike.json index de53a219999..12be05ab730 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/savagestrike.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/savagestrike.json @@ -9,14 +9,10 @@ "parentResearch": "minecolonies:combat/mightycleave", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_block" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_block", "quantity": 32 } ], "researchLevel": 6 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/squiretraining.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/squiretraining.json index d20b12e5d0d..2d435d1c30c 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/squiretraining.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/squiretraining.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/improvedswords", "requirements": [ { + "type": "minecolonies:building", "building": "combatacademy", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:shield" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:shield", "quantity": 4 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/standard.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/standard.json index 0fb1852a985..6e141d956ab 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/standard.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/standard.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/telescope", "requirements": [ { + "type": "minecolonies:building", "building": "barracks", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:emerald" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:emerald", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/steelarmor.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/steelarmor.json index c1a8519c456..eb1fce2b89c 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/steelarmor.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/steelarmor.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/ironarmor", "requirements": [ { + "type": "minecolonies:building", "building": "townhall", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_ingot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_ingot", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/tactictraining.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/tactictraining.json index 25fb460b37f..faca3e1bd61 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/tactictraining.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/tactictraining.json @@ -8,16 +8,13 @@ "icon": "minecolonies:blockhutbarrackstower", "requirements": [ { + "type": "minecolonies:building", "building": "guardtower", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_block" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_block", "quantity": 3 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/taunt.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/taunt.json index 920e2c62354..917bfed2e6d 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/taunt.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/taunt.json @@ -8,34 +8,23 @@ "icon": "minecraft:chain", "requirements": [ { + "type": "minecolonies:building", "building": "guardtower", "level": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:rotten_flesh" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:rotten_flesh", "quantity": 8 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:bone" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:bone", "quantity": 8 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:spider_eye" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:spider_eye", "quantity": 8 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/telescope.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/telescope.json index f7b5e5423da..4d6b186e677 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/telescope.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/telescope.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/ironskin", "requirements": [ { + "type": "minecolonies:building", "building": "barracks", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:emerald" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:emerald", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/trickshot.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/trickshot.json index ebf85167b2b..085c68a76e1 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/trickshot.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/trickshot.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/improvedbows", "requirements": [ { + "type": "minecolonies:building", "building": "archery", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:bow" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:bow", "quantity": 5 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/whirlwind.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/whirlwind.json index 5383bde89ee..e2d962b7d93 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/whirlwind.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/whirlwind.json @@ -9,34 +9,23 @@ "parentResearch": "minecolonies:combat/arrowpierce", "requirements": [ { + "type": "minecolonies:building", "building": "barracks", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:redstone" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:redstone", "quantity": 64 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:gold_ingot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:gold_ingot", "quantity": 64 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:lapis_lazuli" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:lapis_lazuli", "quantity": 128 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/woundingshot.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/woundingshot.json index e35c5cd52e0..044c4ff1ed2 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/woundingshot.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/combat/woundingshot.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:combat/piercingshot", "requirements": [ { + "type": "minecolonies:building", "building": "barracks", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:flint" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:flint", "quantity": 128 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/ability.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/ability.json index 796a4b8cd46..63b6a1d4df1 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/ability.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/ability.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/hittingiron", "requirements": [ { + "type": "minecolonies:building", "building": "miner", "level": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_ingot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_ingot", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/alchemist.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/alchemist.json index 9163e3cb2ed..426017869fd 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/alchemist.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/alchemist.json @@ -9,15 +9,11 @@ "parentResearch": "minecolonies:technology/opennether", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:nether_wart" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:nether_wart", "quantity": 16 } ], "researchLevel": 3, "subtitle": "com.minecolonies.research.technology.alchemist.subtitle" -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/amazingveins.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/amazingveins.json index 8b75b1840f1..f61d52e19f8 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/amazingveins.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/amazingveins.json @@ -9,6 +9,7 @@ "parentResearch": "minecolonies:technology/richveins", "requirements": [ { + "type": "minecolonies:building", "building": "blacksmith", "level": 5 }, diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/biodegradable.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/biodegradable.json index 8a9c3dd1bee..8a5484a873f 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/biodegradable.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/biodegradable.json @@ -8,16 +8,13 @@ "icon": "minecolonies:blockhutcomposter", "requirements": [ { + "type": "minecolonies:building", "building": "farmer", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:bone_meal" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:bone_meal", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/bonemeal.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/bonemeal.json index 5d9b62ed9a5..b55ed967b6d 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/bonemeal.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/bonemeal.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/biodegradable", "requirements": [ { + "type": "minecolonies:building", "building": "miner", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:wheat_seeds" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:wheat_seeds", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/buildermodes.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/buildermodes.json index 46619590f5a..037fd232a78 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/buildermodes.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/buildermodes.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/memoryaid", "requirements": [ { + "type": "minecolonies:building", "building": "builder", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:diamond_axe" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:diamond_axe", "quantity": 1 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/capacity.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/capacity.json index f1b97642314..84ac5b07f30 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/capacity.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/capacity.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/space", "requirements": [ { + "type": "minecolonies:building", "building": "miner", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecolonies:blockminecoloniesrack" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecolonies:blockminecoloniesrack", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/cheatsheet.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/cheatsheet.json index bad9c44b7d2..110a6dc6ce5 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/cheatsheet.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/cheatsheet.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/memoryaid", "requirements": [ { + "type": "minecolonies:building", "building": "sawmill", "level": 2 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:paper" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:paper", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/compost.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/compost.json index 9dd2fa6b1a7..00acd661371 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/compost.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/compost.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/dung", "requirements": [ { + "type": "minecolonies:building", "building": "miner", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:wheat_seeds" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:wheat_seeds", "quantity": 256 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/croprotation.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/croprotation.json index d5d30e71708..79779607202 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/croprotation.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/croprotation.json @@ -9,25 +9,18 @@ "parentResearch": "minecolonies:technology/letitgrow", "requirements": [ { + "type": "minecolonies:building", "building": "plantation", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:sugar_cane" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:sugar_cane", "quantity": 32 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:cactus" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:cactus", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/deeppockets.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/deeppockets.json index 3db64ba5e2e..130dbb2b4f5 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/deeppockets.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/deeppockets.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/cheatsheet", "requirements": [ { + "type": "minecolonies:building", "building": "library", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:emerald" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:emerald", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/depthknowledge.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/depthknowledge.json index b7b5fc1ac7d..21c62034a70 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/depthknowledge.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/depthknowledge.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/rockingroll", "requirements": [ { + "type": "minecolonies:building", "building": "crusher", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:deepslate" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:deepslate", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/diamondcoated.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/diamondcoated.json index 8c629a4e852..ac49bf3f313 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/diamondcoated.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/diamondcoated.json @@ -9,14 +9,10 @@ "parentResearch": "minecolonies:technology/steelbracing", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:diamond" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:diamond", "quantity": 128 } ], "researchLevel": 6 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/dung.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/dung.json index 428e5a51d53..b6a5acfca53 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/dung.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/dung.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/bonemeal", "requirements": [ { + "type": "minecolonies:building", "building": "miner", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:wheat_seeds" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:wheat_seeds", "quantity": 128 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/enhanced_gates1.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/enhanced_gates1.json index 7b864221201..b289840cf28 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/enhanced_gates1.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/enhanced_gates1.json @@ -9,32 +9,20 @@ "parentResearch": "minecolonies:technology/whatyaneed", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecolonies:gate_wood" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecolonies:gate_wood", "quantity": 64 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecolonies:ancienttome" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecolonies:ancienttome", "quantity": 2 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_block" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_block", "quantity": 5 } ], "researchLevel": 3 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/enhanced_gates2.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/enhanced_gates2.json index 600f606a94f..b2fb592bd00 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/enhanced_gates2.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/enhanced_gates2.json @@ -9,32 +9,20 @@ "parentResearch": "minecolonies:technology/enhanced_gates1", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecolonies:gate_iron" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecolonies:gate_iron", "quantity": 64 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecolonies:ancienttome" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecolonies:ancienttome", "quantity": 2 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:obsidian" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:obsidian", "quantity": 32 } ], "researchLevel": 4 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/exoticfruits.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/exoticfruits.json index 00f62e2ef47..9026a0a5941 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/exoticfruits.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/exoticfruits.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/letitgrow", "requirements": [ { + "type": "minecolonies:building", "building": "plantation", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:glow_berries" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:glow_berries", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/fertilizer.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/fertilizer.json index 55fb3019084..8f2abfd6c92 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/fertilizer.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/fertilizer.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/compost", "requirements": [ { + "type": "minecolonies:building", "building": "smeltery", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:wheat_seeds" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:wheat_seeds", "quantity": 512 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/flowerpower.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/flowerpower.json index dc17c7a54da..7f80bd89ce7 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/flowerpower.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/flowerpower.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/biodegradable", "requirements": [ { + "type": "minecolonies:building", "building": "composter", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecolonies:compost" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecolonies:compost", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/fullstock.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/fullstock.json index 460b91bf194..bcadeb6d5b3 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/fullstock.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/fullstock.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/capacity", "requirements": [ { + "type": "minecolonies:building", "building": "miner", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecolonies:blockminecoloniesrack" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecolonies:blockminecoloniesrack", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/gargamel.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/gargamel.json index cef12af5f3b..80a1233d25c 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/gargamel.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/gargamel.json @@ -9,29 +9,23 @@ "parentResearch": "minecolonies:technology/croprotation", "requirements": [ { + "type": "minecolonies:building", "building": "plantation", "level": 3 }, { + "type": "minecolonies:building", "building": "netherworker", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:crimson_fungus" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:crimson_fungus", "quantity": 16 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:warped_fungus" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:warped_fungus", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/gildedhammer.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/gildedhammer.json index 8a5cf6f0476..aa01492b283 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/gildedhammer.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/gildedhammer.json @@ -9,34 +9,23 @@ "parentResearch": "minecolonies:technology/rockingroll", "requirements": [ { + "type": "minecolonies:building", "building": "crusher", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:gravel" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:gravel", "quantity": 64 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:sand" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:sand", "quantity": 64 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:clay" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:clay", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/goodveins.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/goodveins.json index 5e369290031..7ef773441b0 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/goodveins.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/goodveins.json @@ -9,6 +9,7 @@ "parentResearch": "minecolonies:technology/veinminer", "requirements": [ { + "type": "minecolonies:building", "building": "miner", "level": 2 }, diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/hardened.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/hardened.json index 794e7f23e66..278714b8e61 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/hardened.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/hardened.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/strong", "requirements": [ { + "type": "minecolonies:building", "building": "blacksmith", "level": 2 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:diamond" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:diamond", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/heavilyloaded.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/heavilyloaded.json index 76fc03f6dd4..74ecb384ec3 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/heavilyloaded.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/heavilyloaded.json @@ -10,14 +10,10 @@ "parentResearch": "minecolonies:technology/loaded", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:emerald" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:emerald", "quantity": 256 } ], "researchLevel": 6 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/heavymachinery.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/heavymachinery.json index 2c662502449..9975b7200d1 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/heavymachinery.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/heavymachinery.json @@ -9,14 +9,10 @@ "parentResearch": "minecolonies:technology/redstonepowered", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:redstone" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:redstone", "quantity": 512 } ], "researchLevel": 4 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/hittingiron.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/hittingiron.json index b858aeaa87c..981e5d51ca5 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/hittingiron.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/hittingiron.json @@ -8,16 +8,13 @@ "icon": "minecolonies:blockhutblacksmith", "requirements": [ { + "type": "minecolonies:building", "building": "miner", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:anvil" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:anvil", "quantity": 1 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/honeypot.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/honeypot.json index 03560674fe7..b4b1036110f 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/honeypot.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/honeypot.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/rainbowheaven", "requirements": [ { + "type": "minecolonies:building", "building": "beekeeper", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:beehive" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:beehive", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/hot.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/hot.json index 42a25df4ebd..e55620f0323 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/hot.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/hot.json @@ -8,16 +8,13 @@ "icon": "minecolonies:blockhutsmeltery", "requirements": [ { + "type": "minecolonies:building", "building": "miner", "level": 2 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:lava_bucket" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:lava_bucket", "quantity": 4 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/hotboots.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/hotboots.json index f39cf38861d..ee396f82df0 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/hotboots.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/hotboots.json @@ -9,25 +9,18 @@ "parentResearch": "minecolonies:technology/stringwork", "requirements": [ { + "type": "minecolonies:building", "building": "fletcher", "level": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:leather" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:leather", "quantity": 32 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_ingot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_ingot", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/isthisredstone.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/isthisredstone.json index 82057e59fc7..a3befb9a697 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/isthisredstone.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/isthisredstone.json @@ -9,14 +9,10 @@ "parentResearch": "minecolonies:technology/hot", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:redstone" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:redstone", "quantity": 128 } ], "researchLevel": 2 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/junglemaster.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/junglemaster.json index 8be8504823e..79c8eab007b 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/junglemaster.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/junglemaster.json @@ -9,34 +9,23 @@ "parentResearch": "minecolonies:technology/letitgrow", "requirements": [ { + "type": "minecolonies:building", "building": "plantation", "level": 2 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:bamboo" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:bamboo", "quantity": 16 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:cocoa_beans" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:cocoa_beans", "quantity": 16 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:vine" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:vine", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/knowtheend.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/knowtheend.json index f5e93bff6ee..1967ac9f7db 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/knowtheend.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/knowtheend.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/theflintstones", "requirements": [ { + "type": "minecolonies:building", "building": "baker", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:chorus_fruit" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:chorus_fruit", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/letitgrow.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/letitgrow.json index 64778f31103..94820e59613 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/letitgrow.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/letitgrow.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/biodegradable", "requirements": [ { + "type": "minecolonies:building", "building": "farmer", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecolonies:compost" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecolonies:compost", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/lightning.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/lightning.json index fbacffdbab6..3533dfe758f 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/lightning.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/lightning.json @@ -9,15 +9,11 @@ "parentResearch": "minecolonies:technology/whatisthisspeed", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:redstone" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:redstone", "quantity": 2048 } ], "researchLevel": 6, "subtitle": "com.minecolonies.research.technology.lightning.subtitle" -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/loaded.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/loaded.json index b9a204e6022..9216da14380 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/loaded.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/loaded.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/deeppockets", "requirements": [ { + "type": "minecolonies:building", "building": "library", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:emerald" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:emerald", "quantity": 128 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/madness.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/madness.json index 7b4e8ceb9e8..41591cea4ec 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/madness.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/madness.json @@ -9,14 +9,10 @@ "parentResearch": "minecolonies:technology/seemsautomatic", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_ingot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_ingot", "quantity": 1024 } ], "researchLevel": 6 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/magiccompost.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/magiccompost.json index f4593a8b1b6..e1d3721578e 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/magiccompost.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/magiccompost.json @@ -9,14 +9,10 @@ "parentResearch": "minecolonies:technology/fertilizer", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:wheat_seeds" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:wheat_seeds", "quantity": 2048 } ], "researchLevel": 6 -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/memoryaid.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/memoryaid.json index 8dcf6628c65..c789f7f59a4 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/memoryaid.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/memoryaid.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/woodwork", "requirements": [ { + "type": "minecolonies:building", "building": "sawmill", "level": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:paper" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:paper", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/morescrolls.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/morescrolls.json index e9922130d7a..52871e9dbea 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/morescrolls.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/morescrolls.json @@ -8,34 +8,23 @@ "icon": "minecolonies:scroll_highlight", "requirements": [ { + "type": "minecolonies:building", "building": "enchanter", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:paper" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:paper", "quantity": 64 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecolonies:ancienttome" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecolonies:ancienttome", "quantity": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:lapis_lazuli" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:lapis_lazuli", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/netherlog.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/netherlog.json index b650888e1bd..91865915bc9 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/netherlog.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/netherlog.json @@ -9,24 +9,17 @@ "parentResearch": "minecolonies:technology/opennether", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:ender_eye" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:ender_eye", "quantity": 16 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecolonies:ancienttome" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecolonies:ancienttome", "quantity": 1 }, { + "type": "minecolonies:building", "building": "netherworker", "level": 1 } diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/oceanheart.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/oceanheart.json index df56f7d34cb..05842f2b97b 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/oceanheart.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/oceanheart.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/alchemist", "requirements": [ { + "type": "minecolonies:building", "building": "fisherman", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:heart_of_the_sea" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:heart_of_the_sea", "quantity": 1 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/opennether.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/opennether.json index a631a8984c5..de551f72786 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/opennether.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/opennether.json @@ -9,16 +9,12 @@ "parentResearch": "minecolonies:technology/morescrolls", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:gilded_blackstone" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:gilded_blackstone", "quantity": 3 } ], "researchLevel": 2, "sortOrder": 1, "subtitle": "com.minecolonies.research.technology.opennether.subtitle" -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/pavetheroad.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/pavetheroad.json index 4c7502da6cd..3c5bd407f5b 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/pavetheroad.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/pavetheroad.json @@ -9,6 +9,7 @@ "parentResearch": "minecolonies:technology/rockingroll", "requirements": [ { + "type": "minecolonies:building", "building": "crusher", "level": 1 }, diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/podzolchance.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/podzolchance.json index f6f889b3df9..72081c49551 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/podzolchance.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/podzolchance.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/biodegradable", "requirements": [ { + "type": "minecolonies:building", "building": "composter", "level": 2 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:podzol" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:podzol", "quantity": 8 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/podzolchance2.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/podzolchance2.json index 4043647fd43..ef1cab46510 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/podzolchance2.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/podzolchance2.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/podzolchance", "requirements": [ { + "type": "minecolonies:building", "building": "composter", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:podzol" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:podzol", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/rainbowheaven.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/rainbowheaven.json index 27ab9ab3ff2..c9b61780be7 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/rainbowheaven.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/rainbowheaven.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/biodegradable", "requirements": [ { + "type": "minecolonies:building", "building": "composter", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:poppy" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:poppy", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/rainman.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/rainman.json index 0f7208c3efb..e70f1224e84 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/rainman.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/rainman.json @@ -9,15 +9,11 @@ "parentResearch": "minecolonies:technology/rtm", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:salmon_bucket" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:salmon_bucket", "quantity": 27 } ], "researchLevel": 6, "subtitle": "com.minecolonies.research.technology.rainman.subtitle" -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/recipebook.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/recipebook.json index df11179bbf3..133e8786610 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/recipebook.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/recipebook.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/cheatsheet", "requirements": [ { + "type": "minecolonies:building", "building": "sawmill", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:paper" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:paper", "quantity": 128 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/redstonepowered.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/redstonepowered.json index 6deefbf7fd5..efb7529d73f 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/redstonepowered.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/redstonepowered.json @@ -9,15 +9,11 @@ "parentResearch": "minecolonies:technology/isthisredstone", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:redstone" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:redstone", "quantity": 256 } ], "researchLevel": 3, "subtitle": "com.minecolonies.research.technology.redstonepowered.subtitle" -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/reinforced.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/reinforced.json index cb9ae9d5436..42c42017f8b 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/reinforced.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/reinforced.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/hardened", "requirements": [ { + "type": "minecolonies:building", "building": "blacksmith", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:diamond" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:diamond", "quantity": 32 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/richveins.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/richveins.json index f077c7458a7..2dda42ef77d 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/richveins.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/richveins.json @@ -9,6 +9,7 @@ "parentResearch": "minecolonies:technology/goodveins", "requirements": [ { + "type": "minecolonies:building", "building": "blacksmith", "level": 4 }, diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/rockingroll.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/rockingroll.json index 25189458f94..ddb76762257 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/rockingroll.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/rockingroll.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/stonecake", "requirements": [ { + "type": "minecolonies:building", "building": "stonemason", "level": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:stone" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:stone", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/rtm.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/rtm.json index c798fb72e27..f420b3f63a0 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/rtm.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/rtm.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/recipebook", "requirements": [ { + "type": "minecolonies:building", "building": "sawmill", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:paper" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:paper", "quantity": 256 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/seemsautomatic.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/seemsautomatic.json index 34273080f87..6b561db9195 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/seemsautomatic.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/seemsautomatic.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/tools", "requirements": [ { + "type": "minecolonies:building", "building": "blacksmith", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_ingot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_ingot", "quantity": 512 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/sieving.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/sieving.json index 61e8f1c5f45..cc92c53c642 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/sieving.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/sieving.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/woodwork", "requirements": [ { + "type": "minecolonies:building", "building": "fisherman", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:string" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:string", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/skills.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/skills.json index 07c253e1e45..859b1792a38 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/skills.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/skills.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/ability", "requirements": [ { + "type": "minecolonies:building", "building": "miner", "level": 2 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_ingot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_ingot", "quantity": 128 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/softshoes.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/softshoes.json index b79035d2591..d56fbc69f11 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/softshoes.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/softshoes.json @@ -8,25 +8,17 @@ "icon": "minecraft:leather_boots", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:white_wool" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:white_wool", "quantity": 16 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:feather" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:feather", "quantity": 16 } ], "researchLevel": 1, "sortOrder": 2, "subtitle": "com.minecolonies.research.technology.softshoes.subtitle" -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/space.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/space.json index b45dff12003..40da571cfde 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/space.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/space.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/sieving", "requirements": [ { + "type": "minecolonies:building", "building": "miner", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecolonies:blockminecoloniesrack" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecolonies:blockminecoloniesrack", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/steelbracing.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/steelbracing.json index e7c33968b6b..7236487667b 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/steelbracing.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/steelbracing.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/reinforced", "requirements": [ { + "type": "minecolonies:building", "building": "blacksmith", "level": 5 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:diamond" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:diamond", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/stonecake.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/stonecake.json index 6c735bed0db..fe4e8ac5907 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/stonecake.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/stonecake.json @@ -8,16 +8,13 @@ "icon": "minecolonies:blockhutstonemason", "requirements": [ { + "type": "minecolonies:building", "building": "miner", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:chiseled_stone_bricks" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:chiseled_stone_bricks", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/stringwork.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/stringwork.json index a547bd229db..b1dd07fac01 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/stringwork.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/stringwork.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/woodwork", "requirements": [ { + "type": "minecolonies:building", "building": "sawmill", "level": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:string" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:string", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/strong.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/strong.json index 906efa4cc36..6f82e01b547 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/strong.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/strong.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/hittingiron", "requirements": [ { + "type": "minecolonies:building", "building": "blacksmith", "level": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:diamond" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:diamond", "quantity": 8 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/takingdivinglessons.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/takingdivinglessons.json index 2c3033daa98..0e7ab06ef26 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/takingdivinglessons.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/takingdivinglessons.json @@ -9,34 +9,23 @@ "parentResearch": "minecolonies:technology/letitgrow", "requirements": [ { + "type": "minecolonies:building", "building": "plantation", "level": 2 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:kelp" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:kelp", "quantity": 16 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:seagrass" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:seagrass", "quantity": 16 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:sea_pickle" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:sea_pickle", "quantity": 16 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/theflintstones.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/theflintstones.json index 97116c20b9a..3fd579e5c16 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/theflintstones.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/theflintstones.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/stonecake", "requirements": [ { + "type": "minecolonies:building", "building": "stonemason", "level": 1 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:brick" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:brick", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/thoselungs.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/thoselungs.json index aa5a62ed9fa..0a6228d9918 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/thoselungs.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/thoselungs.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/hot", "requirements": [ { + "type": "minecolonies:building", "building": "smeltery", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:glass" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:glass", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/tools.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/tools.json index 855599721ae..29a05f89414 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/tools.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/tools.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/skills", "requirements": [ { + "type": "minecolonies:building", "building": "blacksmith", "level": 4 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:iron_ingot" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:iron_ingot", "quantity": 256 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/veinminer.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/veinminer.json index 4dd50757b8b..e73d77fb0e4 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/veinminer.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/veinminer.json @@ -9,6 +9,7 @@ "parentResearch": "minecolonies:technology/hittingiron", "requirements": [ { + "type": "minecolonies:building", "building": "miner", "level": 1 }, diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/warehousemaster.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/warehousemaster.json index 65138e70191..1dce586c244 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/warehousemaster.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/warehousemaster.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/memoryaid", "requirements": [ { + "type": "minecolonies:building", "building": "sawmill", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecolonies:blockminecoloniesrack" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecolonies:blockminecoloniesrack", "quantity": 3 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/whatisthisspeed.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/whatisthisspeed.json index 0c3823e8c6f..ca294a4f804 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/whatisthisspeed.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/whatisthisspeed.json @@ -9,15 +9,11 @@ "parentResearch": "minecolonies:technology/heavymachinery", "requirements": [ { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:redstone" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:redstone", "quantity": 1024 } ], "researchLevel": 5, "subtitle": "com.minecolonies.research.technology.whatisthisspeed.subtitle" -} \ No newline at end of file +} diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/whatyaneed.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/whatyaneed.json index 194879eeca6..f35e1236e9e 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/whatyaneed.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/whatyaneed.json @@ -9,16 +9,13 @@ "parentResearch": "minecolonies:technology/hittingiron", "requirements": [ { + "type": "minecolonies:building", "building": "blacksmith", "level": 3 }, { - "type": "minecolonies:item_list", - "item": { - "items": [ - "minecraft:redstone" - ] - }, + "type": "minecolonies:item_simple", + "item": "minecraft:redstone", "quantity": 64 } ], diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/woodwork.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/woodwork.json index ef48ff414f1..15ec43316ce 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/woodwork.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/technology/woodwork.json @@ -8,6 +8,7 @@ "icon": "minecolonies:blockhutsawmill", "requirements": [ { + "type": "minecolonies:building", "building": "lumberjack", "level": 3 }, diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/unlockable/diamondmesh.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/unlockable/diamondmesh.json index 29b8b8b36dc..a3a4ec0a422 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/unlockable/diamondmesh.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/unlockable/diamondmesh.json @@ -12,6 +12,7 @@ "parentResearch": "minecolonies:unlockable/ironmesh", "requirements": [ { + "type": "minecolonies:mandatory-building", "level": 5, "mandatory-building": "sifter" } diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/unlockable/flintmesh.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/unlockable/flintmesh.json index 5cb4133fa47..93ff978af6c 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/unlockable/flintmesh.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/unlockable/flintmesh.json @@ -12,6 +12,7 @@ "parentResearch": "minecolonies:unlockable/stringmesh", "requirements": [ { + "type": "minecolonies:mandatory-building", "level": 3, "mandatory-building": "sifter" } diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/unlockable/ironmesh.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/unlockable/ironmesh.json index 743bf05b696..0c56b5de479 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/unlockable/ironmesh.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/unlockable/ironmesh.json @@ -12,6 +12,7 @@ "parentResearch": "minecolonies:unlockable/flintmesh", "requirements": [ { + "type": "minecolonies:mandatory-building", "level": 4, "mandatory-building": "sifter" } diff --git a/src/datagen/generated/minecolonies/data/minecolonies/researches/unlockable/stringmesh.json b/src/datagen/generated/minecolonies/data/minecolonies/researches/unlockable/stringmesh.json index f19ef24f6f4..52e1f6485d3 100644 --- a/src/datagen/generated/minecolonies/data/minecolonies/researches/unlockable/stringmesh.json +++ b/src/datagen/generated/minecolonies/data/minecolonies/researches/unlockable/stringmesh.json @@ -11,6 +11,7 @@ "instant": true, "requirements": [ { + "type": "minecolonies:mandatory-building", "level": 1, "mandatory-building": "sifter" } diff --git a/src/main/java/com/minecolonies/api/research/AbstractResearchProvider.java b/src/main/java/com/minecolonies/api/research/AbstractResearchProvider.java index 63673b2dd78..13ea028fe29 100644 --- a/src/main/java/com/minecolonies/api/research/AbstractResearchProvider.java +++ b/src/main/java/com/minecolonies/api/research/AbstractResearchProvider.java @@ -22,8 +22,7 @@ import java.util.List; import java.util.concurrent.CompletableFuture; -import static com.minecolonies.api.research.ModResearchCostTypes.LIST_ITEM_COST_ID; -import static com.minecolonies.api.research.ModResearchCostTypes.TAG_ITEM_COST_ID; +import static com.minecolonies.api.research.ModResearchCostTypes.*; /** * A class for creating the Research-related JSONs, including Research, ResearchEffects, and (optional) Branches. @@ -393,6 +392,7 @@ public Research setIcon(final ResourceLocation texture) private JsonObject makeSafeBuildingProperty(final String propertyType, final String buildingName, final int level) { JsonObject req = new JsonObject(); + req.addProperty("type", new ResourceLocation(Constants.MOD_ID, propertyType).toString()); req.addProperty(propertyType, buildingName); req.addProperty("level", level); return req; @@ -545,7 +545,16 @@ public Research addResearchRequirement(final ResourceLocation researchReq, final */ public Research addItemCost(final Item item, final int count) { - return addItemCost(List.of(item), count); + final JsonArray reqArray = getRequirementsArray(); + + JsonObject req = new JsonObject(); + req.addProperty("type", SIMPLE_ITEM_COST_ID.toString()); + req.addProperty("item", ForgeRegistries.ITEMS.getKey(item).toString()); + req.addProperty("quantity", count); + + reqArray.add(req); + this.json.add("requirements", reqArray); + return this; } /**