From 887444db4d3d192ec3105dca323b82be7c1f600a Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 14 May 2023 00:19:59 +0100 Subject: [PATCH] Move all advancements to datagen --- .../advancement/TRAdvancementProvider.groovy | 159 +++++++++++++++++- .../techreborn/advancements/blastfurnace.json | 22 --- .../advancements/canningmachine.json | 26 --- .../techreborn/advancements/compressor.json | 26 --- .../advancements/electricfurnace.json | 22 --- .../techreborn/advancements/extractor.json | 26 --- .../advancements/fusioncomputer.json | 27 --- .../advancements/futuretransformer.json | 49 ------ .../data/techreborn/advancements/grinder.json | 26 --- .../techreborn/advancements/implosion.json | 23 --- .../advancements/industrialgrinder.json | 27 --- .../techreborn/advancements/lightningrod.json | 23 --- .../advancements/matterfabricator.json | 27 --- .../techreborn/advancements/nickelnugget.json | 26 --- .../techreborn/advancements/quantumarmor.json | 60 ------- .../techreborn/advancements/recycler.json | 22 --- .../advancements/rollingmachine.json | 26 --- .../advancements/scrapboxinator.json | 27 --- .../advancements/thermalgenerator.json | 26 --- .../techreborn/advancements/watermill.json | 22 --- .../techreborn/advancements/wiremill.json | 26 --- 21 files changed, 155 insertions(+), 563 deletions(-) delete mode 100644 src/main/resources/data/techreborn/advancements/blastfurnace.json delete mode 100644 src/main/resources/data/techreborn/advancements/canningmachine.json delete mode 100644 src/main/resources/data/techreborn/advancements/compressor.json delete mode 100644 src/main/resources/data/techreborn/advancements/electricfurnace.json delete mode 100644 src/main/resources/data/techreborn/advancements/extractor.json delete mode 100644 src/main/resources/data/techreborn/advancements/fusioncomputer.json delete mode 100644 src/main/resources/data/techreborn/advancements/futuretransformer.json delete mode 100644 src/main/resources/data/techreborn/advancements/grinder.json delete mode 100644 src/main/resources/data/techreborn/advancements/implosion.json delete mode 100644 src/main/resources/data/techreborn/advancements/industrialgrinder.json delete mode 100644 src/main/resources/data/techreborn/advancements/lightningrod.json delete mode 100644 src/main/resources/data/techreborn/advancements/matterfabricator.json delete mode 100644 src/main/resources/data/techreborn/advancements/nickelnugget.json delete mode 100644 src/main/resources/data/techreborn/advancements/quantumarmor.json delete mode 100644 src/main/resources/data/techreborn/advancements/recycler.json delete mode 100644 src/main/resources/data/techreborn/advancements/rollingmachine.json delete mode 100644 src/main/resources/data/techreborn/advancements/scrapboxinator.json delete mode 100644 src/main/resources/data/techreborn/advancements/thermalgenerator.json delete mode 100644 src/main/resources/data/techreborn/advancements/watermill.json delete mode 100644 src/main/resources/data/techreborn/advancements/wiremill.json diff --git a/src/datagen/groovy/techreborn/datagen/advancement/TRAdvancementProvider.groovy b/src/datagen/groovy/techreborn/datagen/advancement/TRAdvancementProvider.groovy index aabd41d97..eaa8e1615 100644 --- a/src/datagen/groovy/techreborn/datagen/advancement/TRAdvancementProvider.groovy +++ b/src/datagen/groovy/techreborn/datagen/advancement/TRAdvancementProvider.groovy @@ -120,7 +120,23 @@ class TRAdvancementProvider extends FabricAdvancementProvider { condition placedBlock(TRContent.Machine.WIND_MILL.block) } - solarTree(generator) + def watermill = create { + parent windmill + name "watermill" + frame AdvancementFrame.GOAL + icon TRContent.Machine.WATER_MILL + condition placedBlock(TRContent.Machine.WATER_MILL.block) + } + + def thermalGenerator = create { + parent watermill + name "thermalgenerator" + frame AdvancementFrame.GOAL + icon TRContent.Machine.THERMAL_GENERATOR + condition placedBlock(TRContent.Machine.THERMAL_GENERATOR.block) + } + + solarTree(machineBlock) } private void solarTree(Advancement root) { @@ -231,6 +247,15 @@ class TRAdvancementProvider extends FabricAdvancementProvider { condition placedBlock(TRContent.Machine.LV_TRANSFORMER.block) } + def futureTransformer = create { + parent lvTransformer + name "futuretransformer" + icon TRContent.Machine.MV_TRANSFORMER + condition placedBlock(TRContent.Machine.MV_TRANSFORMER.block) + condition placedBlock(TRContent.Machine.HV_TRANSFORMER.block) + condition placedBlock(TRContent.Machine.EV_TRANSFORMER.block) + } + def mfsu = create { parent mfe name "mfsu" @@ -256,7 +281,68 @@ class TRAdvancementProvider extends FabricAdvancementProvider { condition placedBlock(TRContent.Machine.IRON_FURNACE.block) } - // TODO fill this out some more + def electricFurnace = create { + parent ironFurnace + name "electricfurnace" + icon TRContent.Machine.ELECTRIC_FURNACE + condition placedBlock(TRContent.Machine.ELECTRIC_FURNACE.block) + } + + def grinder = create { + parent electricFurnace + name "grinder" + icon TRContent.Machine.GRINDER + condition placedBlock(TRContent.Machine.GRINDER.block) + } + + def extractor = create { + parent grinder + name "extractor" + icon TRContent.Machine.EXTRACTOR + condition placedBlock(TRContent.Machine.EXTRACTOR.block) + } + + def compressor = create { + parent grinder + name "compressor" + icon TRContent.Machine.COMPRESSOR + condition placedBlock(TRContent.Machine.COMPRESSOR.block) + } + + def recycler = create { + parent compressor + name "recycler" + icon TRContent.Machine.RECYCLER + condition placedBlock(TRContent.Machine.RECYCLER.block) + } + + def scrapboxinator = create { + parent recycler + name "scrapboxinator" + icon TRContent.Machine.SCRAPBOXINATOR + condition placedBlock(TRContent.Machine.SCRAPBOXINATOR.block) + } + + def canningMachine = create { + parent electricFurnace + name "canningmachine" + icon TRContent.Machine.SOLID_CANNING_MACHINE + condition placedBlock(TRContent.Machine.SOLID_CANNING_MACHINE.block) + } + + def rollingMachine = create { + parent electricFurnace + name "rollingmachine" + icon TRContent.Machine.ROLLING_MACHINE + condition placedBlock(TRContent.Machine.ROLLING_MACHINE.block) + } + + def wireMill = create { + parent electricFurnace + name "wiremill" + icon TRContent.Machine.WIRE_MILL + condition placedBlock(TRContent.Machine.WIRE_MILL.block) + } advancedMachineTreeTree(ironFurnace) } @@ -269,14 +355,29 @@ class TRAdvancementProvider extends FabricAdvancementProvider { condition placedBlock(TRContent.MachineBlocks.ADVANCED.frame) } + def lightningRod = create { + parent advancedMachineBlock + name "lightningrod" + frame AdvancementFrame.GOAL + icon TRContent.Machine.LIGHTNING_ROD + condition placedBlock(TRContent.Machine.LIGHTNING_ROD.block) + } + def fusionCoil = create { parent advancedMachineBlock name "fusioncoil" icon TRContent.Machine.FUSION_COIL - frame AdvancementFrame.CHALLENGE condition placedBlock(TRContent.Machine.FUSION_COIL.block) } + def fusionComputer = create { + parent fusionCoil + name "fusioncomputer" + icon TRContent.Machine.FUSION_CONTROL_COMPUTER + frame AdvancementFrame.CHALLENGE + condition placedBlock(TRContent.Machine.FUSION_CONTROL_COMPUTER.block) + } + def nuke = create { parent fusionCoil name "nuke" @@ -293,6 +394,48 @@ class TRAdvancementProvider extends FabricAdvancementProvider { condition placedBlock(TRContent.Machine.INDUSTRIAL_CENTRIFUGE.block) } + def nickelNugget = create { + parent industrialCentrifuge + name "nickelnugget" + icon TRContent.Nuggets.NICKEL + condition inventoryChanged(TRContent.Nuggets.NICKEL) + } + + def blastFurnace = create { + parent nickelNugget + name "blastfurnace" + icon TRContent.Machine.INDUSTRIAL_BLAST_FURNACE + frame AdvancementFrame.GOAL + condition placedBlock(TRContent.Machine.INDUSTRIAL_BLAST_FURNACE.block) + } + + def industrialGrinder = create { + parent blastFurnace + name "industrialgrinder" + icon TRContent.Machine.INDUSTRIAL_GRINDER + frame AdvancementFrame.GOAL + condition placedBlock(TRContent.Machine.INDUSTRIAL_GRINDER.block) + } + + def implosion = create { + parent industrialGrinder + name "implosion" + icon TRContent.Machine.IMPLOSION_COMPRESSOR + frame AdvancementFrame.GOAL + condition placedBlock(TRContent.Machine.IMPLOSION_COMPRESSOR.block) + } + + def quantumArmor = create { + parent implosion + name "quantumarmor" + icon TRContent.QUANTUM_CHESTPLATE + frame AdvancementFrame.GOAL + condition inventoryChanged(TRContent.QUANTUM_HELMET) + condition inventoryChanged(TRContent.QUANTUM_CHESTPLATE) + condition inventoryChanged(TRContent.QUANTUM_LEGGINGS) + condition inventoryChanged(TRContent.QUANTUM_BOOTS) + } + def industrialMachineBlock = create { parent advancedMachineBlock name "industrialmachineblock" @@ -300,8 +443,16 @@ class TRAdvancementProvider extends FabricAdvancementProvider { condition placedBlock(TRContent.MachineBlocks.INDUSTRIAL.frame) } + def matterFabricator = create { + parent industrialMachineBlock + name "matterfabricator" + icon TRContent.Machine.MATTER_FABRICATOR + frame AdvancementFrame.CHALLENGE + condition placedBlock(TRContent.Machine.MATTER_FABRICATOR.block) + } + def quantumTank = create { - parent advancedMachineBlock + parent industrialMachineBlock name "quantumtank" icon TRContent.TankUnit.QUANTUM frame AdvancementFrame.CHALLENGE diff --git a/src/main/resources/data/techreborn/advancements/blastfurnace.json b/src/main/resources/data/techreborn/advancements/blastfurnace.json deleted file mode 100644 index c7e6414bb..000000000 --- a/src/main/resources/data/techreborn/advancements/blastfurnace.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:industrial_blast_furnace" - }, - "title": { - "translate": "advancements.techreborn.blastfurnace" - }, - "description": { - "translate": "advancements.techreborn.blastfurnace.desc" - } - }, - "parent": "techreborn:nickelnugget", - "criteria": { - "crit1": { - "trigger": "minecraft:placed_block", - "conditions": { - "block": "techreborn:industrial_blast_furnace" - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/canningmachine.json b/src/main/resources/data/techreborn/advancements/canningmachine.json deleted file mode 100644 index ea8d938f4..000000000 --- a/src/main/resources/data/techreborn/advancements/canningmachine.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:solid_canning_machine" - }, - "title": { - "translate": "advancements.techreborn.canningmachine" - }, - "description": { - "translate": "advancements.techreborn.canningmachine.desc" - } - }, - "parent": "techreborn:electricfurnace", - "criteria": { - "crit1": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:solid_canning_machine"] - } - ] - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/compressor.json b/src/main/resources/data/techreborn/advancements/compressor.json deleted file mode 100644 index 83f36552a..000000000 --- a/src/main/resources/data/techreborn/advancements/compressor.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:compressor" - }, - "title": { - "translate": "advancements.techreborn.compressor" - }, - "description": { - "translate": "advancements.techreborn.compressor.desc" - } - }, - "parent": "techreborn:electricfurnace", - "criteria": { - "crit1": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:compressor"] - } - ] - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/electricfurnace.json b/src/main/resources/data/techreborn/advancements/electricfurnace.json deleted file mode 100644 index 31860834b..000000000 --- a/src/main/resources/data/techreborn/advancements/electricfurnace.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:electric_furnace" - }, - "title": { - "translate": "advancements.techreborn.electricfurnace" - }, - "description": { - "translate": "advancements.techreborn.electricfurnace.desc" - } - }, - "parent": "techreborn:ironfurnace", - "criteria": { - "crit1": { - "trigger": "minecraft:placed_block", - "conditions": { - "block": "techreborn:electric_furnace" - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/extractor.json b/src/main/resources/data/techreborn/advancements/extractor.json deleted file mode 100644 index c4ec1ec20..000000000 --- a/src/main/resources/data/techreborn/advancements/extractor.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:extractor" - }, - "title": { - "translate": "advancements.techreborn.extractor" - }, - "description": { - "translate": "advancements.techreborn.extractor.desc" - } - }, - "parent": "techreborn:electricfurnace", - "criteria": { - "crit1": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:extractor"] - } - ] - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/fusioncomputer.json b/src/main/resources/data/techreborn/advancements/fusioncomputer.json deleted file mode 100644 index 486726a89..000000000 --- a/src/main/resources/data/techreborn/advancements/fusioncomputer.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:fusion_control_computer" - }, - "title": { - "translate": "advancements.techreborn.fusioncomputer" - }, - "description": { - "translate": "advancements.techreborn.fusioncomputer.desc" - }, - "frame": "challenge" - }, - "parent": "techreborn:fusioncoil", - "criteria": { - "crit1": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:fusion_control_computer"] - } - ] - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/futuretransformer.json b/src/main/resources/data/techreborn/advancements/futuretransformer.json deleted file mode 100644 index f78ad4c9c..000000000 --- a/src/main/resources/data/techreborn/advancements/futuretransformer.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:mv_transformer" - }, - "title": { - "translate": "advancements.techreborn.futuretransformer" - }, - "description": { - "translate": "advancements.techreborn.futuretransformer.desc" - } - }, - "parent": "techreborn:lvtransformer", - "criteria": { - "mvtransformer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:mv_transformer"] - } - ] - } - }, - "hvtransformer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:hv_transformer"] - } - ] - } - }, - "evtransformer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:ev_transformer"] - } - ] - } - } - }, - "requirements": [ - ["mvtransformer", "hvtransformer","evtransformer"] - ] -} diff --git a/src/main/resources/data/techreborn/advancements/grinder.json b/src/main/resources/data/techreborn/advancements/grinder.json deleted file mode 100644 index 6b8534a4d..000000000 --- a/src/main/resources/data/techreborn/advancements/grinder.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:grinder" - }, - "title": { - "translate": "advancements.techreborn.grinder" - }, - "description": { - "translate": "advancements.techreborn.grinder.desc" - } - }, - "parent": "techreborn:electricfurnace", - "criteria": { - "crit1": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:grinder"] - } - ] - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/implosion.json b/src/main/resources/data/techreborn/advancements/implosion.json deleted file mode 100644 index 37b4bca36..000000000 --- a/src/main/resources/data/techreborn/advancements/implosion.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:implosion_compressor" - }, - "title": { - "translate": "advancements.techreborn.implosion" - }, - "description": { - "translate": "advancements.techreborn.implosion.desc" - }, - "frame": "goal" - }, - "parent": "techreborn:industrialgrinder", - "criteria": { - "crit1": { - "trigger": "minecraft:placed_block", - "conditions": { - "block": "techreborn:implosion_compressor" - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/industrialgrinder.json b/src/main/resources/data/techreborn/advancements/industrialgrinder.json deleted file mode 100644 index 467d8a548..000000000 --- a/src/main/resources/data/techreborn/advancements/industrialgrinder.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:industrial_grinder" - }, - "title": { - "translate": "advancements.techreborn.industrialgrinder" - }, - "description": { - "translate": "advancements.techreborn.industrialgrinder.desc" - }, - "frame": "goal" - }, - "parent": "techreborn:blastfurnace", - "criteria": { - "crit1": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:industrial_grinder"] - } - ] - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/lightningrod.json b/src/main/resources/data/techreborn/advancements/lightningrod.json deleted file mode 100644 index 46bd1876d..000000000 --- a/src/main/resources/data/techreborn/advancements/lightningrod.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:lightning_rod" - }, - "title": { - "translate": "advancements.techreborn.lightningrod" - }, - "description": { - "translate": "advancements.techreborn.lightningrod.desc" - }, - "frame": "goal" - }, - "parent": "techreborn:generator", - "criteria": { - "crit1": { - "trigger": "minecraft:placed_block", - "conditions": { - "block": "techreborn:lightning_rod" - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/matterfabricator.json b/src/main/resources/data/techreborn/advancements/matterfabricator.json deleted file mode 100644 index 22ed3ce90..000000000 --- a/src/main/resources/data/techreborn/advancements/matterfabricator.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:matter_fabricator" - }, - "title": { - "translate": "advancements.techreborn.matterfabricator" - }, - "description": { - "translate": "advancements.techreborn.matterfabricator.desc" - }, - "frame": "challenge" - }, - "parent": "techreborn:industrialmachineblock", - "criteria": { - "crit1": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:matter_fabricator"] - } - ] - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/nickelnugget.json b/src/main/resources/data/techreborn/advancements/nickelnugget.json deleted file mode 100644 index dce3d589b..000000000 --- a/src/main/resources/data/techreborn/advancements/nickelnugget.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:nickel_nugget" - }, - "title": { - "translate": "advancements.techreborn.nickelnugget" - }, - "description": { - "translate": "advancements.techreborn.nickelnugget.desc" - } - }, - "parent": "techreborn:industrialcentrifuge", - "criteria": { - "crit1": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:nickel_nugget"] - } - ] - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/quantumarmor.json b/src/main/resources/data/techreborn/advancements/quantumarmor.json deleted file mode 100644 index 343fdbfbd..000000000 --- a/src/main/resources/data/techreborn/advancements/quantumarmor.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:quantum_chestplate" - }, - "title": { - "translate": "advancements.techreborn.quantumarmor" - }, - "description": { - "translate": "advancements.techreborn.quantumarmor.desc" - }, - "frame": "goal" - }, - "parent": "techreborn:implosion", - "criteria": { - "head": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:quantum_helmet"] - } - ] - } - }, - "chest": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:quantum_chestplate"] - } - ] - } - }, - "leg": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:quantum_leggings"] - } - ] - } - }, - "feet": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:quantum_boots"] - } - ] - } - } - }, - "requirements": [ - ["head", "chest","leg","feet"] - ] -} diff --git a/src/main/resources/data/techreborn/advancements/recycler.json b/src/main/resources/data/techreborn/advancements/recycler.json deleted file mode 100644 index 2df0a15f1..000000000 --- a/src/main/resources/data/techreborn/advancements/recycler.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:recycler" - }, - "title": { - "translate": "advancements.techreborn.recycler" - }, - "description": { - "translate": "advancements.techreborn.recycler.desc" - } - }, - "parent": "techreborn:electricfurnace", - "criteria": { - "crit1": { - "trigger": "minecraft:placed_block", - "conditions": { - "block": "techreborn:recycler" - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/rollingmachine.json b/src/main/resources/data/techreborn/advancements/rollingmachine.json deleted file mode 100644 index b8605d80a..000000000 --- a/src/main/resources/data/techreborn/advancements/rollingmachine.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:rolling_machine" - }, - "title": { - "translate": "advancements.techreborn.rollingmachine" - }, - "description": { - "translate": "advancements.techreborn.rollingmachine.desc" - } - }, - "parent": "techreborn:electricfurnace", - "criteria": { - "crit1": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:rolling_machine"] - } - ] - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/scrapboxinator.json b/src/main/resources/data/techreborn/advancements/scrapboxinator.json deleted file mode 100644 index 6cddcc7f3..000000000 --- a/src/main/resources/data/techreborn/advancements/scrapboxinator.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:scrapboxinator" - }, - "title": { - "translate": "advancements.techreborn.scrapboxinator" - }, - "description": { - "translate": "advancements.techreborn.scrapboxinator.desc" - }, - "frame": "goal" - }, - "parent": "techreborn:recycler", - "criteria": { - "crit1": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:scrapboxinator"] - } - ] - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/thermalgenerator.json b/src/main/resources/data/techreborn/advancements/thermalgenerator.json deleted file mode 100644 index b5c7c3e6e..000000000 --- a/src/main/resources/data/techreborn/advancements/thermalgenerator.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:thermal_generator" - }, - "title": { - "translate": "advancements.techreborn.thermalgenerator" - }, - "description": { - "translate": "advancements.techreborn.thermalgenerator.desc" - } - }, - "parent": "techreborn:generator", - "criteria": { - "crit1": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:thermal_generator"] - } - ] - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/watermill.json b/src/main/resources/data/techreborn/advancements/watermill.json deleted file mode 100644 index f016bc5d7..000000000 --- a/src/main/resources/data/techreborn/advancements/watermill.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:water_mill" - }, - "title": { - "translate": "advancements.techreborn.watermill" - }, - "description": { - "translate": "advancements.techreborn.watermill.desc" - } - }, - "parent": "techreborn:generator", - "criteria": { - "crit1": { - "trigger": "minecraft:placed_block", - "conditions": { - "block": "techreborn:water_mill" - } - } - } -} diff --git a/src/main/resources/data/techreborn/advancements/wiremill.json b/src/main/resources/data/techreborn/advancements/wiremill.json deleted file mode 100644 index 17ad3d43b..000000000 --- a/src/main/resources/data/techreborn/advancements/wiremill.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "item": "techreborn:wire_mill" - }, - "title": { - "translate": "advancements.techreborn.wiremill" - }, - "description": { - "translate": "advancements.techreborn.wiremill.desc" - } - }, - "parent": "techreborn:electricfurnace", - "criteria": { - "crit1": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:wire_mill"] - } - ] - } - } - } -}