diff --git a/build.gradle b/build.gradle index 820b0b595..1e278e083 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,7 @@ dependencies { //Fabric api modImplementation "net.fabricmc.fabric-api:fabric-api:0.4.24+build.279-1.15" - optionalDependency ("me.shedaniel:RoughlyEnoughItems:3.2.25") + optionalDependency ("me.shedaniel:RoughlyEnoughItems:3.2.31") optionalDependency ('io.github.cottonmc:LibCD:2.0.1+1.15') def rcVersion = 'RebornCore:RebornCore-1.15:+' diff --git a/src/main/resources/assets/techreborn/lang/en_us.json b/src/main/resources/assets/techreborn/lang/en_us.json index 4fca80604..4f4f2e123 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.json +++ b/src/main/resources/assets/techreborn/lang/en_us.json @@ -714,13 +714,109 @@ "techreborn.manual.refundbtn": "Refund", "_comment24": "Advancements", - "advancements.techreborn.root": "Mine It", - "advancements.techreborn.root.desc": "Now that you have acquired Tech Reborn ore, you might find a tree tap useful.", - "advancements.techreborn.treetap": "TreeTap", - "advancements.techreborn.treetap.desc": "Now that you have crafted a tree tap you will want to use it on a sap spot on a rubber tree.", - "advancements.techreborn.sap": "Rubber Sap", - "advancements.techreborn.sap.desc": "Well done, you now have rubber sap. You will want to smelt it in a furnace to create rubber next.", - + "advancements.techreborn.root": "Tech Reborn", + "advancements.techreborn.root.desc": "Acquire Tech Reborn ore", + "advancements.techreborn.treetap": "Tapping time", + "advancements.techreborn.treetap.desc": "Craft a tree tap", + "advancements.techreborn.sap": "Nectar of the tree", + "advancements.techreborn.sap.desc": "Use a tree tap on a sticky spot on a rubber tree", + "advancements.techreborn.refinediron": "Refined iron", + "advancements.techreborn.refinediron.desc": "Smelt an iron ingot in a furnace to refine impurities out of it", + "advancements.techreborn.machineblock": "Heart of the machine", + "advancements.techreborn.machineblock.desc": "Craft a basic machine frame out of refined iron", + "advancements.techreborn.rubber": "Not so sticky", + "advancements.techreborn.rubber.desc": "Smelt sap into rubber", + "advancements.techreborn.coppercable": "Flowing power", + "advancements.techreborn.coppercable.desc": "Craft copper cable insulated with rubber", + "advancements.techreborn.cellbattery": "Storing power", + "advancements.techreborn.cellbattery.desc": "Craft a battery", + "advancements.techreborn.ironalloyfurnace": "Now we're alloying", + "advancements.techreborn.ironalloyfurnace.desc": "Craft a basic iron alloy furnace", + "advancements.techreborn.ironfurnace": "Flashy furnace", + "advancements.techreborn.ironfurnace.desc": "Craft an iron furnace", + "advancements.techreborn.generator": "LIMITED POWER!", + "advancements.techreborn.generator.desc": "Place a generator", + "advancements.techreborn.basicsolar": "Power from above", + "advancements.techreborn.basicsolar.desc": "Craft a basic solar panel", + "advancements.techreborn.advancedsolar": "Sun++", + "advancements.techreborn.advancedsolar.desc": "Craft the upgraded advanced solar panel", + "advancements.techreborn.industrialsolar": "Industrialization of sunlight", + "advancements.techreborn.industrialsolar.desc": "Craft the industrial solar panel", + "advancements.techreborn.ultimatesolar": "Ultimate clean energy", + "advancements.techreborn.ultimatesolar.desc": "Craft the ultimate solar panel", + "advancements.techreborn.quantumsolar": "Sol", + "advancements.techreborn.quantumsolar.desc": "Place a quantum solar panel", + "advancements.techreborn.batbox": "Accumulating", + "advancements.techreborn.batbox.desc": "Craft a battery box", + "advancements.techreborn.mfe": "One small step for man", + "advancements.techreborn.mfe.desc": "Craft a MFE", + "advancements.techreborn.mfsu": "One giant leap for mankind", + "advancements.techreborn.mfsu.desc": "Craft a MFSU", + "advancements.techreborn.nuke": "Old Man Atom", + "advancements.techreborn.nuke.desc": "Peace in the world, or the world in pieces!", + "advancements.techreborn.electricfurnace": "Industrialization", + "advancements.techreborn.electricfurnace.desc": "Place an electric furnace down", + "advancements.techreborn.alloysmelter": "Alloying bliss", + "advancements.techreborn.alloysmelter.desc": "Craft an electric alloy smelter", + "advancements.techreborn.watermill": "Hydropower", + "advancements.techreborn.watermill.desc": "Place a watermill surrounded by 4 water sources", + "advancements.techreborn.thermalgenerator": "Magmatic", + "advancements.techreborn.thermalgenerator.desc": "Craft a thermal generator", + "advancements.techreborn.wiremill": "Wired", + "advancements.techreborn.wiremill.desc": "Craft a wire mill", + "advancements.techreborn.advancedmachineblock": "Now we're evolving", + "advancements.techreborn.advancedmachineblock.desc": "Craft an advanced machine frame", + "advancements.techreborn.compressor": "Singularity impending", + "advancements.techreborn.compressor.desc": "Craft a compressor", + "advancements.techreborn.canningmachine": "Liquid goes where?", + "advancements.techreborn.canningmachine.desc": "Craft a canning machine", + "advancements.techreborn.extractor": "From within thou I grow", + "advancements.techreborn.extractor.desc": "Craft an extractor", + "advancements.techreborn.grinder": "Dust to dust", + "advancements.techreborn.grinder.desc": "Craft a grinder. Maybe try throwing ore in it?", + "advancements.techreborn.rollingmachine": "Flatten", + "advancements.techreborn.rollingmachine.desc": "Craft a rolling machine", + "advancements.techreborn.lvtransformer": "Current transformer", + "advancements.techreborn.lvtransformer.desc": "Craft a LV Transformer", + "advancements.techreborn.futuretransformer": "Future transformer", + "advancements.techreborn.futuretransformer.desc": "Craft any other Transformer", + "advancements.techreborn.windmill": "Slight breeze", + "advancements.techreborn.windmill.desc": "Place a wind mill", + "advancements.techreborn.lightningrod": "I smite thee", + "advancements.techreborn.lightningrod.desc": "Place a lightning rod into the world", + "advancements.techreborn.quantumarmor": "Quantum supremacy", + "advancements.techreborn.quantumarmor.desc": "Craft any piece of quantum armor", + "advancements.techreborn.recycler": "One man's rubbish..", + "advancements.techreborn.recycler.desc": "Place a recycler down", + "advancements.techreborn.industrialcentrifuge": "Round and round it goes", + "advancements.techreborn.industrialcentrifuge.desc": "Craft an industrial centrifuge", + "advancements.techreborn.industrialmachineblock": "Endgame", + "advancements.techreborn.industrialmachineblock.desc": "Craft an industrial machine frame", + "advancements.techreborn.matterfabricator": "Something from nothing", + "advancements.techreborn.matterfabricator.desc": "Craft a matter fabricator", + "advancements.techreborn.nickeldust": "Small beginnings", + "advancements.techreborn.nickeldust.desc": "Get a small pile of nickel dust from the centrifuge", + "advancements.techreborn.fusioncoil": "Coiling", + "advancements.techreborn.fusioncoil.desc": "Craft a fusion coil", + "advancements.techreborn.fusioncomputer": "Fusion and the furious", + "advancements.techreborn.fusioncomputer.desc": "Craft a Fusion control computer", + "advancements.techreborn.alarm": "Super critical", + "advancements.techreborn.alarm.desc": "Place an alarm in the world", + "advancements.techreborn.scrapboxinator": "Open sesame", + "advancements.techreborn.scrapboxinator.desc": "Craft a scrapboxinator", + "advancements.techreborn.upgrade": "Today junior", + "advancements.techreborn.upgrade.desc": "Craft any upgrade", + "advancements.techreborn.blastfurnace": "What a steel", + "advancements.techreborn.blastfurnace.desc": "Place a blast furnace", + "advancements.techreborn.industrialgrinder": "Iridiyum", + "advancements.techreborn.industrialgrinder.desc": "Grind iridium ore in an industrial grinder to get an iridium ingot", + "advancements.techreborn.implosion": "Mini supernova", + "advancements.techreborn.implosion.desc": "Place an implosion compressor down", + "advancements.techreborn.interdimensionalsu": "Is this a tesseract?", + "advancements.techreborn.interdimensionalsu.desc": "Place down an interdimensional SU", + + + "_comment25": "REI Integration", "techreborn:alloy_smelter": "Alloy Smelter", "techreborn:assembling_machine": "Assembling Machine", @@ -785,4 +881,4 @@ "item.techreborn.tritium_bucket": "Tritium", "item.techreborn.wolframium_bucket": "Wolframium", "item.techreborn.biofuel_bucket": "Biofuel" -} \ No newline at end of file +} diff --git a/src/main/resources/data/techreborn/advancements/advancedmachineblock.json b/src/main/resources/data/techreborn/advancements/advancedmachineblock.json new file mode 100644 index 000000000..ba51fc17f --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/advancedmachineblock.json @@ -0,0 +1,27 @@ +{ + "display": { + "icon": { + "item": "techreborn:advanced_machine_frame" + }, + "title": { + "translate": "advancements.techreborn.advancedmachineblock" + }, + "description": { + "translate": "advancements.techreborn.advancedmachineblock.desc" + }, + "hidden": true + }, + "parent": "techreborn:root", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:advanced_machine_frame" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/advancedsolar.json b/src/main/resources/data/techreborn/advancements/advancedsolar.json new file mode 100644 index 000000000..1eff7aca1 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/advancedsolar.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:advanced_solar_panel" + }, + "title": { + "translate": "advancements.techreborn.advancedsolar" + }, + "description": { + "translate": "advancements.techreborn.advancedsolar.desc" + } + }, + "parent": "techreborn:basicsolar", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:advanced_solar_panel" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/alarm.json b/src/main/resources/data/techreborn/advancements/alarm.json new file mode 100644 index 000000000..efbf5aae1 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/alarm.json @@ -0,0 +1,22 @@ +{ + "display": { + "icon": { + "item": "techreborn:alarm" + }, + "title": { + "translate": "advancements.techreborn.alarm" + }, + "description": { + "translate": "advancements.techreborn.alarm.desc" + } + }, + "parent": "techreborn:refined_iron", + "criteria": { + "crit1": { + "trigger": "minecraft:placed_block", + "conditions": { + "block": "techreborn:alarm" + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/alloysmelter.json b/src/main/resources/data/techreborn/advancements/alloysmelter.json new file mode 100644 index 000000000..660575beb --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/alloysmelter.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:alloy_smelter" + }, + "title": { + "translate": "advancements.techreborn.alloysmelter" + }, + "description": { + "translate": "advancements.techreborn.alloysmelter.desc" + } + }, + "parent": "techreborn:ironalloyfurnace", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:alloy_smelter" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/basicsolar.json b/src/main/resources/data/techreborn/advancements/basicsolar.json new file mode 100644 index 000000000..c5e1a4f93 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/basicsolar.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:basic_solar_panel" + }, + "title": { + "translate": "advancements.techreborn.basicsolar" + }, + "description": { + "translate": "advancements.techreborn.basicsolar.desc" + } + }, + "parent": "techreborn:generator", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:basic_solar_panel" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/batbox.json b/src/main/resources/data/techreborn/advancements/batbox.json new file mode 100644 index 000000000..7b13ebb93 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/batbox.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:low_voltage_su" + }, + "title": { + "translate": "advancements.techreborn.batbox" + }, + "description": { + "translate": "advancements.techreborn.batbox.desc" + } + }, + "parent": "techreborn:cellbattery", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:low_voltage_su" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/blastfurnace.json b/src/main/resources/data/techreborn/advancements/blastfurnace.json new file mode 100644 index 000000000..eaba19620 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/blastfurnace.json @@ -0,0 +1,22 @@ +{ + "display": { + "icon": { + "item": "techreborn:industrial_blast_furnace" + }, + "title": { + "translate": "advancements.techreborn.blastfurnace" + }, + "description": { + "translate": "advancements.techreborn.blastfurnace.desc" + } + }, + "parent": "techreborn:nickeldust", + "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 new file mode 100644 index 000000000..f330a156d --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/canningmachine.json @@ -0,0 +1,26 @@ +{ + "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": [ + { + "item": "techreborn:solid_canning_machine" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/cellbattery.json b/src/main/resources/data/techreborn/advancements/cellbattery.json new file mode 100644 index 000000000..678898178 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/cellbattery.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:red_cell_battery" + }, + "title": { + "translate": "advancements.techreborn.cellbattery" + }, + "description": { + "translate": "advancements.techreborn.cellbattery.desc" + } + }, + "parent": "techreborn:coppercable", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:red_cell_battery" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/compressor.json b/src/main/resources/data/techreborn/advancements/compressor.json new file mode 100644 index 000000000..298409ce0 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/compressor.json @@ -0,0 +1,26 @@ +{ + "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": [ + { + "item": "techreborn:compressor" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/coppercable.json b/src/main/resources/data/techreborn/advancements/coppercable.json new file mode 100644 index 000000000..d996f6021 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/coppercable.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:insulated_copper_cable" + }, + "title": { + "translate": "advancements.techreborn.coppercable" + }, + "description": { + "translate": "advancements.techreborn.coppercable.desc" + } + }, + "parent": "techreborn:rubber", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:insulated_copper_cable" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/electricfurnace.json b/src/main/resources/data/techreborn/advancements/electricfurnace.json new file mode 100644 index 000000000..31860834b --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/electricfurnace.json @@ -0,0 +1,22 @@ +{ + "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 new file mode 100644 index 000000000..d174c6ee1 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/extractor.json @@ -0,0 +1,26 @@ +{ + "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": [ + { + "item": "techreborn:extractor" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/fusioncoil.json b/src/main/resources/data/techreborn/advancements/fusioncoil.json new file mode 100644 index 000000000..137192438 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/fusioncoil.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:fusion_coil" + }, + "title": { + "translate": "advancements.techreborn.fusioncoil" + }, + "description": { + "translate": "advancements.techreborn.fusioncoil.desc" + } + }, + "parent": "techreborn:advancedmachineblock", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:fusion_coil" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/fusioncomputer.json b/src/main/resources/data/techreborn/advancements/fusioncomputer.json new file mode 100644 index 000000000..8d48685ba --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/fusioncomputer.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:fusion_control_computer" + }, + "title": { + "translate": "advancements.techreborn.fusioncomputer" + }, + "description": { + "translate": "advancements.techreborn.fusioncomputer.desc" + } + }, + "parent": "techreborn:fusioncoil", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:fusion_control_computer" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/futuretransformer.json b/src/main/resources/data/techreborn/advancements/futuretransformer.json new file mode 100644 index 000000000..9602b9d4f --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/futuretransformer.json @@ -0,0 +1,49 @@ +{ + "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": [ + { + "item": "techreborn:mv_transformer" + } + ] + } + }, + "hvtransformer": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:hv_transformer" + } + ] + } + }, + "evtransformer": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:ev_transformer" + } + ] + } + } + }, + "requirements": [ + ["mvtransformer", "hvtransformer","evtransformer"] + ] +} diff --git a/src/main/resources/data/techreborn/advancements/generator.json b/src/main/resources/data/techreborn/advancements/generator.json new file mode 100644 index 000000000..06320da28 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/generator.json @@ -0,0 +1,22 @@ +{ + "display": { + "icon": { + "item": "techreborn:solid_fuel_generator" + }, + "title": { + "translate": "advancements.techreborn.generator" + }, + "description": { + "translate": "advancements.techreborn.generator.desc" + } + }, + "parent": "techreborn:machineblock", + "criteria": { + "crit1": { + "trigger": "minecraft:placed_block", + "conditions": { + "block": "techreborn:solid_fuel_generator" + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/grinder.json b/src/main/resources/data/techreborn/advancements/grinder.json new file mode 100644 index 000000000..bb758c80e --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/grinder.json @@ -0,0 +1,26 @@ +{ + "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": [ + { + "item": "techreborn:grinder" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/implosion.json b/src/main/resources/data/techreborn/advancements/implosion.json new file mode 100644 index 000000000..26a95e98c --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/implosion.json @@ -0,0 +1,22 @@ +{ + "display": { + "icon": { + "item": "techreborn:implosion_compressor" + }, + "title": { + "translate": "advancements.techreborn.implosion" + }, + "description": { + "translate": "advancements.techreborn.implosion.desc" + } + }, + "parent": "techreborn:industrialgrinder", + "criteria": { + "crit1": { + "trigger": "minecraft:placed_block", + "conditions": { + "block": "techreborn:implosion_compressor" + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/industrialcentrifuge.json b/src/main/resources/data/techreborn/advancements/industrialcentrifuge.json new file mode 100644 index 000000000..9b5c0ade6 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/industrialcentrifuge.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:industrial_centrifuge" + }, + "title": { + "translate": "advancements.techreborn.industrialcentrifuge" + }, + "description": { + "translate": "advancements.techreborn.industrialcentrifuge.desc" + } + }, + "parent": "techreborn:advancedmachineblock", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:industrial_centrifuge" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/industrialgrinder.json b/src/main/resources/data/techreborn/advancements/industrialgrinder.json new file mode 100644 index 000000000..ce657aa3e --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/industrialgrinder.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:industrial_grinder" + }, + "title": { + "translate": "advancements.techreborn.industrialgrinder" + }, + "description": { + "translate": "advancements.techreborn.industrialgrinder.desc" + } + }, + "parent": "techreborn:blastfurnace", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:iridium_ingot" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/industrialmachineblock.json b/src/main/resources/data/techreborn/advancements/industrialmachineblock.json new file mode 100644 index 000000000..7fbf22d8d --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/industrialmachineblock.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:industrial_machine_frame" + }, + "title": { + "translate": "advancements.techreborn.industrialmachineblock" + }, + "description": { + "translate": "advancements.techreborn.industrialmachineblock.desc" + } + }, + "parent": "techreborn:advancedmachineblock", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:industrial_machine_frame" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/industrialsolar.json b/src/main/resources/data/techreborn/advancements/industrialsolar.json new file mode 100644 index 000000000..5da9ed723 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/industrialsolar.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:industrial_solar_panel" + }, + "title": { + "translate": "advancements.techreborn.industrialsolar" + }, + "description": { + "translate": "advancements.techreborn.industrialsolar.desc" + } + }, + "parent": "techreborn:advancedsolar", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:industrial_solar_panel" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/interdimensionalsu.json b/src/main/resources/data/techreborn/advancements/interdimensionalsu.json new file mode 100644 index 000000000..a7e12a52f --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/interdimensionalsu.json @@ -0,0 +1,23 @@ +{ + "display": { + "icon": { + "item": "techreborn:interdimensional_su" + }, + "title": { + "translate": "advancements.interdimensionalsu" + }, + "description": { + "translate": "advancements.techreborn.interdimensionalsu.desc" + }, + "frame": "challenge" + }, + "parent": "techreborn:mfsu", + "criteria": { + "crit1": { + "trigger": "minecraft:placed_block", + "conditions": { + "block": "techreborn:interdimensional_su" + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/ironalloyfurnace.json b/src/main/resources/data/techreborn/advancements/ironalloyfurnace.json new file mode 100644 index 000000000..8bd42d816 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/ironalloyfurnace.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:iron_alloy_furnace" + }, + "title": { + "translate": "advancements.techreborn.ironalloyfurnace" + }, + "description": { + "translate": "advancements.techreborn.ironalloyfurnace.desc" + } + }, + "parent": "techreborn:machineblock", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:iron_alloy_furnace" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/ironfurnace.json b/src/main/resources/data/techreborn/advancements/ironfurnace.json new file mode 100644 index 000000000..d6ec680d4 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/ironfurnace.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:iron_furnace" + }, + "title": { + "translate": "advancements.techreborn.ironfurnace" + }, + "description": { + "translate": "advancements.techreborn.ironfurnace.desc" + } + }, + "parent": "techreborn:machineblock", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:iron_furnace" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/lightningrod.json b/src/main/resources/data/techreborn/advancements/lightningrod.json new file mode 100644 index 000000000..0199345e6 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/lightningrod.json @@ -0,0 +1,22 @@ +{ + "display": { + "icon": { + "item": "techreborn:lightning_rod" + }, + "title": { + "translate": "advancements.techreborn.lightningrod" + }, + "description": { + "translate": "advancements.techreborn.lightningrod.desc" + } + }, + "parent": "techreborn:generator", + "criteria": { + "crit1": { + "trigger": "minecraft:placed_block", + "conditions": { + "block": "techreborn:lightning_rod" + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/lvtransformer.json b/src/main/resources/data/techreborn/advancements/lvtransformer.json new file mode 100644 index 000000000..cb0751de4 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/lvtransformer.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:lv_transformer" + }, + "title": { + "translate": "advancements.techreborn.lvtransformer" + }, + "description": { + "translate": "advancements.techreborn.lvtransformer.desc" + } + }, + "parent": "techreborn:batbox", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:lv_transformer" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/machineblock.json b/src/main/resources/data/techreborn/advancements/machineblock.json new file mode 100644 index 000000000..44705318a --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/machineblock.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:basic_machine_frame" + }, + "title": { + "translate": "advancements.techreborn.machineblock" + }, + "description": { + "translate": "advancements.techreborn.machineblock.desc" + } + }, + "parent": "techreborn:refined_iron", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:basic_machine_frame" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/matterfabricator.json b/src/main/resources/data/techreborn/advancements/matterfabricator.json new file mode 100644 index 000000000..decf7231b --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/matterfabricator.json @@ -0,0 +1,27 @@ +{ + "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": [ + { + "item": "techreborn:matter_fabricator" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/mfe.json b/src/main/resources/data/techreborn/advancements/mfe.json new file mode 100644 index 000000000..4abe71633 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/mfe.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:medium_voltage_su" + }, + "title": { + "translate": "advancements.techreborn.mfe" + }, + "description": { + "translate": "advancements.techreborn.mfe.desc" + } + }, + "parent": "techreborn:batbox", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:medium_voltage_su" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/mfsu.json b/src/main/resources/data/techreborn/advancements/mfsu.json new file mode 100644 index 000000000..efa4d30ca --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/mfsu.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:high_voltage_su" + }, + "title": { + "translate": "advancements.techreborn.mfsu" + }, + "description": { + "translate": "advancements.techreborn.mfsu.desc" + } + }, + "parent": "techreborn:mfe", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:high_voltage_su" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/nickeldust.json b/src/main/resources/data/techreborn/advancements/nickeldust.json new file mode 100644 index 000000000..eb749dac6 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/nickeldust.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:nickel_small_dust" + }, + "title": { + "translate": "advancements.techreborn.nickeldust" + }, + "description": { + "translate": "advancements.techreborn.nickeldust.desc" + } + }, + "parent": "techreborn:industrialcentrifuge", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:nickel_small_dust" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/nuke.json b/src/main/resources/data/techreborn/advancements/nuke.json new file mode 100644 index 000000000..f4282bc30 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/nuke.json @@ -0,0 +1,23 @@ +{ + "display": { + "icon": { + "item": "techreborn:nuke" + }, + "title": { + "translate": "advancements.techreborn.nuke" + }, + "description": { + "translate": "advancements.techreborn.nuke.desc" + }, + "hidden": true + }, + "parent": "techreborn:root", + "criteria": { + "crit1": { + "trigger": "minecraft:placed_block", + "conditions": { + "block": "techreborn:nuke" + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/quantumarmor.json b/src/main/resources/data/techreborn/advancements/quantumarmor.json new file mode 100644 index 000000000..23a6be5f3 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/quantumarmor.json @@ -0,0 +1,59 @@ +{ + "display": { + "icon": { + "item": "techreborn:quantum_chestplate" + }, + "title": { + "translate": "advancements.techreborn.quantumarmor" + }, + "description": { + "translate": "advancements.techreborn.quantumarmor.desc" + } + }, + "parent": "techreborn:implosion", + "criteria": { + "head": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:quantum_helmet" + } + ] + } + }, + "chest": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:quantum_chestplate" + } + ] + } + }, + "leg": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:quantum_leggings" + } + ] + } + }, + "feet": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:quantum_boots" + } + ] + } + } + }, + "requirements": [ + ["head", "chest","leg","feet"] + ] +} diff --git a/src/main/resources/data/techreborn/advancements/quantumsolar.json b/src/main/resources/data/techreborn/advancements/quantumsolar.json new file mode 100644 index 000000000..707bbdd0a --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/quantumsolar.json @@ -0,0 +1,23 @@ +{ + "display": { + "icon": { + "item": "techreborn:quantum_solar_panel" + }, + "title": { + "translate": "advancements.techreborn.quantumsolar" + }, + "description": { + "translate": "advancements.techreborn.quantumsolar.desc" + }, + "frame": "challenge" + }, + "parent": "techreborn:ultimatesolar", + "criteria": { + "crit1": { + "trigger": "minecraft:placed_block", + "conditions": { + "block": "techreborn:quantum_solar_panel" + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/recycler.json b/src/main/resources/data/techreborn/advancements/recycler.json new file mode 100644 index 000000000..2df0a15f1 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/recycler.json @@ -0,0 +1,22 @@ +{ + "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/refined_iron.json b/src/main/resources/data/techreborn/advancements/refined_iron.json new file mode 100644 index 000000000..047c7713a --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/refined_iron.json @@ -0,0 +1,27 @@ +{ + "display": { + "icon": { + "item": "techreborn:refined_iron_ingot" + }, + "title": { + "translate": "advancements.techreborn.refinediron" + }, + "description": { + "translate": "advancements.techreborn.refinediron.desc" + } + }, + "parent": "techreborn:root", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:refined_iron_ingot" + } + ] + } + } + } + } + \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/rollingmachine.json b/src/main/resources/data/techreborn/advancements/rollingmachine.json new file mode 100644 index 000000000..0f9991ef7 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/rollingmachine.json @@ -0,0 +1,26 @@ +{ + "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": [ + { + "item": "techreborn:rolling_machine" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/root.json b/src/main/resources/data/techreborn/advancements/root.json index c92d1acfd..0cfd25de3 100644 --- a/src/main/resources/data/techreborn/advancements/root.json +++ b/src/main/resources/data/techreborn/advancements/root.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "techreborn:copper_ore" + "item": "techreborn:manual" }, "title": { "translate": "advancements.techreborn.root" @@ -9,7 +9,7 @@ "description": { "translate": "advancements.techreborn.root.desc" }, - "background": "techreborn:textures/block/storage/lead_storage_block.png", + "background": "techreborn:textures/block/storage/steel_storage_block.png", "show_toast": true, "announce_to_chat": true }, @@ -33,6 +33,29 @@ } ] } + }, + "ore3_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:silver_ore" + } + ] + } + }, + "ore4_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:tin_ore" + } + ] + } } - } + }, + "requirements": [ + ["ore_in_inventory", "ore2_in_inventory","ore3_in_inventory", "ore4_in_inventory"] +] } diff --git a/src/main/resources/data/techreborn/advancements/rubber.json b/src/main/resources/data/techreborn/advancements/rubber.json new file mode 100644 index 000000000..1cc141af8 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/rubber.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:rubber" + }, + "title": { + "translate": "advancements.techreborn.rubber" + }, + "description": { + "translate": "advancements.techreborn.rubber.desc" + } + }, + "parent": "techreborn:sap", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:rubber" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/sap.json b/src/main/resources/data/techreborn/advancements/sap.json index 6f7a467cc..19df92fea 100644 --- a/src/main/resources/data/techreborn/advancements/sap.json +++ b/src/main/resources/data/techreborn/advancements/sap.json @@ -12,7 +12,7 @@ }, "parent": "techreborn:tree_tap", "criteria": { - "treetap_in_inventory": { + "crit1": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ diff --git a/src/main/resources/data/techreborn/advancements/scrapboxinator.json b/src/main/resources/data/techreborn/advancements/scrapboxinator.json new file mode 100644 index 000000000..cf59cf6ca --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/scrapboxinator.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:scrapboxinator" + }, + "title": { + "translate": "advancements.techreborn.scrapboxinator" + }, + "description": { + "translate": "advancements.techreborn.scrapboxinator.desc" + } + }, + "parent": "techreborn:recycler", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:scrapboxinator" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/thermalgenerator.json b/src/main/resources/data/techreborn/advancements/thermalgenerator.json new file mode 100644 index 000000000..905e1c064 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/thermalgenerator.json @@ -0,0 +1,26 @@ +{ + "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": [ + { + "item": "techreborn:thermal_generator" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/tree_tap.json b/src/main/resources/data/techreborn/advancements/tree_tap.json index d071dc5bd..0d4259576 100644 --- a/src/main/resources/data/techreborn/advancements/tree_tap.json +++ b/src/main/resources/data/techreborn/advancements/tree_tap.json @@ -12,7 +12,7 @@ }, "parent": "techreborn:root", "criteria": { - "treetap_in_inventory": { + "crit1": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ diff --git a/src/main/resources/data/techreborn/advancements/ultimatesolar.json b/src/main/resources/data/techreborn/advancements/ultimatesolar.json new file mode 100644 index 000000000..f1a621389 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/ultimatesolar.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "techreborn:ultimate_solar_panel" + }, + "title": { + "translate": "advancements.techreborn.ultimatesolar" + }, + "description": { + "translate": "advancements.techreborn.ultimatesolar.desc" + } + }, + "parent": "techreborn:industrialsolar", + "criteria": { + "crit1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:ultimate_solar_panel" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/upgrade.json b/src/main/resources/data/techreborn/advancements/upgrade.json new file mode 100644 index 000000000..0a3497feb --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/upgrade.json @@ -0,0 +1,59 @@ +{ + "display": { + "icon": { + "item": "techreborn:overclocker_upgrade" + }, + "title": { + "translate": "advancements.techreborn.upgrade" + }, + "description": { + "translate": "advancements.techreborn.upgrade.desc" + } + }, + "parent": "techreborn:coppercable", + "criteria": { + "overclocker": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:overclocker_upgrade" + } + ] + } + }, + "transformer": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:transformer_upgrade" + } + ] + } + }, + "energystorage": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:energy_storage_upgrade" + } + ] + } + }, + "superconductor": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "techreborn:superconductor_upgrade" + } + ] + } + } + }, + "requirements": [ + ["overclocker", "transformer","energystorage","superconductor"] + ] +} diff --git a/src/main/resources/data/techreborn/advancements/watermill.json b/src/main/resources/data/techreborn/advancements/watermill.json new file mode 100644 index 000000000..f016bc5d7 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/watermill.json @@ -0,0 +1,22 @@ +{ + "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/windmill.json b/src/main/resources/data/techreborn/advancements/windmill.json new file mode 100644 index 000000000..93e65e863 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/windmill.json @@ -0,0 +1,22 @@ +{ + "display": { + "icon": { + "item": "techreborn:wind_mill" + }, + "title": { + "translate": "advancements.techreborn.windmill" + }, + "description": { + "translate": "advancements.techreborn.windmill.desc" + } + }, + "parent": "techreborn:generator", + "criteria": { + "crit1": { + "trigger": "minecraft:placed_block", + "conditions": { + "block": "techreborn:wind_mill" + } + } + } +} diff --git a/src/main/resources/data/techreborn/advancements/wiremill.json b/src/main/resources/data/techreborn/advancements/wiremill.json new file mode 100644 index 000000000..8731072f8 --- /dev/null +++ b/src/main/resources/data/techreborn/advancements/wiremill.json @@ -0,0 +1,26 @@ +{ + "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": [ + { + "item": "techreborn:wire_mill" + } + ] + } + } + } +} diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/machine/alarm.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/alarm.json index 94b624e24..e815fb5ab 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/machine/alarm.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/machine/alarm.json @@ -16,7 +16,7 @@ "item": "techreborn:insulated_copper_cable" }, "I": { - "item": "minecraft:iron_ingot" + "item": "techreborn:refined_iron_ingot" } }, "result": { diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/machine/alloy_smelter.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/alloy_smelter.json index 1169dfa85..da474ee7a 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/machine/alloy_smelter.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/machine/alloy_smelter.json @@ -13,7 +13,7 @@ "item": "techreborn:electric_furnace" }, "M": { - "item": "techreborn:basic_machine_frame" + "item": "techreborn:iron_alloy_furnace" } }, "result": {