From 6bf2ad74cdde7fac2a42ab42fea2baf778aef9b8 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 5 Jul 2025 01:41:03 +0100 Subject: [PATCH] Mechanical press (#1243) * welcome back, mechanical press * EMI category order * langs * quests * emi categories * quests * greate stress settings for the mech press * I got distracted so I guess these are on this branch now * removed welding recipes from the pressurizer * recipe additions and changes for the mech press! * let's go gambling! * added flux to the mech press "welding" recipes --- .../quests/chapters/ore_processing.snbt | 26 ++++- .../quests/chapters/questssteam_age.snbt | 58 ++++++++--- defaultconfigs/greate-server.toml | 20 ++-- .../properties/ad_astra_oxygen_loading.json | 2 +- .../category/properties/ae2_attunement.json | 2 +- .../category/properties/ae2_condenser.json | 2 +- .../properties/ae2_item_transformation.json | 2 +- .../emi/category/properties/afc_tree_tap.json | 2 +- .../category/properties/create_deploying.json | 2 +- .../category/properties/create_draining.json | 2 +- .../properties/create_item_application.json | 2 +- .../properties/create_sequenced_assembly.json | 2 +- .../properties/create_spout_filling.json | 2 +- .../createaddition_liquid_burning.json | 2 +- .../properties/createaddition_rolling.json | 2 +- .../domum_ornamentum_architects_cutter.json | 2 +- .../emi/category/properties/emi_info.json | 2 +- .../emi/category/properties/emi_tag.json | 2 +- .../exposure_photograph_printing.json | 2 +- .../exposure_photograph_stacking.json | 2 +- .../properties/firmalife_bowl_pot.json | 2 +- .../category/properties/firmalife_drying.json | 2 +- .../properties/firmalife_mixing_bowl.json | 2 +- .../category/properties/firmalife_oven.json | 2 +- .../properties/firmalife_smoking.json | 2 +- .../properties/firmalife_stomping.json | 2 +- .../category/properties/firmalife_vat.json | 2 +- .../properties/framedblocks_framing_saw.json | 2 +- .../properties/greate_automatic_packing.json | 1 + .../properties/greate_automatic_shaped.json | 1 + .../greate_automatic_shapeless.json | 1 + .../properties/greate_block_cutting.json | 2 +- .../category/properties/greate_crushing.json | 2 +- .../properties/greate_fan_washing.json | 2 +- .../category/properties/greate_milling.json | 2 +- .../category/properties/greate_mixing.json | 2 +- .../category/properties/greate_packing.json | 2 +- .../category/properties/greate_pressing.json | 1 + .../category/properties/greate_sawing.json | 2 +- .../properties/gtceu_air_scrubber.json | 2 +- .../properties/gtceu_alloy_blast_smelter.json | 2 +- .../properties/gtceu_alloy_smelter.json | 2 +- .../properties/gtceu_aqueous_accumulator.json | 2 +- .../properties/gtceu_arc_furnace.json | 2 +- .../gtceu_arc_furnace_recycling.json | 2 +- .../category/properties/gtceu_assembler.json | 2 +- .../properties/gtceu_assembly_line.json | 2 +- .../category/properties/gtceu_autoclave.json | 2 +- .../emi/category/properties/gtceu_bender.json | 2 +- .../category/properties/gtceu_brewery.json | 2 +- .../emi/category/properties/gtceu_canner.json | 2 +- .../category/properties/gtceu_centrifuge.json | 2 +- .../category/properties/gtceu_chem_dyes.json | 2 +- .../properties/gtceu_chemical_bath.json | 2 +- .../properties/gtceu_chemical_reactor.json | 2 +- .../properties/gtceu_circuit_assembler.json | 2 +- .../category/properties/gtceu_coke_oven.json | 2 +- .../gtceu_combustion_generator.json | 2 +- .../category/properties/gtceu_compressor.json | 2 +- .../category/properties/gtceu_cracker.json | 2 +- .../emi/category/properties/gtceu_cutter.json | 2 +- .../properties/gtceu_distillation_tower.json | 2 +- .../category/properties/gtceu_distillery.json | 2 +- .../gtceu_electric_blast_furnace.json | 2 +- .../properties/gtceu_electrolyzer.json | 2 +- .../gtceu_electromagnetic_separator.json | 2 +- .../category/properties/gtceu_end_dome.json | 2 +- .../properties/gtceu_evaporation.json | 2 +- .../category/properties/gtceu_extractor.json | 2 +- .../properties/gtceu_extractor_recycling.json | 2 +- .../category/properties/gtceu_extruder.json | 2 +- .../category/properties/gtceu_fermenter.json | 2 +- .../properties/gtceu_fluid_heater.json | 2 +- .../properties/gtceu_fluid_solidifier.json | 2 +- .../category/properties/gtceu_food_oven.json | 2 +- .../properties/gtceu_food_processor.json | 2 +- .../properties/gtceu_forge_hammer.json | 2 +- .../properties/gtceu_forming_press.json | 2 +- .../properties/gtceu_fusion_reactor.json | 2 +- .../properties/gtceu_gas_collector.json | 2 +- .../properties/gtceu_gas_turbine.json | 2 +- .../category/properties/gtceu_greenhouse.json | 2 +- .../gtceu_implosion_compressor.json | 2 +- .../properties/gtceu_ingot_molding.json | 2 +- .../properties/gtceu_large_boiler.json | 2 +- .../gtceu_large_chemical_reactor.json | 2 +- .../properties/gtceu_laser_engraver.json | 2 +- .../emi/category/properties/gtceu_lathe.json | 2 +- .../category/properties/gtceu_macerator.json | 2 +- .../properties/gtceu_macerator_recycling.json | 2 +- .../emi/category/properties/gtceu_mixer.json | 2 +- .../properties/gtceu_nether_dome.json | 2 +- .../properties/gtceu_ore_bathing.json | 2 +- .../properties/gtceu_ore_crushing.json | 2 +- .../properties/gtceu_ore_forging.json | 2 +- .../category/properties/gtceu_ore_washer.json | 2 +- .../emi/category/properties/gtceu_packer.json | 2 +- .../properties/gtceu_plasma_generator.json | 2 +- .../category/properties/gtceu_polarizer.json | 2 +- .../properties/gtceu_programmed_circuit.json | 2 +- .../properties/gtceu_pyrolyse_oven.json | 2 +- .../properties/gtceu_research_station.json | 2 +- .../properties/gtceu_rock_breaker.json | 2 +- .../category/properties/gtceu_scanner.json | 2 +- .../emi/category/properties/gtceu_sifter.json | 2 +- .../properties/gtceu_steam_bloomery.json | 2 +- .../properties/gtceu_steam_boiler.json | 2 +- .../properties/gtceu_steam_turbine.json | 2 +- .../properties/gtceu_thermal_centrifuge.json | 2 +- .../properties/gtceu_vacuum_freezer.json | 2 +- .../properties/gtceu_wire_coating.json | 2 +- .../category/properties/gtceu_wiremill.json | 2 +- .../properties/minecraft_smelting.json | 2 +- .../properties/minecraft_smithing.json | 2 +- .../properties/minecraft_stonecutting.json | 2 +- .../category/properties/rnr_block_mod.json | 2 +- .../emi/category/properties/rnr_mattock.json | 2 +- .../emi/category/properties/tfc_alloying.json | 2 +- .../properties/tfc_blast_furnace.json | 2 +- .../emi/category/properties/tfc_bloomery.json | 2 +- .../emi/category/properties/tfc_chisel.json | 2 +- .../category/properties/tfc_glassworking.json | 2 +- .../properties/tfc_instant_barrel.json | 2 +- .../properties/tfc_instant_fluid_barrel.json | 2 +- .../emi/category/properties/tfc_jam_pot.json | 2 +- .../emi/category/properties/tfc_loom.json | 2 +- .../emi/category/properties/tfc_scraping.json | 2 +- .../properties/tfc_sealed_barrel.json | 2 +- .../emi/category/properties/tfc_sewing.json | 2 +- .../category/properties/tfc_simple_pot.json | 2 +- .../emi/category/properties/tfc_soup_pot.json | 2 +- .../vintageimprovements_centrifugation.json | 2 +- .../vintageimprovements_coiling.json | 2 +- .../vintageimprovements_curving.json | 2 +- .../vintageimprovements_hammering.json | 2 +- .../vintageimprovements_laser_cutting.json | 2 +- .../vintageimprovements_pressurizing.json | 2 +- .../vintageimprovements_turning.json | 2 +- .../vintageimprovements_vacuumizing.json | 2 +- .../vintageimprovements_vibrating.json | 2 +- .../assets/emi/recipe/filters/categories.json | 18 +--- kubejs/assets/greate/lang/en_us.json | 1 + kubejs/assets/tfg/lang/en_us.json | 6 ++ kubejs/server_scripts/greate/recipes.js | 72 +++++++++++++- .../greate/recipes.recycling.js | 76 +++++++++++++++ .../server_scripts/greate/recipes.removes.js | 4 +- kubejs/server_scripts/gregtech/recipes.js | 4 + .../gregtech/recipes.materials.js | 96 +++++++++++++++---- kubejs/server_scripts/main_server_script.js | 4 + kubejs/server_scripts/minecraft/recipes.js | 5 + kubejs/server_scripts/railways/recipes.js | 16 ++-- .../server_scripts/tfc/recipes.materials.js | 40 ++++++++ kubejs/server_scripts/tfc/recipes.metals.js | 5 + kubejs/server_scripts/tfc/recipes.sand.js | 67 ++++++++++--- kubejs/server_scripts/tfc/recipes.stone.js | 12 +++ kubejs/server_scripts/tfg/recipes.paper.js | 5 +- kubejs/server_scripts/tfg/recipes.rocks.js | 8 ++ kubejs/server_scripts/tfg/tags.js | 11 ++- .../vintage_improvements/recipes.js | 58 +---------- kubejs/startup_scripts/greate/constants.js | 7 -- kubejs/startup_scripts/gtceu/constants.js | 14 +++ 161 files changed, 623 insertions(+), 280 deletions(-) create mode 100644 kubejs/assets/emi/category/properties/greate_automatic_packing.json create mode 100644 kubejs/assets/emi/category/properties/greate_automatic_shaped.json create mode 100644 kubejs/assets/emi/category/properties/greate_automatic_shapeless.json create mode 100644 kubejs/assets/emi/category/properties/greate_pressing.json diff --git a/config/ftbquests/quests/chapters/ore_processing.snbt b/config/ftbquests/quests/chapters/ore_processing.snbt index a394909b5..c1fd933ba 100644 --- a/config/ftbquests/quests/chapters/ore_processing.snbt +++ b/config/ftbquests/quests/chapters/ore_processing.snbt @@ -43,7 +43,7 @@ image: "ftblibrary:icons/star" rotation: 0.0d width: 1.0d - x: -5.5d + x: -6.0d y: -13.5d } { @@ -68,7 +68,7 @@ { id: "2425C5C5109FD90C" linked_quest: "48C1E980F7D64317" - x: -6.0d + x: -6.5d y: -13.0d } { @@ -90,7 +90,7 @@ { id: "098E410F9E564854" linked_quest: "5E4FC017E09ACF44" - x: -6.0d + x: -6.5d y: -11.0d } { @@ -1083,6 +1083,26 @@ x: -3.5d y: -0.5d } + { + id: "52CC0FDEC6F52F72" + tasks: [{ + id: "18ECFC0526668CCC" + item: "greate:andesite_alloy_mechanical_press" + type: "item" + }] + x: -5.5d + y: -13.0d + } + { + id: "60FCEC93B383D3C2" + tasks: [{ + id: "40BA8140472A905A" + item: "greate:steel_mechanical_press" + type: "item" + }] + x: -5.5d + y: -11.0d + } ] subtitle: ["{quests.ore_proc.subtitle}"] title: "{quests.ore_proc}" diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index e28ede01a..a10d9cc59 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -10,7 +10,7 @@ { id: "39027CF4DC307D33" linked_quest: "5E186CD5E83BFDF0" - x: -27.0d + x: -29.0d y: 2.0d } { @@ -31,7 +31,7 @@ linked_quest: "48A8E3210B2BAE1C" shape: "octagon" size: 2.0d - x: -27.0d + x: -29.0d y: 0.0d } ] @@ -48,7 +48,7 @@ type: "item" }] title: "{quests.steam_age.basic_millstone.title}" - x: -18.0d + x: -19.5d y: 0.0d } { @@ -66,7 +66,7 @@ type: "item" }] title: "{quests.steam_age.horse_crank.title}" - x: -22.0d + x: -23.5d y: -2.0d } { @@ -81,7 +81,7 @@ type: "item" }] title: "{quests.steam_age.helve_hammer.title}" - x: -18.0d + x: -19.5d y: -4.0d } { @@ -109,7 +109,7 @@ } ] title: "{quests.steam_age.basic_greate.title}" - x: -18.0d + x: -19.5d y: -2.0d } { @@ -1126,7 +1126,7 @@ } ] title: "{quests.steam_age.create_tools.title}" - x: -20.0d + x: -21.5d y: -4.0d } { @@ -1243,7 +1243,7 @@ } ] title: "{quests.steam_age.poor_paths.title}" - x: -23.5d + x: -25.0d y: -3.5d } { @@ -1294,7 +1294,7 @@ } ] title: "{quests.steam_age.normal_paths.title}" - x: -24.0d + x: -25.5d y: -2.0d } { @@ -1347,7 +1347,7 @@ } ] title: "{quests.steam_age.good_paths.title}" - x: -23.5d + x: -25.0d y: -0.5d } { @@ -1408,7 +1408,7 @@ type: "item" }] title: "{quests.metal_age.bronze_goodies.title}" - x: -20.0d + x: -21.5d y: -2.0d } { @@ -1602,6 +1602,42 @@ x: -22.0d y: 17.0d } + { + dependencies: ["7B045998769930F0"] + description: ["{quests.steam_age.basic_mech_press.desc}"] + id: "14710C5B4981CECC" + optional: true + shape: "heart" + subtitle: "{quests.steam_age.basic_mech_press.subtitle}" + tasks: [{ + id: "2F89D6D6745465DC" + item: "greate:andesite_alloy_mechanical_press" + type: "item" + }] + title: "{quests.steam_age.basic_mech_press.title}" + x: -17.5d + y: -2.0d + } + { + dependencies: ["09D913288896A67A"] + description: [ + "{quests.steam_age.steel_mech_press.desc.1}" + "{@pagebreak}" + "{quests.steam_age.steel_mech_press.desc.2}" + ] + id: "0D39D83AA5F9D543" + optional: true + shape: "heart" + subtitle: "{quests.steam_age.steel_mech_press.subtitle}" + tasks: [{ + id: "32E30B6AC780CAF1" + item: "greate:steel_mechanical_press" + type: "item" + }] + title: "{quests.steam_age.steel_mech_press.title}" + x: -7.5d + y: 4.0d + } ] subtitle: ["{quests.steam_age.subtitle}"] title: "{quests.steam_age}" diff --git a/defaultconfigs/greate-server.toml b/defaultconfigs/greate-server.toml index 6ffe2115a..a32cdb429 100644 --- a/defaultconfigs/greate-server.toml +++ b/defaultconfigs/greate-server.toml @@ -76,7 +76,7 @@ fanSpeedMultiplier = 0.75 andesite_alloy_crushing_wheel = 0.5 andesite_alloy_encased_fan = 0.5 andesite_alloy_gearbox = 0.0 - andesite_alloy_mechanical_press = 1.0 + andesite_alloy_mechanical_press = 0.5 andesite_alloy_mechanical_mixer = 0.5 andesite_alloy_millstone = 0.5 andesite_alloy_mechanical_saw = 0.5 @@ -95,7 +95,7 @@ fanSpeedMultiplier = 0.75 steel_crushing_wheel = 1.0 steel_encased_fan = 1.0 steel_gearbox = 0.0 - steel_mechanical_press = 2.0 + steel_mechanical_press = 1.0 steel_mechanical_mixer = 1.0 steel_millstone = 1.0 steel_mechanical_saw = 1.0 @@ -114,7 +114,7 @@ fanSpeedMultiplier = 0.75 aluminium_crushing_wheel = 1.5 aluminium_encased_fan = 1.5 aluminium_gearbox = 0.0 - aluminium_mechanical_press = 3.0 + aluminium_mechanical_press = 1.5 aluminium_mechanical_mixer = 1.5 aluminium_millstone = 1.5 aluminium_mechanical_saw = 1.5 @@ -133,7 +133,7 @@ fanSpeedMultiplier = 0.75 stainless_steel_crushing_wheel = 2.0 stainless_steel_encased_fan = 2.0 stainless_steel_gearbox = 0.0 - stainless_steel_mechanical_press = 4.0 + stainless_steel_mechanical_press = 2.0 stainless_steel_mechanical_mixer = 2.0 stainless_steel_millstone = 2.0 stainless_steel_mechanical_saw = 2.0 @@ -152,7 +152,7 @@ fanSpeedMultiplier = 0.75 titanium_crushing_wheel = 2.5 titanium_encased_fan = 2.5 titanium_gearbox = 0.0 - titanium_mechanical_press = 5.0 + titanium_mechanical_press = 2.5 titanium_mechanical_mixer = 2.5 titanium_millstone = 2.5 titanium_mechanical_saw = 2.5 @@ -171,7 +171,7 @@ fanSpeedMultiplier = 0.75 tungsten_steel_crushing_wheel = 3.0 tungsten_steel_encased_fan = 3.0 tungsten_steel_gearbox = 0.0 - tungsten_steel_mechanical_press = 6.0 + tungsten_steel_mechanical_press = 3.0 tungsten_steel_mechanical_mixer = 3.0 tungsten_steel_millstone = 3.0 tungsten_steel_mechanical_saw = 3.0 @@ -190,7 +190,7 @@ fanSpeedMultiplier = 0.75 rhodium_plated_palladium_crushing_wheel = 3.5 rhodium_plated_palladium_encased_fan = 3.5 rhodium_plated_palladium_gearbox = 0.0 - rhodium_plated_palladium_mechanical_press = 7.0 + rhodium_plated_palladium_mechanical_press = 3.5 rhodium_plated_palladium_mechanical_mixer = 3.5 rhodium_plated_palladium_millstone = 3.5 rhodium_plated_palladium_mechanical_saw = 3.5 @@ -209,7 +209,7 @@ fanSpeedMultiplier = 0.75 naquadah_alloy_crushing_wheel = 4.0 naquadah_alloy_encased_fan = 4.0 naquadah_alloy_gearbox = 0.0 - naquadah_alloy_mechanical_press = 8.0 + naquadah_alloy_mechanical_press = 4.0 naquadah_alloy_mechanical_mixer = 4.0 naquadah_alloy_millstone = 4.0 naquadah_alloy_mechanical_saw = 4.0 @@ -228,7 +228,7 @@ fanSpeedMultiplier = 0.75 darmstadtium_crushing_wheel = 4.5 darmstadtium_encased_fan = 4.5 darmstadtium_gearbox = 0.0 - darmstadtium_mechanical_press = 9.0 + darmstadtium_mechanical_press = 4.5 darmstadtium_mechanical_mixer = 4.5 darmstadtium_millstone = 4.5 darmstadtium_mechanical_saw = 4.5 @@ -247,7 +247,7 @@ fanSpeedMultiplier = 0.75 neutronium_crushing_wheel = 5.0 neutronium_encased_fan = 5.6 neutronium_gearbox = 0.0 - neutronium_mechanical_press = 10.0 + neutronium_mechanical_press = 5.0 neutronium_mechanical_mixer = 5.0 neutronium_millstone = 5.0 neutronium_mechanical_saw = 5.0 diff --git a/kubejs/assets/emi/category/properties/ad_astra_oxygen_loading.json b/kubejs/assets/emi/category/properties/ad_astra_oxygen_loading.json index 6e601f61b..cee391e1c 100644 --- a/kubejs/assets/emi/category/properties/ad_astra_oxygen_loading.json +++ b/kubejs/assets/emi/category/properties/ad_astra_oxygen_loading.json @@ -1 +1 @@ -{"ad_astra:oxygen_loading":{"order":147}} \ No newline at end of file +{"ad_astra:oxygen_loading":{"order":151}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_attunement.json b/kubejs/assets/emi/category/properties/ae2_attunement.json index 79e94084b..f24d651fc 100644 --- a/kubejs/assets/emi/category/properties/ae2_attunement.json +++ b/kubejs/assets/emi/category/properties/ae2_attunement.json @@ -1 +1 @@ -{"ae2:attunement":{"order":144}} \ No newline at end of file +{"ae2:attunement":{"order":148}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_condenser.json b/kubejs/assets/emi/category/properties/ae2_condenser.json index 55709d511..4ece3c574 100644 --- a/kubejs/assets/emi/category/properties/ae2_condenser.json +++ b/kubejs/assets/emi/category/properties/ae2_condenser.json @@ -1 +1 @@ -{"ae2:condenser":{"order":136}} \ No newline at end of file +{"ae2:condenser":{"order":138}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_item_transformation.json b/kubejs/assets/emi/category/properties/ae2_item_transformation.json index d886ae041..bb8c87c1a 100644 --- a/kubejs/assets/emi/category/properties/ae2_item_transformation.json +++ b/kubejs/assets/emi/category/properties/ae2_item_transformation.json @@ -1 +1 @@ -{"ae2:item_transformation":{"order":125}} \ No newline at end of file +{"ae2:item_transformation":{"order":127}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/afc_tree_tap.json b/kubejs/assets/emi/category/properties/afc_tree_tap.json index 99cc1f2c7..ab23965dc 100644 --- a/kubejs/assets/emi/category/properties/afc_tree_tap.json +++ b/kubejs/assets/emi/category/properties/afc_tree_tap.json @@ -1 +1 @@ -{"afc:tree_tap":{"order":26}} \ No newline at end of file +{"afc:tree_tap":{"order":27}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_deploying.json b/kubejs/assets/emi/category/properties/create_deploying.json index c346f70db..32b1450b1 100644 --- a/kubejs/assets/emi/category/properties/create_deploying.json +++ b/kubejs/assets/emi/category/properties/create_deploying.json @@ -1 +1 @@ -{"create:deploying":{"order":46}} \ No newline at end of file +{"create:deploying":{"order":47}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_draining.json b/kubejs/assets/emi/category/properties/create_draining.json index 88abcedb6..b13dc4816 100644 --- a/kubejs/assets/emi/category/properties/create_draining.json +++ b/kubejs/assets/emi/category/properties/create_draining.json @@ -1 +1 @@ -{"create:draining":{"order":145}} \ No newline at end of file +{"create:draining":{"order":149}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_item_application.json b/kubejs/assets/emi/category/properties/create_item_application.json index 2ddac5252..4bc4d243d 100644 --- a/kubejs/assets/emi/category/properties/create_item_application.json +++ b/kubejs/assets/emi/category/properties/create_item_application.json @@ -1 +1 @@ -{"create:item_application":{"order":47}} \ No newline at end of file +{"create:item_application":{"order":48}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_sequenced_assembly.json b/kubejs/assets/emi/category/properties/create_sequenced_assembly.json index 4a418c8b0..5d3fcf43d 100644 --- a/kubejs/assets/emi/category/properties/create_sequenced_assembly.json +++ b/kubejs/assets/emi/category/properties/create_sequenced_assembly.json @@ -1 +1 @@ -{"create:sequenced_assembly":{"order":48}} \ No newline at end of file +{"create:sequenced_assembly":{"order":49}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_spout_filling.json b/kubejs/assets/emi/category/properties/create_spout_filling.json index e2584bc76..d400de717 100644 --- a/kubejs/assets/emi/category/properties/create_spout_filling.json +++ b/kubejs/assets/emi/category/properties/create_spout_filling.json @@ -1 +1 @@ -{"create:spout_filling":{"order":146}} \ No newline at end of file +{"create:spout_filling":{"order":150}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/createaddition_liquid_burning.json b/kubejs/assets/emi/category/properties/createaddition_liquid_burning.json index 7e6d42485..b05261cc5 100644 --- a/kubejs/assets/emi/category/properties/createaddition_liquid_burning.json +++ b/kubejs/assets/emi/category/properties/createaddition_liquid_burning.json @@ -1 +1 @@ -{"createaddition:liquid_burning":{"order":52}} \ No newline at end of file +{"createaddition:liquid_burning":{"order":53}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/createaddition_rolling.json b/kubejs/assets/emi/category/properties/createaddition_rolling.json index 408a79d96..cb571efa5 100644 --- a/kubejs/assets/emi/category/properties/createaddition_rolling.json +++ b/kubejs/assets/emi/category/properties/createaddition_rolling.json @@ -1 +1 @@ -{"createaddition:rolling":{"order":64}} \ No newline at end of file +{"createaddition:rolling":{"order":65}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json b/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json index 62dd1f528..d446591b6 100644 --- a/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json +++ b/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json @@ -1 +1 @@ -{"domum_ornamentum:architects_cutter":{"order":143}} \ No newline at end of file +{"domum_ornamentum:architects_cutter":{"order":147}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/emi_info.json b/kubejs/assets/emi/category/properties/emi_info.json index 4fc8be2fb..79a9076c7 100644 --- a/kubejs/assets/emi/category/properties/emi_info.json +++ b/kubejs/assets/emi/category/properties/emi_info.json @@ -1 +1 @@ -{"emi:info":{"order":150}} \ No newline at end of file +{"emi:info":{"order":154}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/emi_tag.json b/kubejs/assets/emi/category/properties/emi_tag.json index 5730e1502..f412abf9a 100644 --- a/kubejs/assets/emi/category/properties/emi_tag.json +++ b/kubejs/assets/emi/category/properties/emi_tag.json @@ -1 +1 @@ -{"emi:tag":{"order":151}} \ No newline at end of file +{"emi:tag":{"order":155}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/exposure_photograph_printing.json b/kubejs/assets/emi/category/properties/exposure_photograph_printing.json index 1e17c9b88..a8f5cb23f 100644 --- a/kubejs/assets/emi/category/properties/exposure_photograph_printing.json +++ b/kubejs/assets/emi/category/properties/exposure_photograph_printing.json @@ -1 +1 @@ -{"exposure:photograph_printing":{"order":139}} \ No newline at end of file +{"exposure:photograph_printing":{"order":143}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json b/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json index 8247b9b13..74c22ca3e 100644 --- a/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json +++ b/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json @@ -1 +1 @@ -{"exposure:photograph_stacking":{"order":148}} \ No newline at end of file +{"exposure:photograph_stacking":{"order":152}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json b/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json index 21732e96a..de1c7c0db 100644 --- a/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json +++ b/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json @@ -1 +1 @@ -{"firmalife:bowl_pot":{"order":40}} \ No newline at end of file +{"firmalife:bowl_pot":{"order":41}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_drying.json b/kubejs/assets/emi/category/properties/firmalife_drying.json index 24e2a8869..7284482a0 100644 --- a/kubejs/assets/emi/category/properties/firmalife_drying.json +++ b/kubejs/assets/emi/category/properties/firmalife_drying.json @@ -1 +1 @@ -{"firmalife:drying":{"order":32}} \ No newline at end of file +{"firmalife:drying":{"order":33}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json b/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json index 3bacad063..c505ce569 100644 --- a/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json +++ b/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json @@ -1 +1 @@ -{"firmalife:mixing_bowl":{"order":33}} \ No newline at end of file +{"firmalife:mixing_bowl":{"order":34}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_oven.json b/kubejs/assets/emi/category/properties/firmalife_oven.json index 198efc2fd..5b4030d19 100644 --- a/kubejs/assets/emi/category/properties/firmalife_oven.json +++ b/kubejs/assets/emi/category/properties/firmalife_oven.json @@ -1 +1 @@ -{"firmalife:oven":{"order":34}} \ No newline at end of file +{"firmalife:oven":{"order":35}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_smoking.json b/kubejs/assets/emi/category/properties/firmalife_smoking.json index 3f3b33f22..a2d115ff3 100644 --- a/kubejs/assets/emi/category/properties/firmalife_smoking.json +++ b/kubejs/assets/emi/category/properties/firmalife_smoking.json @@ -1 +1 @@ -{"firmalife:smoking":{"order":36}} \ No newline at end of file +{"firmalife:smoking":{"order":37}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_stomping.json b/kubejs/assets/emi/category/properties/firmalife_stomping.json index 2fb178a6d..eacfe5020 100644 --- a/kubejs/assets/emi/category/properties/firmalife_stomping.json +++ b/kubejs/assets/emi/category/properties/firmalife_stomping.json @@ -1 +1 @@ -{"firmalife:stomping":{"order":42}} \ No newline at end of file +{"firmalife:stomping":{"order":43}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_vat.json b/kubejs/assets/emi/category/properties/firmalife_vat.json index 5a9fba614..d7b27b6e1 100644 --- a/kubejs/assets/emi/category/properties/firmalife_vat.json +++ b/kubejs/assets/emi/category/properties/firmalife_vat.json @@ -1 +1 @@ -{"firmalife:vat":{"order":41}} \ No newline at end of file +{"firmalife:vat":{"order":42}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json b/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json index a03b39261..f12cef18b 100644 --- a/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json +++ b/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json @@ -1 +1 @@ -{"framedblocks:framing_saw":{"order":142}} \ No newline at end of file +{"framedblocks:framing_saw":{"order":146}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_automatic_packing.json b/kubejs/assets/emi/category/properties/greate_automatic_packing.json new file mode 100644 index 000000000..ebc54701e --- /dev/null +++ b/kubejs/assets/emi/category/properties/greate_automatic_packing.json @@ -0,0 +1 @@ +{"greate:automatic_packing":{"order":141}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_automatic_shaped.json b/kubejs/assets/emi/category/properties/greate_automatic_shaped.json new file mode 100644 index 000000000..b8f009c1f --- /dev/null +++ b/kubejs/assets/emi/category/properties/greate_automatic_shaped.json @@ -0,0 +1 @@ +{"greate:automatic_shaped":{"order":139}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json b/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json new file mode 100644 index 000000000..58bcb845a --- /dev/null +++ b/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json @@ -0,0 +1 @@ +{"greate:automatic_shapeless":{"order":140}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_block_cutting.json b/kubejs/assets/emi/category/properties/greate_block_cutting.json index f65f896df..411db4e50 100644 --- a/kubejs/assets/emi/category/properties/greate_block_cutting.json +++ b/kubejs/assets/emi/category/properties/greate_block_cutting.json @@ -1 +1 @@ -{"greate:block_cutting":{"order":141}} \ No newline at end of file +{"greate:block_cutting":{"order":145}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_crushing.json b/kubejs/assets/emi/category/properties/greate_crushing.json index d38db4d30..fa49344ea 100644 --- a/kubejs/assets/emi/category/properties/greate_crushing.json +++ b/kubejs/assets/emi/category/properties/greate_crushing.json @@ -1 +1 @@ -{"greate:crushing":{"order":97}} \ No newline at end of file +{"greate:crushing":{"order":99}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_fan_washing.json b/kubejs/assets/emi/category/properties/greate_fan_washing.json index 8a33b662f..395f89c79 100644 --- a/kubejs/assets/emi/category/properties/greate_fan_washing.json +++ b/kubejs/assets/emi/category/properties/greate_fan_washing.json @@ -1 +1 @@ -{"greate:fan_washing":{"order":127}} \ No newline at end of file +{"greate:fan_washing":{"order":129}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_milling.json b/kubejs/assets/emi/category/properties/greate_milling.json index e09227d71..b817a9652 100644 --- a/kubejs/assets/emi/category/properties/greate_milling.json +++ b/kubejs/assets/emi/category/properties/greate_milling.json @@ -1 +1 @@ -{"greate:milling":{"order":96}} \ No newline at end of file +{"greate:milling":{"order":98}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_mixing.json b/kubejs/assets/emi/category/properties/greate_mixing.json index 483095d85..1dfd32cb7 100644 --- a/kubejs/assets/emi/category/properties/greate_mixing.json +++ b/kubejs/assets/emi/category/properties/greate_mixing.json @@ -1 +1 @@ -{"greate:mixing":{"order":99}} \ No newline at end of file +{"greate:mixing":{"order":101}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_packing.json b/kubejs/assets/emi/category/properties/greate_packing.json index 3c4f1b587..ac2022597 100644 --- a/kubejs/assets/emi/category/properties/greate_packing.json +++ b/kubejs/assets/emi/category/properties/greate_packing.json @@ -1 +1 @@ -{"greate:packing":{"order":137}} \ No newline at end of file +{"greate:packing":{"order":19}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_pressing.json b/kubejs/assets/emi/category/properties/greate_pressing.json new file mode 100644 index 000000000..1389b8de4 --- /dev/null +++ b/kubejs/assets/emi/category/properties/greate_pressing.json @@ -0,0 +1 @@ +{"greate:pressing":{"order":90}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_sawing.json b/kubejs/assets/emi/category/properties/greate_sawing.json index fec168c7c..6ddd99b3b 100644 --- a/kubejs/assets/emi/category/properties/greate_sawing.json +++ b/kubejs/assets/emi/category/properties/greate_sawing.json @@ -1 +1 @@ -{"greate:sawing":{"order":76}} \ No newline at end of file +{"greate:sawing":{"order":77}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json b/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json index 0043e3842..f87da1987 100644 --- a/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json +++ b/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json @@ -1 +1 @@ -{"gtceu:air_scrubber":{"order":58}} \ No newline at end of file +{"gtceu:air_scrubber":{"order":59}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json b/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json index b602f5839..eb71fa63a 100644 --- a/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json +++ b/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json @@ -1 +1 @@ -{"gtceu:alloy_blast_smelter":{"order":110}} \ No newline at end of file +{"gtceu:alloy_blast_smelter":{"order":112}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json b/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json index 14bc86d0e..229dc3a49 100644 --- a/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json +++ b/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json @@ -1 +1 @@ -{"gtceu:alloy_smelter":{"order":59}} \ No newline at end of file +{"gtceu:alloy_smelter":{"order":60}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json b/kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json index be515b003..25899c907 100644 --- a/kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json +++ b/kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json @@ -1 +1 @@ -{"gtceu:aqueous_accumulator":{"order":60}} \ No newline at end of file +{"gtceu:aqueous_accumulator":{"order":61}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json b/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json index de61f583b..d4575ce4c 100644 --- a/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json +++ b/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json @@ -1 +1 @@ -{"gtceu:arc_furnace":{"order":61}} \ No newline at end of file +{"gtceu:arc_furnace":{"order":62}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json b/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json index 53fab6bcc..6db63dbeb 100644 --- a/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json +++ b/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json @@ -1 +1 @@ -{"gtceu:arc_furnace_recycling":{"order":133}} \ No newline at end of file +{"gtceu:arc_furnace_recycling":{"order":135}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_assembler.json b/kubejs/assets/emi/category/properties/gtceu_assembler.json index 81ca4e126..a84815ac0 100644 --- a/kubejs/assets/emi/category/properties/gtceu_assembler.json +++ b/kubejs/assets/emi/category/properties/gtceu_assembler.json @@ -1 +1 @@ -{"gtceu:assembler":{"order":62}} \ No newline at end of file +{"gtceu:assembler":{"order":63}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_assembly_line.json b/kubejs/assets/emi/category/properties/gtceu_assembly_line.json index f946a78bf..f24693562 100644 --- a/kubejs/assets/emi/category/properties/gtceu_assembly_line.json +++ b/kubejs/assets/emi/category/properties/gtceu_assembly_line.json @@ -1 +1 @@ -{"gtceu:assembly_line":{"order":111}} \ No newline at end of file +{"gtceu:assembly_line":{"order":113}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_autoclave.json b/kubejs/assets/emi/category/properties/gtceu_autoclave.json index 9cd47ab06..123ab2c48 100644 --- a/kubejs/assets/emi/category/properties/gtceu_autoclave.json +++ b/kubejs/assets/emi/category/properties/gtceu_autoclave.json @@ -1 +1 @@ -{"gtceu:autoclave":{"order":63}} \ No newline at end of file +{"gtceu:autoclave":{"order":64}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_bender.json b/kubejs/assets/emi/category/properties/gtceu_bender.json index 55ab47b31..c89ff2705 100644 --- a/kubejs/assets/emi/category/properties/gtceu_bender.json +++ b/kubejs/assets/emi/category/properties/gtceu_bender.json @@ -1 +1 @@ -{"gtceu:bender":{"order":66}} \ No newline at end of file +{"gtceu:bender":{"order":67}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_brewery.json b/kubejs/assets/emi/category/properties/gtceu_brewery.json index 0ed5593f9..a5ccaee88 100644 --- a/kubejs/assets/emi/category/properties/gtceu_brewery.json +++ b/kubejs/assets/emi/category/properties/gtceu_brewery.json @@ -1 +1 @@ -{"gtceu:brewery":{"order":67}} \ No newline at end of file +{"gtceu:brewery":{"order":68}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_canner.json b/kubejs/assets/emi/category/properties/gtceu_canner.json index b44ece286..a88138df0 100644 --- a/kubejs/assets/emi/category/properties/gtceu_canner.json +++ b/kubejs/assets/emi/category/properties/gtceu_canner.json @@ -1 +1 @@ -{"gtceu:canner":{"order":68}} \ No newline at end of file +{"gtceu:canner":{"order":69}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_centrifuge.json b/kubejs/assets/emi/category/properties/gtceu_centrifuge.json index d9af14569..a135ee2e3 100644 --- a/kubejs/assets/emi/category/properties/gtceu_centrifuge.json +++ b/kubejs/assets/emi/category/properties/gtceu_centrifuge.json @@ -1 +1 @@ -{"gtceu:centrifuge":{"order":70}} \ No newline at end of file +{"gtceu:centrifuge":{"order":71}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json b/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json index ac0ad4886..0c03e77b0 100644 --- a/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json +++ b/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json @@ -1 +1 @@ -{"gtceu:chem_dyes":{"order":131}} \ No newline at end of file +{"gtceu:chem_dyes":{"order":133}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json b/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json index d0669181b..33efb5420 100644 --- a/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json +++ b/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json @@ -1 +1 @@ -{"gtceu:chemical_bath":{"order":71}} \ No newline at end of file +{"gtceu:chemical_bath":{"order":72}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json b/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json index 58f7110c2..aeb8c52af 100644 --- a/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json @@ -1 +1 @@ -{"gtceu:chemical_reactor":{"order":72}} \ No newline at end of file +{"gtceu:chemical_reactor":{"order":73}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json b/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json index 7328fa1ae..f11a11756 100644 --- a/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json +++ b/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json @@ -1 +1 @@ -{"gtceu:circuit_assembler":{"order":74}} \ No newline at end of file +{"gtceu:circuit_assembler":{"order":75}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_coke_oven.json b/kubejs/assets/emi/category/properties/gtceu_coke_oven.json index f442662d9..179d2bd95 100644 --- a/kubejs/assets/emi/category/properties/gtceu_coke_oven.json +++ b/kubejs/assets/emi/category/properties/gtceu_coke_oven.json @@ -1 +1 @@ -{"gtceu:coke_oven":{"order":51}} \ No newline at end of file +{"gtceu:coke_oven":{"order":52}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json b/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json index f21f648c2..86fb582f6 100644 --- a/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json +++ b/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json @@ -1 +1 @@ -{"gtceu:combustion_generator":{"order":53}} \ No newline at end of file +{"gtceu:combustion_generator":{"order":54}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_compressor.json b/kubejs/assets/emi/category/properties/gtceu_compressor.json index 9a251888a..929ad5fcc 100644 --- a/kubejs/assets/emi/category/properties/gtceu_compressor.json +++ b/kubejs/assets/emi/category/properties/gtceu_compressor.json @@ -1 +1 @@ -{"gtceu:compressor":{"order":75}} \ No newline at end of file +{"gtceu:compressor":{"order":76}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_cracker.json b/kubejs/assets/emi/category/properties/gtceu_cracker.json index 708191b44..9754bf36b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_cracker.json +++ b/kubejs/assets/emi/category/properties/gtceu_cracker.json @@ -1 +1 @@ -{"gtceu:cracker":{"order":112}} \ No newline at end of file +{"gtceu:cracker":{"order":114}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_cutter.json b/kubejs/assets/emi/category/properties/gtceu_cutter.json index 21a3dfaba..99241ad20 100644 --- a/kubejs/assets/emi/category/properties/gtceu_cutter.json +++ b/kubejs/assets/emi/category/properties/gtceu_cutter.json @@ -1 +1 @@ -{"gtceu:cutter":{"order":77}} \ No newline at end of file +{"gtceu:cutter":{"order":78}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json b/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json index e2757199a..add39e640 100644 --- a/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json +++ b/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json @@ -1 +1 @@ -{"gtceu:distillation_tower":{"order":79}} \ No newline at end of file +{"gtceu:distillation_tower":{"order":80}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_distillery.json b/kubejs/assets/emi/category/properties/gtceu_distillery.json index dc85768c1..20c1f5374 100644 --- a/kubejs/assets/emi/category/properties/gtceu_distillery.json +++ b/kubejs/assets/emi/category/properties/gtceu_distillery.json @@ -1 +1 @@ -{"gtceu:distillery":{"order":78}} \ No newline at end of file +{"gtceu:distillery":{"order":79}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json b/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json index a805e981a..59a914349 100644 --- a/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json +++ b/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json @@ -1 +1 @@ -{"gtceu:electric_blast_furnace":{"order":113}} \ No newline at end of file +{"gtceu:electric_blast_furnace":{"order":115}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json b/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json index fc6124be2..839321eff 100644 --- a/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json +++ b/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json @@ -1 +1 @@ -{"gtceu:electrolyzer":{"order":80}} \ No newline at end of file +{"gtceu:electrolyzer":{"order":81}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json b/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json index e98bb8196..fe04a7cff 100644 --- a/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json +++ b/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json @@ -1 +1 @@ -{"gtceu:electromagnetic_separator":{"order":81}} \ No newline at end of file +{"gtceu:electromagnetic_separator":{"order":82}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_end_dome.json b/kubejs/assets/emi/category/properties/gtceu_end_dome.json index 308d6453c..77f348d2a 100644 --- a/kubejs/assets/emi/category/properties/gtceu_end_dome.json +++ b/kubejs/assets/emi/category/properties/gtceu_end_dome.json @@ -1 +1 @@ -{"gtceu:end_dome":{"order":114}} \ No newline at end of file +{"gtceu:end_dome":{"order":116}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_evaporation.json b/kubejs/assets/emi/category/properties/gtceu_evaporation.json index a0be66b2c..cf1740d0d 100644 --- a/kubejs/assets/emi/category/properties/gtceu_evaporation.json +++ b/kubejs/assets/emi/category/properties/gtceu_evaporation.json @@ -1 +1 @@ -{"gtceu:evaporation":{"order":115}} \ No newline at end of file +{"gtceu:evaporation":{"order":117}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_extractor.json b/kubejs/assets/emi/category/properties/gtceu_extractor.json index a1a270f88..868ca3e0a 100644 --- a/kubejs/assets/emi/category/properties/gtceu_extractor.json +++ b/kubejs/assets/emi/category/properties/gtceu_extractor.json @@ -1 +1 @@ -{"gtceu:extractor":{"order":83}} \ No newline at end of file +{"gtceu:extractor":{"order":84}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json b/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json index ce0949cb7..acfccd262 100644 --- a/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json +++ b/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json @@ -1 +1 @@ -{"gtceu:extractor_recycling":{"order":135}} \ No newline at end of file +{"gtceu:extractor_recycling":{"order":137}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_extruder.json b/kubejs/assets/emi/category/properties/gtceu_extruder.json index 193ae5c3c..280d313f7 100644 --- a/kubejs/assets/emi/category/properties/gtceu_extruder.json +++ b/kubejs/assets/emi/category/properties/gtceu_extruder.json @@ -1 +1 @@ -{"gtceu:extruder":{"order":85}} \ No newline at end of file +{"gtceu:extruder":{"order":86}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fermenter.json b/kubejs/assets/emi/category/properties/gtceu_fermenter.json index d2744835d..ca26ebaf0 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fermenter.json +++ b/kubejs/assets/emi/category/properties/gtceu_fermenter.json @@ -1 +1 @@ -{"gtceu:fermenter":{"order":86}} \ No newline at end of file +{"gtceu:fermenter":{"order":87}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json b/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json index 2483f4856..682bca52e 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json +++ b/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json @@ -1 +1 @@ -{"gtceu:fluid_heater":{"order":87}} \ No newline at end of file +{"gtceu:fluid_heater":{"order":88}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json b/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json index e0a73a041..8bc88f418 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json +++ b/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json @@ -1 +1 @@ -{"gtceu:fluid_solidifier":{"order":88}} \ No newline at end of file +{"gtceu:fluid_solidifier":{"order":89}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_food_oven.json b/kubejs/assets/emi/category/properties/gtceu_food_oven.json index 8a4cf191e..85fedcf6a 100644 --- a/kubejs/assets/emi/category/properties/gtceu_food_oven.json +++ b/kubejs/assets/emi/category/properties/gtceu_food_oven.json @@ -1 +1 @@ -{"gtceu:food_oven":{"order":35}} \ No newline at end of file +{"gtceu:food_oven":{"order":36}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_food_processor.json b/kubejs/assets/emi/category/properties/gtceu_food_processor.json index 6c643ec39..022796de6 100644 --- a/kubejs/assets/emi/category/properties/gtceu_food_processor.json +++ b/kubejs/assets/emi/category/properties/gtceu_food_processor.json @@ -1 +1 @@ -{"gtceu:food_processor":{"order":43}} \ No newline at end of file +{"gtceu:food_processor":{"order":44}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_forge_hammer.json b/kubejs/assets/emi/category/properties/gtceu_forge_hammer.json index 2337677cd..dc95c87c8 100644 --- a/kubejs/assets/emi/category/properties/gtceu_forge_hammer.json +++ b/kubejs/assets/emi/category/properties/gtceu_forge_hammer.json @@ -1 +1 @@ -{"gtceu:forge_hammer":{"order":89}} \ No newline at end of file +{"gtceu:forge_hammer":{"order":91}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_forming_press.json b/kubejs/assets/emi/category/properties/gtceu_forming_press.json index ecd7be1e7..6313c8d45 100644 --- a/kubejs/assets/emi/category/properties/gtceu_forming_press.json +++ b/kubejs/assets/emi/category/properties/gtceu_forming_press.json @@ -1 +1 @@ -{"gtceu:forming_press":{"order":90}} \ No newline at end of file +{"gtceu:forming_press":{"order":92}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json b/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json index b0eedbdb4..93c489413 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json @@ -1 +1 @@ -{"gtceu:fusion_reactor":{"order":116}} \ No newline at end of file +{"gtceu:fusion_reactor":{"order":118}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_gas_collector.json b/kubejs/assets/emi/category/properties/gtceu_gas_collector.json index 00f5ff68f..e51433f43 100644 --- a/kubejs/assets/emi/category/properties/gtceu_gas_collector.json +++ b/kubejs/assets/emi/category/properties/gtceu_gas_collector.json @@ -1 +1 @@ -{"gtceu:gas_collector":{"order":91}} \ No newline at end of file +{"gtceu:gas_collector":{"order":93}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_gas_turbine.json b/kubejs/assets/emi/category/properties/gtceu_gas_turbine.json index 5236b737c..c44d9e5ea 100644 --- a/kubejs/assets/emi/category/properties/gtceu_gas_turbine.json +++ b/kubejs/assets/emi/category/properties/gtceu_gas_turbine.json @@ -1 +1 @@ -{"gtceu:gas_turbine":{"order":54}} \ No newline at end of file +{"gtceu:gas_turbine":{"order":55}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_greenhouse.json b/kubejs/assets/emi/category/properties/gtceu_greenhouse.json index 800dca792..911ff37a3 100644 --- a/kubejs/assets/emi/category/properties/gtceu_greenhouse.json +++ b/kubejs/assets/emi/category/properties/gtceu_greenhouse.json @@ -1 +1 @@ -{"gtceu:greenhouse":{"order":117}} \ No newline at end of file +{"gtceu:greenhouse":{"order":119}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json b/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json index d2b2fc23d..44006dac9 100644 --- a/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json +++ b/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json @@ -1 +1 @@ -{"gtceu:implosion_compressor":{"order":118}} \ No newline at end of file +{"gtceu:implosion_compressor":{"order":120}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json b/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json index 2b1d97bb0..f87df30ce 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json +++ b/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json @@ -1 +1 @@ -{"gtceu:ingot_molding":{"order":132}} \ No newline at end of file +{"gtceu:ingot_molding":{"order":134}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_large_boiler.json b/kubejs/assets/emi/category/properties/gtceu_large_boiler.json index 378bddd03..245540410 100644 --- a/kubejs/assets/emi/category/properties/gtceu_large_boiler.json +++ b/kubejs/assets/emi/category/properties/gtceu_large_boiler.json @@ -1 +1 @@ -{"gtceu:large_boiler":{"order":49}} \ No newline at end of file +{"gtceu:large_boiler":{"order":50}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_large_chemical_reactor.json b/kubejs/assets/emi/category/properties/gtceu_large_chemical_reactor.json index 6c7b5177b..0e0d6c08d 100644 --- a/kubejs/assets/emi/category/properties/gtceu_large_chemical_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_large_chemical_reactor.json @@ -1 +1 @@ -{"gtceu:large_chemical_reactor":{"order":73}} \ No newline at end of file +{"gtceu:large_chemical_reactor":{"order":74}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_laser_engraver.json b/kubejs/assets/emi/category/properties/gtceu_laser_engraver.json index dd98c2c1e..35c57d13b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_laser_engraver.json +++ b/kubejs/assets/emi/category/properties/gtceu_laser_engraver.json @@ -1 +1 @@ -{"gtceu:laser_engraver":{"order":93}} \ No newline at end of file +{"gtceu:laser_engraver":{"order":95}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_lathe.json b/kubejs/assets/emi/category/properties/gtceu_lathe.json index 620771091..f3eda8c68 100644 --- a/kubejs/assets/emi/category/properties/gtceu_lathe.json +++ b/kubejs/assets/emi/category/properties/gtceu_lathe.json @@ -1 +1 @@ -{"gtceu:lathe":{"order":95}} \ No newline at end of file +{"gtceu:lathe":{"order":97}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_macerator.json b/kubejs/assets/emi/category/properties/gtceu_macerator.json index 5e6c6974a..3c18b500e 100644 --- a/kubejs/assets/emi/category/properties/gtceu_macerator.json +++ b/kubejs/assets/emi/category/properties/gtceu_macerator.json @@ -1 +1 @@ -{"gtceu:macerator":{"order":98}} \ No newline at end of file +{"gtceu:macerator":{"order":100}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json b/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json index f0d1ebd06..91aedbc5f 100644 --- a/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json +++ b/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json @@ -1 +1 @@ -{"gtceu:macerator_recycling":{"order":134}} \ No newline at end of file +{"gtceu:macerator_recycling":{"order":136}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_mixer.json b/kubejs/assets/emi/category/properties/gtceu_mixer.json index af37b6da5..172df1bac 100644 --- a/kubejs/assets/emi/category/properties/gtceu_mixer.json +++ b/kubejs/assets/emi/category/properties/gtceu_mixer.json @@ -1 +1 @@ -{"gtceu:mixer":{"order":100}} \ No newline at end of file +{"gtceu:mixer":{"order":102}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_nether_dome.json b/kubejs/assets/emi/category/properties/gtceu_nether_dome.json index 5f925f7b9..d79eba1a3 100644 --- a/kubejs/assets/emi/category/properties/gtceu_nether_dome.json +++ b/kubejs/assets/emi/category/properties/gtceu_nether_dome.json @@ -1 +1 @@ -{"gtceu:nether_dome":{"order":119}} \ No newline at end of file +{"gtceu:nether_dome":{"order":121}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json b/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json index 9e19bd6e3..f2079565a 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json @@ -1 +1 @@ -{"gtceu:ore_bathing":{"order":130}} \ No newline at end of file +{"gtceu:ore_bathing":{"order":132}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json b/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json index 36f32ddf0..4823d0cdb 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json @@ -1 +1 @@ -{"gtceu:ore_crushing":{"order":128}} \ No newline at end of file +{"gtceu:ore_crushing":{"order":130}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_forging.json b/kubejs/assets/emi/category/properties/gtceu_ore_forging.json index d3eeb5377..a0f02d474 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_forging.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_forging.json @@ -1 +1 @@ -{"gtceu:ore_forging":{"order":129}} \ No newline at end of file +{"gtceu:ore_forging":{"order":131}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_washer.json b/kubejs/assets/emi/category/properties/gtceu_ore_washer.json index 95d8c9ac6..6c259e3d8 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_washer.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_washer.json @@ -1 +1 @@ -{"gtceu:ore_washer":{"order":126}} \ No newline at end of file +{"gtceu:ore_washer":{"order":128}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_packer.json b/kubejs/assets/emi/category/properties/gtceu_packer.json index 6f5edac5b..f2d211bef 100644 --- a/kubejs/assets/emi/category/properties/gtceu_packer.json +++ b/kubejs/assets/emi/category/properties/gtceu_packer.json @@ -1 +1 @@ -{"gtceu:packer":{"order":101}} \ No newline at end of file +{"gtceu:packer":{"order":103}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_plasma_generator.json b/kubejs/assets/emi/category/properties/gtceu_plasma_generator.json index be79f9de0..68105e1b9 100644 --- a/kubejs/assets/emi/category/properties/gtceu_plasma_generator.json +++ b/kubejs/assets/emi/category/properties/gtceu_plasma_generator.json @@ -1 +1 @@ -{"gtceu:plasma_generator":{"order":55}} \ No newline at end of file +{"gtceu:plasma_generator":{"order":56}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_polarizer.json b/kubejs/assets/emi/category/properties/gtceu_polarizer.json index f7dea5c33..d94033bb5 100644 --- a/kubejs/assets/emi/category/properties/gtceu_polarizer.json +++ b/kubejs/assets/emi/category/properties/gtceu_polarizer.json @@ -1 +1 @@ -{"gtceu:polarizer":{"order":102}} \ No newline at end of file +{"gtceu:polarizer":{"order":104}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json b/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json index b12baa0c4..586ef7382 100644 --- a/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json +++ b/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json @@ -1 +1 @@ -{"gtceu:programmed_circuit":{"order":149}} \ No newline at end of file +{"gtceu:programmed_circuit":{"order":153}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json b/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json index ddc4525dc..a2c5ed433 100644 --- a/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json +++ b/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json @@ -1 +1 @@ -{"gtceu:pyrolyse_oven":{"order":120}} \ No newline at end of file +{"gtceu:pyrolyse_oven":{"order":122}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_research_station.json b/kubejs/assets/emi/category/properties/gtceu_research_station.json index fd15a7972..3914c66b5 100644 --- a/kubejs/assets/emi/category/properties/gtceu_research_station.json +++ b/kubejs/assets/emi/category/properties/gtceu_research_station.json @@ -1 +1 @@ -{"gtceu:research_station":{"order":121}} \ No newline at end of file +{"gtceu:research_station":{"order":123}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_rock_breaker.json b/kubejs/assets/emi/category/properties/gtceu_rock_breaker.json index 713c38dd3..d34f32c61 100644 --- a/kubejs/assets/emi/category/properties/gtceu_rock_breaker.json +++ b/kubejs/assets/emi/category/properties/gtceu_rock_breaker.json @@ -1 +1 @@ -{"gtceu:rock_breaker":{"order":103}} \ No newline at end of file +{"gtceu:rock_breaker":{"order":105}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_scanner.json b/kubejs/assets/emi/category/properties/gtceu_scanner.json index caa5e16a1..f0b323540 100644 --- a/kubejs/assets/emi/category/properties/gtceu_scanner.json +++ b/kubejs/assets/emi/category/properties/gtceu_scanner.json @@ -1 +1 @@ -{"gtceu:scanner":{"order":104}} \ No newline at end of file +{"gtceu:scanner":{"order":106}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_sifter.json b/kubejs/assets/emi/category/properties/gtceu_sifter.json index 8d33b88c6..a380c4ac3 100644 --- a/kubejs/assets/emi/category/properties/gtceu_sifter.json +++ b/kubejs/assets/emi/category/properties/gtceu_sifter.json @@ -1 +1 @@ -{"gtceu:sifter":{"order":106}} \ No newline at end of file +{"gtceu:sifter":{"order":108}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json b/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json index 361d77150..3a0e77151 100644 --- a/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json +++ b/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json @@ -1 +1 @@ -{"gtceu:steam_bloomery":{"order":122}} \ No newline at end of file +{"gtceu:steam_bloomery":{"order":124}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_steam_boiler.json b/kubejs/assets/emi/category/properties/gtceu_steam_boiler.json index 62460a665..f6b931b31 100644 --- a/kubejs/assets/emi/category/properties/gtceu_steam_boiler.json +++ b/kubejs/assets/emi/category/properties/gtceu_steam_boiler.json @@ -1 +1 @@ -{"gtceu:steam_boiler":{"order":50}} \ No newline at end of file +{"gtceu:steam_boiler":{"order":51}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_steam_turbine.json b/kubejs/assets/emi/category/properties/gtceu_steam_turbine.json index f53cda64d..08e4a313c 100644 --- a/kubejs/assets/emi/category/properties/gtceu_steam_turbine.json +++ b/kubejs/assets/emi/category/properties/gtceu_steam_turbine.json @@ -1 +1 @@ -{"gtceu:steam_turbine":{"order":56}} \ No newline at end of file +{"gtceu:steam_turbine":{"order":57}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_thermal_centrifuge.json b/kubejs/assets/emi/category/properties/gtceu_thermal_centrifuge.json index 210b7bd3a..d45051b84 100644 --- a/kubejs/assets/emi/category/properties/gtceu_thermal_centrifuge.json +++ b/kubejs/assets/emi/category/properties/gtceu_thermal_centrifuge.json @@ -1 +1 @@ -{"gtceu:thermal_centrifuge":{"order":107}} \ No newline at end of file +{"gtceu:thermal_centrifuge":{"order":109}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json b/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json index 161c4ee7a..e96c2aeb9 100644 --- a/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json +++ b/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json @@ -1 +1 @@ -{"gtceu:vacuum_freezer":{"order":123}} \ No newline at end of file +{"gtceu:vacuum_freezer":{"order":125}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_wire_coating.json b/kubejs/assets/emi/category/properties/gtceu_wire_coating.json index 370f1a8b9..7288be748 100644 --- a/kubejs/assets/emi/category/properties/gtceu_wire_coating.json +++ b/kubejs/assets/emi/category/properties/gtceu_wire_coating.json @@ -1 +1 @@ -{"gtceu:wire_coating":{"order":124}} \ No newline at end of file +{"gtceu:wire_coating":{"order":126}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_wiremill.json b/kubejs/assets/emi/category/properties/gtceu_wiremill.json index eddd9fbfb..c6d6357a4 100644 --- a/kubejs/assets/emi/category/properties/gtceu_wiremill.json +++ b/kubejs/assets/emi/category/properties/gtceu_wiremill.json @@ -1 +1 @@ -{"gtceu:wiremill":{"order":109}} \ No newline at end of file +{"gtceu:wiremill":{"order":111}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_smelting.json b/kubejs/assets/emi/category/properties/minecraft_smelting.json index bb751d06a..592d995e1 100644 --- a/kubejs/assets/emi/category/properties/minecraft_smelting.json +++ b/kubejs/assets/emi/category/properties/minecraft_smelting.json @@ -1 +1 @@ -{"minecraft:smelting":{"order":57}} \ No newline at end of file +{"minecraft:smelting":{"order":58}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_smithing.json b/kubejs/assets/emi/category/properties/minecraft_smithing.json index 6555dfaf0..f593959a3 100644 --- a/kubejs/assets/emi/category/properties/minecraft_smithing.json +++ b/kubejs/assets/emi/category/properties/minecraft_smithing.json @@ -1 +1 @@ -{"minecraft:smithing":{"order":138}} \ No newline at end of file +{"minecraft:smithing":{"order":142}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_stonecutting.json b/kubejs/assets/emi/category/properties/minecraft_stonecutting.json index 5e6efc3ff..4973b03b7 100644 --- a/kubejs/assets/emi/category/properties/minecraft_stonecutting.json +++ b/kubejs/assets/emi/category/properties/minecraft_stonecutting.json @@ -1 +1 @@ -{"minecraft:stonecutting":{"order":140}} \ No newline at end of file +{"minecraft:stonecutting":{"order":144}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/rnr_block_mod.json b/kubejs/assets/emi/category/properties/rnr_block_mod.json index 77bc61ab1..9b27bf9f5 100644 --- a/kubejs/assets/emi/category/properties/rnr_block_mod.json +++ b/kubejs/assets/emi/category/properties/rnr_block_mod.json @@ -1 +1 @@ -{"rnr:block_mod":{"order":44}} \ No newline at end of file +{"rnr:block_mod":{"order":45}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/rnr_mattock.json b/kubejs/assets/emi/category/properties/rnr_mattock.json index f14350252..81fc51083 100644 --- a/kubejs/assets/emi/category/properties/rnr_mattock.json +++ b/kubejs/assets/emi/category/properties/rnr_mattock.json @@ -1 +1 @@ -{"rnr:mattock":{"order":45}} \ No newline at end of file +{"rnr:mattock":{"order":46}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_alloying.json b/kubejs/assets/emi/category/properties/tfc_alloying.json index cd9689626..276b3a8bb 100644 --- a/kubejs/assets/emi/category/properties/tfc_alloying.json +++ b/kubejs/assets/emi/category/properties/tfc_alloying.json @@ -1 +1 @@ -{"tfc:alloying":{"order":25}} \ No newline at end of file +{"tfc:alloying":{"order":26}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_blast_furnace.json b/kubejs/assets/emi/category/properties/tfc_blast_furnace.json index 264488128..07a0cd48c 100644 --- a/kubejs/assets/emi/category/properties/tfc_blast_furnace.json +++ b/kubejs/assets/emi/category/properties/tfc_blast_furnace.json @@ -1 +1 @@ -{"tfc:blast_furnace":{"order":24}} \ No newline at end of file +{"tfc:blast_furnace":{"order":25}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_bloomery.json b/kubejs/assets/emi/category/properties/tfc_bloomery.json index ffa4ddd5e..cd704df50 100644 --- a/kubejs/assets/emi/category/properties/tfc_bloomery.json +++ b/kubejs/assets/emi/category/properties/tfc_bloomery.json @@ -1 +1 @@ -{"tfc:bloomery":{"order":23}} \ No newline at end of file +{"tfc:bloomery":{"order":24}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_chisel.json b/kubejs/assets/emi/category/properties/tfc_chisel.json index 34bc10383..2f24a19c1 100644 --- a/kubejs/assets/emi/category/properties/tfc_chisel.json +++ b/kubejs/assets/emi/category/properties/tfc_chisel.json @@ -1 +1 @@ -{"tfc:chisel":{"order":30}} \ No newline at end of file +{"tfc:chisel":{"order":31}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_glassworking.json b/kubejs/assets/emi/category/properties/tfc_glassworking.json index 7166ef506..94baef37d 100644 --- a/kubejs/assets/emi/category/properties/tfc_glassworking.json +++ b/kubejs/assets/emi/category/properties/tfc_glassworking.json @@ -1 +1 @@ -{"tfc:glassworking":{"order":29}} \ No newline at end of file +{"tfc:glassworking":{"order":30}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_instant_barrel.json b/kubejs/assets/emi/category/properties/tfc_instant_barrel.json index 4010357d6..ea2f2e09f 100644 --- a/kubejs/assets/emi/category/properties/tfc_instant_barrel.json +++ b/kubejs/assets/emi/category/properties/tfc_instant_barrel.json @@ -1 +1 @@ -{"tfc:instant_barrel":{"order":20}} \ No newline at end of file +{"tfc:instant_barrel":{"order":21}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_instant_fluid_barrel.json b/kubejs/assets/emi/category/properties/tfc_instant_fluid_barrel.json index f73ad8407..4aa700e4d 100644 --- a/kubejs/assets/emi/category/properties/tfc_instant_fluid_barrel.json +++ b/kubejs/assets/emi/category/properties/tfc_instant_fluid_barrel.json @@ -1 +1 @@ -{"tfc:instant_fluid_barrel":{"order":21}} \ No newline at end of file +{"tfc:instant_fluid_barrel":{"order":22}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_jam_pot.json b/kubejs/assets/emi/category/properties/tfc_jam_pot.json index 8eb8b7eb9..5410740e0 100644 --- a/kubejs/assets/emi/category/properties/tfc_jam_pot.json +++ b/kubejs/assets/emi/category/properties/tfc_jam_pot.json @@ -1 +1 @@ -{"tfc:jam_pot":{"order":39}} \ No newline at end of file +{"tfc:jam_pot":{"order":40}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_loom.json b/kubejs/assets/emi/category/properties/tfc_loom.json index 31628cf98..d6bde3455 100644 --- a/kubejs/assets/emi/category/properties/tfc_loom.json +++ b/kubejs/assets/emi/category/properties/tfc_loom.json @@ -1 +1 @@ -{"tfc:loom":{"order":28}} \ No newline at end of file +{"tfc:loom":{"order":29}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_scraping.json b/kubejs/assets/emi/category/properties/tfc_scraping.json index fff8f91d6..f219f7dab 100644 --- a/kubejs/assets/emi/category/properties/tfc_scraping.json +++ b/kubejs/assets/emi/category/properties/tfc_scraping.json @@ -1 +1 @@ -{"tfc:scraping":{"order":27}} \ No newline at end of file +{"tfc:scraping":{"order":28}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_sealed_barrel.json b/kubejs/assets/emi/category/properties/tfc_sealed_barrel.json index a726eb5cd..e90242cfd 100644 --- a/kubejs/assets/emi/category/properties/tfc_sealed_barrel.json +++ b/kubejs/assets/emi/category/properties/tfc_sealed_barrel.json @@ -1 +1 @@ -{"tfc:sealed_barrel":{"order":22}} \ No newline at end of file +{"tfc:sealed_barrel":{"order":23}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_sewing.json b/kubejs/assets/emi/category/properties/tfc_sewing.json index 176594a26..577d75727 100644 --- a/kubejs/assets/emi/category/properties/tfc_sewing.json +++ b/kubejs/assets/emi/category/properties/tfc_sewing.json @@ -1 +1 @@ -{"tfc:sewing":{"order":31}} \ No newline at end of file +{"tfc:sewing":{"order":32}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_simple_pot.json b/kubejs/assets/emi/category/properties/tfc_simple_pot.json index 3af920d9c..22963e06b 100644 --- a/kubejs/assets/emi/category/properties/tfc_simple_pot.json +++ b/kubejs/assets/emi/category/properties/tfc_simple_pot.json @@ -1 +1 @@ -{"tfc:simple_pot":{"order":37}} \ No newline at end of file +{"tfc:simple_pot":{"order":38}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_soup_pot.json b/kubejs/assets/emi/category/properties/tfc_soup_pot.json index 6340dd82a..ca66cac0a 100644 --- a/kubejs/assets/emi/category/properties/tfc_soup_pot.json +++ b/kubejs/assets/emi/category/properties/tfc_soup_pot.json @@ -1 +1 @@ -{"tfc:soup_pot":{"order":38}} \ No newline at end of file +{"tfc:soup_pot":{"order":39}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_centrifugation.json b/kubejs/assets/emi/category/properties/vintageimprovements_centrifugation.json index 7254d37bf..982ad223f 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_centrifugation.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_centrifugation.json @@ -1 +1 @@ -{"vintageimprovements:centrifugation":{"order":69}} \ No newline at end of file +{"vintageimprovements:centrifugation":{"order":70}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_coiling.json b/kubejs/assets/emi/category/properties/vintageimprovements_coiling.json index 2b1679719..4a420c1c6 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_coiling.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_coiling.json @@ -1 +1 @@ -{"vintageimprovements:coiling":{"order":108}} \ No newline at end of file +{"vintageimprovements:coiling":{"order":110}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_curving.json b/kubejs/assets/emi/category/properties/vintageimprovements_curving.json index 312fd2556..207a153f3 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_curving.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_curving.json @@ -1 +1 @@ -{"vintageimprovements:curving":{"order":84}} \ No newline at end of file +{"vintageimprovements:curving":{"order":85}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_hammering.json b/kubejs/assets/emi/category/properties/vintageimprovements_hammering.json index e54ba3953..d27865ad0 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_hammering.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_hammering.json @@ -1 +1 @@ -{"vintageimprovements:hammering":{"order":19}} \ No newline at end of file +{"vintageimprovements:hammering":{"order":20}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_laser_cutting.json b/kubejs/assets/emi/category/properties/vintageimprovements_laser_cutting.json index 24d59eaa6..1316702fb 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_laser_cutting.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_laser_cutting.json @@ -1 +1 @@ -{"vintageimprovements:laser_cutting":{"order":92}} \ No newline at end of file +{"vintageimprovements:laser_cutting":{"order":94}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_pressurizing.json b/kubejs/assets/emi/category/properties/vintageimprovements_pressurizing.json index 6d01cec56..12cd37fa6 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_pressurizing.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_pressurizing.json @@ -1 +1 @@ -{"vintageimprovements:pressurizing":{"order":65}} \ No newline at end of file +{"vintageimprovements:pressurizing":{"order":66}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_turning.json b/kubejs/assets/emi/category/properties/vintageimprovements_turning.json index 16508e34e..6ae333408 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_turning.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_turning.json @@ -1 +1 @@ -{"vintageimprovements:turning":{"order":94}} \ No newline at end of file +{"vintageimprovements:turning":{"order":96}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_vacuumizing.json b/kubejs/assets/emi/category/properties/vintageimprovements_vacuumizing.json index 58a996baf..f920c7f74 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_vacuumizing.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_vacuumizing.json @@ -1 +1 @@ -{"vintageimprovements:vacuumizing":{"order":82}} \ No newline at end of file +{"vintageimprovements:vacuumizing":{"order":83}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_vibrating.json b/kubejs/assets/emi/category/properties/vintageimprovements_vibrating.json index e03875b49..7083762aa 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_vibrating.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_vibrating.json @@ -1 +1 @@ -{"vintageimprovements:vibrating":{"order":105}} \ No newline at end of file +{"vintageimprovements:vibrating":{"order":107}} \ No newline at end of file diff --git a/kubejs/assets/emi/recipe/filters/categories.json b/kubejs/assets/emi/recipe/filters/categories.json index 50fa94f97..349fcbb34 100644 --- a/kubejs/assets/emi/recipe/filters/categories.json +++ b/kubejs/assets/emi/recipe/filters/categories.json @@ -45,33 +45,21 @@ { "category": "create:automatic_shaped" }, - { - "category": "greate:automatic_shaped" - }, { "category": "create:automatic_shapeless" }, - { - "category": "greate:automatic_shapeless" - }, { "category": "greate:automatic_brewing" }, - { - "category": "greate:pressing" - }, - { - "category": "greate:automatic_packing" - }, - { - "category": "greate:packing" - }, { "category": "greate:fan_haunting" }, { "category": "ae2:entropy" }, + { + "category": "gtceu:air_scrubber" + }, { "id": "/emi:/crafting/repairing/[^*]+/" }, diff --git a/kubejs/assets/greate/lang/en_us.json b/kubejs/assets/greate/lang/en_us.json index c17139505..aacdc7752 100644 --- a/kubejs/assets/greate/lang/en_us.json +++ b/kubejs/assets/greate/lang/en_us.json @@ -38,6 +38,7 @@ "block.greate.polyethylene_belt_tungsten_steel": "Styrene Butadiene Rubber Belt", "item.greate.polyethylene_belt_connector": "Styrene Butadiene Rubber Belt", "item.greate.andesite_alloy_vertical_gearbox": "Basic Vertical Gearbox", + "greate.recipe.packing": "Welding & Packing", "greate.ponder.belt_casing.text_1": "Brass or Metal Casing can be used to decorate Mechanical Belts", "greate.ponder.cogwheel_casing.text_1": "Brass or Metal Casing can be used to decorate Cogwheels" } \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 9ad76b575..a4a772e06 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1781,6 +1781,12 @@ "quests.steam_age.packager.title": "Create Logistics", "quests.steam_age.packager.subtitle": "\"We have AE2 at home\"", "quests.steam_age.packager.desc": "Is your chest monster starting to grow out of control? Now you have access to Create's Logistics system! Check out the &3Create Logistics&r chapter for how to get started.", + "quests.steam_age.basic_mech_press.title": "Basic Mechanical Press", + "quests.steam_age.basic_mech_press.subtitle": "Automatic Welding Machine", + "quests.steam_age.basic_mech_press.desc": "If you hate welding things over and over, this machine can do it for you. Just place the Basin over your charcoal forge, make sure your forge's temperature is at Yellow or above, and then drop your items in the Basin. Unfortunately, that's about all that the basic one can do.", + "quests.steam_age.steel_mech_press.title": "Steel Mechanical Press", + "quests.steam_age.steel_mech_press.subtitle": "Almost a Forge Hammer", + "quests.steam_age.steel_mech_press.desc": "The High Pressure Steam Forge Hammer is right around the corner and can do almost everything that this machine can do, but if you're desperate for some higher tier automatic welding recipes, this is your ticket.\n\nIf you're unfamiliar with the Forge Hammer, both it and the Steel Mechanical Press can crush ores (without byproducts), turn rock into cobble into gravel into sand, and crack bricks. However, only the Forge Hammer can provide a &3cheaper recipe for metal plates&r...", "quests.stone_age": "Stone Age", "quests.stone_age.subtitle": "Humble Beginnings", "quests.stone_age.foods.title": "Hungry?", diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index d9c050641..a8e26731e 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -2,7 +2,6 @@ function registerGreateRecipes(event) { - removeGreateRecipes(event); registerGreateRecyclingRecipes(event); event.replaceInput({ input: 'create:cogwheel'}, 'create:cogwheel', '#tfg:small_cogwheels') @@ -638,4 +637,75 @@ function registerGreateRecipes(event) { // #endregion + // #region Presses + + event.shaped('greate:andesite_alloy_mechanical_press', [ + 'AEB', + 'DF ', + ' C ' + ], { + A: '#tfg:any_bronze_frame', + B: 'greate:andesite_alloy_cogwheel', + C: '#tfg:any_iron_plate', + D: '#forge:tools/hammers', + E: '#minecraft:planks', + F: 'greate:andesite_alloy_shaft' + }).id('greate:shaped/andesite_alloy_mechanical_press') + + event.shaped('greate:steel_mechanical_press', [ + ' AD', + 'EBF', + ' C ' + ], { + A: 'create:andesite_casing', + B: 'greate:steel_shaft', + C: '#forge:double_plates/steel', + D: 'greate:steel_cogwheel', + E: '#forge:tools/hammers', + F: '#forge:tools/wrenches' + }).id('greate:shaped/steel_mechanical_press') + + event.shaped('greate:aluminium_mechanical_press', [ + 'GAD', + 'EBF', + ' C ' + ], { + A: 'gtceu:mv_machine_hull', + B: 'greate:aluminium_shaft', + C: '#forge:double_plates/vanadium_steel', + D: 'greate:aluminium_cogwheel', + E: '#forge:tools/hammers', + F: '#forge:tools/wrenches', + G: '#gtceu:circuits/mv' + }).id('greate:shaped/aluminium_mechanical_press') + + event.shaped('greate:stainless_steel_mechanical_press', [ + 'GAD', + 'EBF', + ' C ' + ], { + A: 'gtceu:hv_machine_hull', + B: 'greate:stainless_steel_shaft', + C: '#forge:double_plates/blue_alloy', + D: 'greate:stainless_steel_cogwheel', + E: '#forge:tools/hammers', + F: '#forge:tools/wrenches', + G: '#gtceu:circuits/hv' + }).id('greate:shaped/stainless_steel_mechanical_press') + + event.shaped('greate:titanium_mechanical_press', [ + 'GAD', + 'EBF', + ' C ' + ], { + A: 'gtceu:ev_machine_hull', + B: 'greate:titanium_shaft', + C: '#forge:double_plates/ultimet', + D: 'greate:titanium_cogwheel', + E: '#forge:tools/hammers', + F: '#forge:tools/wrenches', + G: '#gtceu:circuits/ev' + }).id('greate:shaped/titanium_mechanical_press') + + // #endregion } diff --git a/kubejs/server_scripts/greate/recipes.recycling.js b/kubejs/server_scripts/greate/recipes.recycling.js index 1786379fd..1a77f38fd 100644 --- a/kubejs/server_scripts/greate/recipes.recycling.js +++ b/kubejs/server_scripts/greate/recipes.recycling.js @@ -636,4 +636,80 @@ function registerGreateRecyclingRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) // #endregion + + // #region Mechanical press + + event.recipes.gtceu.macerator('greate:steel_mechanical_press') + .itemInputs('greate:steel_mechanical_press') + .itemOutputs( + ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 2), + ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Steel, 20)) + .duration(GTMaterials.WroughtIron.getMass() * 4) + .category(GTRecipeCategories.MACERATOR_RECYCLING) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.arc_furnace('greate:steel_mechanical_press') + .itemInputs('greate:steel_mechanical_press') + .itemOutputs( + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 2), + ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Steel, 20)) + .duration(GTMaterials.WroughtIron.getMass() * 4) + .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.macerator('greate:aluminium_mechanical_press') + .itemInputs('greate:aluminium_mechanical_press') + .itemOutputs( + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 9), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.VanadiumSteel, 2)) + .duration(GTMaterials.Aluminium.getMass() * 11) + .category(GTRecipeCategories.MACERATOR_RECYCLING) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.arc_furnace('greate:aluminium_mechanical_press') + .itemInputs('greate:aluminium_mechanical_press') + .itemOutputs( + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 9), + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.VanadiumSteel, 2)) + .duration(GTMaterials.Aluminium.getMass() * 11) + .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.macerator('greate:stainless_steel_mechanical_press') + .itemInputs('greate:stainless_steel_mechanical_press') + .itemOutputs( + ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 9), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.BlueAlloy, 2)) + .duration(GTMaterials.StainlessSteel.getMass() * 11) + .category(GTRecipeCategories.MACERATOR_RECYCLING) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.arc_furnace('greate:stainless_steel_mechanical_press') + .itemInputs('greate:stainless_steel_mechanical_press') + .itemOutputs( + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 9), + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BlueAlloy, 2)) + .duration(GTMaterials.StainlessSteel.getMass() * 11) + .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.macerator('greate:titanium_mechanical_press') + .itemInputs('greate:titanium_mechanical_press') + .itemOutputs( + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 9), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Ultimet, 2)) + .duration(GTMaterials.Titanium.getMass() * 11) + .category(GTRecipeCategories.MACERATOR_RECYCLING) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.arc_furnace('greate:titanium_mechanical_press') + .itemInputs('greate:titanium_mechanical_press') + .itemOutputs( + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 9), + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Ultimet, 2)) + .duration(GTMaterials.Titanium.getMass() * 11) + .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) + .EUt(GTValues.VA[GTValues.LV]) + + // #endregion } \ No newline at end of file diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index c8b9bd368..2ccba468f 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -33,10 +33,10 @@ function removeGreateRecipes(event) { event.remove({ id: /^greate:splashing\/integration\/create\/.*/ }) event.remove({ id: /^greate:crushing\/integration\/create\/.*/ }) event.remove({ id: /^greate:milling\/integration\/create\/.*/ }) - event.remove({ id: /^greate:pressing\/integration\/create\/.*/ }) + event.remove({ id: /^greate:compacting\/integration\/.*/ }) + event.remove({ id: /^greate:pressing\/integration\/.*/ }) event.remove({ mod: 'greate', type: 'create:deploying' }); event.remove({ mod: 'greate', type: 'create:sequenced_assembly' }); event.remove({ mod: 'greate', type: 'gtceu:assembler' }); - event.remove({ type: 'greate:pressing' }); } diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 6ec718d0c..7a636a5cc 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -59,6 +59,10 @@ const registerGTCEURecipes = (event) => { .duration(30) .EUt(2) + event.recipes.greate.pressing('2x tfc:powder/flux', '#tfc:fluxstone') + .recipeTier(0) + .id('greate:pressing/flux') + //#region Выход: Диоксид силикона event.recipes.gtceu.electrolyzer('sand_electrolysis') diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index d2f982c2e..a19eb1833 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -149,17 +149,24 @@ function registerGTCEUMetalRecipes(event) { }).id(`tfg:rolling/${material.getName()}_plate`) if (!blockStack.isEmpty() && GTMaterials.Stone != material) { + let ingotArray = ['tfc:powder/flux']; + for (var i = 0; i < matAmount; i++) + ingotArray.push(ingotStack) + // 9х Слиток -> Блок - event.recipes.createCompacting(blockStack, ingotStack.withCount(matAmount)) + event.recipes.greate.compacting(blockStack, ingotArray) + .recipeTier(1) + .circuitNumber(9) .heated() - .id(`tfg:compacting/${material.getName()}_block`) + .id(`greate:compacting/${material.getName()}_block`) } } else { if (!blockStack.isEmpty()) { // Блок из гемов -> 9 Пластин - event.recipes.createCutting(plateStack.withCount(matAmount).withChance(0.65), blockStack) - .id(`tfg:cutting/${material.getName()}_plate`) + event.recipes.greate.cutting(plateStack.withCount(matAmount), blockStack) + .recipeTier(1) + .id(`greate:cutting/${material.getName()}_plate`) } } } @@ -173,10 +180,18 @@ function registerGTCEUMetalRecipes(event) { } const processPlateDouble = (material) => { - const item = ChemicalHelper.get(TagPrefix.plateDouble, material, 1) - if (item.isEmpty()) return + const doublePlateItem = ChemicalHelper.get(TagPrefix.plateDouble, material, 1) + if (doublePlateItem.isEmpty()) return + const plateItem = ChemicalHelper.get(TagPrefix.plate, material, 1) event.remove({ id: `gtceu:shaped/plate_double_${material.getName()}` }) + + if (material.getProperty(TFGPropertyKey.TFC_PROPERTY) == null) { + event.recipes.greate.compacting(doublePlateItem, [plateItem, plateItem, 'tfc:powder/flux']) + .heated() + .recipeTier(2) + .id(`greate:compacting/${material.getName()}_double_plate`) + } } const processBlock = (material) => { @@ -202,10 +217,20 @@ function registerGTCEUMetalRecipes(event) { } const processRodLong = (material) => { - const item = ChemicalHelper.get(TagPrefix.rodLong, material, 1) - if (item.isEmpty()) return + const longRodItem = ChemicalHelper.get(TagPrefix.rodLong, material, 1) + if (longRodItem.isEmpty()) return + const shortRodItem = ChemicalHelper.get(TagPrefix.rod, material, 1) + if (shortRodItem.isEmpty()) return; event.remove({ id: `gtceu:shaped/stick_long_stick_${material.getName()}` }) + + // Rod welding recipes for all of the other non-tfc materials, since those were handled in tfc/recipes.materials.js + if (material.getProperty(TFGPropertyKey.TFC_PROPERTY) == null) { + event.recipes.greate.compacting(longRodItem, [shortRodItem, shortRodItem, 'tfc:powder/flux']) + .heated() + .recipeTier(1) + .id(`greate:compacting/${material.getName()}_long_rod`) + } } const processIngotDouble = (material) => { @@ -305,11 +330,22 @@ function registerGTCEUMetalRecipes(event) { .duration(10) .EUt(16) - if (material.hasProperty(PropertyKey.GEM) && !TagPrefix.gem.isIgnored(material)) - hammerRecipe.chancedOutput(ChemicalHelper.get(TagPrefix.gem, material, crushedOreItem.getCount()), 7500, 950) - else + if (material.hasProperty(PropertyKey.GEM) && !TagPrefix.gem.isIgnored(material)) { + const gemItem = ChemicalHelper.get(TagPrefix.gem, material, crushedOreItem.getCount()); + hammerRecipe.chancedOutput(gemItem, 7500, 950) + + event.recipes.greate.pressing(TieredOutputItem.of(gemItem).withChance(0.75).withExtraTierChance(0.095), poorOreItem) + .recipeTier(1) + .id(`greate:pressing/poor_raw_${material.getName()}_to_gem`) + } + else { hammerRecipe.chancedOutput(crushedOreItem, 7500, 950) + event.recipes.greate.pressing(TieredOutputItem.of(crushedOreItem).withChance(0.75).withExtraTierChance(0.095), poorOreItem) + .recipeTier(1) + .id(`greate:pressing/poor_raw_${material.getName()}_to_crushed_ore`) + } + // Macerator let maceratorRecipe = event.recipes.gtceu.macerator(`macerate_poor_raw_${material.getName()}_ore_to_crushed_ore`) .itemInputs(poorOreItem) @@ -372,11 +408,22 @@ function registerGTCEUMetalRecipes(event) { .duration(10) .EUt(16) - if (material.hasProperty(PropertyKey.GEM) && !TagPrefix.gem.isIgnored(material)) - hammerRecipe.itemOutputs(ChemicalHelper.get(TagPrefix.gem, material, crushedOreItem.getCount())) - else + if (material.hasProperty(PropertyKey.GEM) && !TagPrefix.gem.isIgnored(material)) { + const gemItem = ChemicalHelper.get(TagPrefix.gem, material, crushedOreItem.getCount()) + hammerRecipe.itemOutputs(gemItem) + + event.recipes.greate.pressing(gemItem, normalOreItem) + .recipeTier(1) + .id(`greate:pressing/raw_${material.getName()}_to_gem`) + } + else { hammerRecipe.itemOutputs(crushedOreItem) + event.recipes.greate.pressing(crushedOreItem, normalOreItem) + .recipeTier(1) + .id(`greate:pressing/raw_${material.getName()}_to_crushed_ore`) + } + event.remove({ id: `greate:milling/integration/gtceu/macerator/macerate_raw_${material.getName()}_ore_to_crushed_ore` }) // Macerator @@ -430,11 +477,22 @@ function registerGTCEUMetalRecipes(event) { .duration(10) .EUt(16) - if (material.hasProperty(PropertyKey.GEM) && !TagPrefix.gem.isIgnored(material)) - hammerRecipe.itemOutputs(ChemicalHelper.get(TagPrefix.gem, material, crushedOreItem.getCount())) - else + if (material.hasProperty(PropertyKey.GEM) && !TagPrefix.gem.isIgnored(material)) { + const gemItem = ChemicalHelper.get(TagPrefix.gem, material, crushedOreItem.getCount()) + hammerRecipe.itemOutputs(gemItem) + + event.recipes.greate.pressing(gemItem, richOreItem) + .recipeTier(1) + .id(`greate:pressing/rich_raw_${material.getName()}_to_gem`) + } + else { hammerRecipe.itemOutputs(crushedOreItem) + event.recipes.greate.pressing(crushedOreItem, richOreItem) + .recipeTier(1) + .id(`greate:pressing/rich_raw_${material.getName()}_to_crushed_ore`) + } + // Macerator event.recipes.gtceu.macerator(`macerate_rich_raw_${material.getName()}_ore_to_crushed_ore`) .itemInputs(richOreItem) @@ -571,6 +629,10 @@ function registerGTCEUMetalRecipes(event) { [ 'A', 'B' ], { A: chipped, B: '#forge:tools/mortars'}) .id(`shapeless/mortar_chipped_${material.getName()}`) + + event.recipes.greate.pressing(ChemicalHelper.get(TagPrefix.gem, material, 9), ChemicalHelper.get(TagPrefix.block, material, 1)) + .recipeTier(0) + .id(`greate:pressing/unpacking_${material.getName()}_block`) } const processAnvil = (material) => { diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index a586e8841..84ecc15f9 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -246,4 +246,8 @@ ServerEvents.recipes(event => { registerTreeTapRecipes(event) registerVintageImprovementsRecipes(event) registerWaterFlasksRecipes(event) + + // This has to be last so it can clean up any auto-integration recipes that Greate adds after + // adding a recipe to another GT machine + removeGreateRecipes(event) }) \ No newline at end of file diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 3fe1c87d1..d142728b0 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -545,6 +545,11 @@ const registerMinecraftRecipes = (event) => { event.recipes.tfc.welding('minecraft:bucket', 'tfc:metal/bucket/red_steel', 'tfc:metal/bucket/blue_steel', 6) .id('tfg:anvil/vanilla_bucket') + event.recipes.greate.compacting('minecraft:bucket', ['tfc:metal/bucket/red_steel', 'tfc:metal/bucket/blue_steel', 'tfc:powder/flux']) + .heated() + .recipeTier(0) + .id('greate:compacting/vanilla_bucket') + event.recipes.gtceu.assembler('tfg:vanilla/bucket') .itemInputs('#forge:plates/red_steel', '#forge:plates/blue_steel') .circuit(6) diff --git a/kubejs/server_scripts/railways/recipes.js b/kubejs/server_scripts/railways/recipes.js index cbe71a0ab..79ad3ae2e 100644 --- a/kubejs/server_scripts/railways/recipes.js +++ b/kubejs/server_scripts/railways/recipes.js @@ -324,9 +324,9 @@ const registerRailWaysRecipes = (event) => { '8x railways:track_monorail', ], 'create:metal_girder', [ event.recipes.createDeploying('railways:track_incomplete_monorail', ['railways:track_incomplete_monorail', '#forge:plates/wrought_iron']), - event.recipes.createDeploying('railways:track_incomplete_monorail', ['railways:track_incomplete_monorail', '#forge:tools/hammers']), + event.recipes.greate.pressing('railways:track_incomplete_monorail', 'railways:track_incomplete_monorail'), event.recipes.createDeploying('railways:track_incomplete_monorail', ['railways:track_incomplete_monorail', '#forge:plates/wrought_iron']), - event.recipes.createDeploying('railways:track_incomplete_monorail', ['railways:track_incomplete_monorail', '#forge:tools/hammers']), + event.recipes.greate.pressing('railways:track_incomplete_monorail', 'railways:track_incomplete_monorail'), ]).transitionalItem('railways:track_incomplete_monorail').loops(1).id('tfg:railways/sequenced_assembly/track_monorail') event.recipes.gtceu.assembler('railways/monorail') @@ -341,7 +341,7 @@ const registerRailWaysRecipes = (event) => { ], '#tfg:rock_slabs', [ event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', 'gtceu:steel_rod']), event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', '#tfc:mortar']), - event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', '#forge:tools/hammers']), + event.recipes.greate.pressing('railways:track_incomplete_create_andesite_narrow', 'railways:track_incomplete_create_andesite_narrow'), ]).transitionalItem('railways:track_incomplete_create_andesite_narrow').loops(2).id('tfg:railways/sequenced_assembly/track_create_andesite_narrow_from_steel') event.recipes.gtceu.assembler('railways/track_create_andesite_narrow_from_steel') @@ -359,7 +359,7 @@ const registerRailWaysRecipes = (event) => { event.recipes.createDeploying('create:incomplete_track', ['create:incomplete_track', '#tfg:rock_slabs']), event.recipes.createDeploying('create:incomplete_track', ['create:incomplete_track', 'gtceu:steel_rod']), event.recipes.createDeploying('create:incomplete_track', ['create:incomplete_track', '#tfc:mortar']), - event.recipes.createDeploying('create:incomplete_track', ['create:incomplete_track', '#forge:tools/hammers']), + event.recipes.greate.pressing('create:incomplete_track', 'create:incomplete_track'), ]).transitionalItem('create:incomplete_track').loops(2).id('tfg:railways/sequenced_assembly/track_create_andesite') event.recipes.gtceu.assembler('railways/track') @@ -377,7 +377,7 @@ const registerRailWaysRecipes = (event) => { event.recipes.createDeploying('railways:track_incomplete_create_andesite_wide', ['railways:track_incomplete_create_andesite_wide', '#forge:stone']), event.recipes.createDeploying('railways:track_incomplete_create_andesite_wide', ['railways:track_incomplete_create_andesite_wide', 'gtceu:steel_rod']), event.recipes.createDeploying('railways:track_incomplete_create_andesite_wide', ['railways:track_incomplete_create_andesite_wide', '#tfc:mortar']), - event.recipes.createDeploying('railways:track_incomplete_create_andesite_wide', ['railways:track_incomplete_create_andesite_wide', '#forge:tools/hammers']), + event.recipes.greate.pressing('railways:track_incomplete_create_andesite_wide', 'railways:track_incomplete_create_andesite_wide'), ]).transitionalItem('railways:track_incomplete_create_andesite_wide').loops(2).id('tfg:railways/sequenced_assembly/track_create_andesite_wide') event.recipes.gtceu.assembler('railways/track_create_andesite_wide') @@ -396,7 +396,7 @@ const registerRailWaysRecipes = (event) => { ], `tfc:wood/planks/${woodType}_slab`, [ event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, 'gtceu:steel_rod']), event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, '#forge:screws']), - event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, '#forge:tools/hammers']), + event.recipes.greate.pressing(`railways:track_incomplete_tfc_${woodType}_narrow`, `railways:track_incomplete_tfc_${woodType}_narrow`), ]).transitionalItem(`railways:track_incomplete_tfc_${woodType}_narrow`).loops(2).id(`tfg:railways/sequenced_assembly/track_create_${woodType}_narrow`) event.recipes.gtceu.assembler(`railways/track_create_${woodType}_narrow`) @@ -413,7 +413,7 @@ const registerRailWaysRecipes = (event) => { event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}`, [`railways:track_incomplete_tfc_${woodType}`, `tfc:wood/lumber/${woodType}`]), event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}`, [`railways:track_incomplete_tfc_${woodType}`, 'gtceu:steel_rod']), event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}`, [`railways:track_incomplete_tfc_${woodType}`, '#forge:screws']), - event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}`, [`railways:track_incomplete_tfc_${woodType}`, '#forge:tools/hammers']), + event.recipes.greate.pressing(`railways:track_incomplete_tfc_${woodType}`, `railways:track_incomplete_tfc_${woodType}`), ]).transitionalItem(`railways:track_incomplete_tfc_${woodType}`).loops(2).id(`tfg:railways/sequenced_assembly/track_create_${woodType}`) event.recipes.gtceu.assembler(`railways/track_${woodType}`) @@ -430,7 +430,7 @@ const registerRailWaysRecipes = (event) => { event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_wide`, [`railways:track_incomplete_tfc_${woodType}_wide`, `tfc:wood/planks/${woodType}_slab`]), event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_wide`, [`railways:track_incomplete_tfc_${woodType}_wide`, `gtceu:steel_rod`]), event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_wide`, [`railways:track_incomplete_tfc_${woodType}_wide`, '#forge:screws']), - event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_wide`, [`railways:track_incomplete_tfc_${woodType}_wide`, '#forge:tools/hammers']) + event.recipes.greate.pressing(`railways:track_incomplete_tfc_${woodType}_wide`, `railways:track_incomplete_tfc_${woodType}_wide`) ]).transitionalItem(`railways:track_incomplete_tfc_${woodType}_wide`).loops(2).id(`tfg:railways/sequenced_assembly/track_create_${woodType}_wide`) event.recipes.gtceu.assembler(`railways/track_${woodType}_wide`) diff --git a/kubejs/server_scripts/tfc/recipes.materials.js b/kubejs/server_scripts/tfc/recipes.materials.js index 243e60f28..f5ae4fb2d 100644 --- a/kubejs/server_scripts/tfc/recipes.materials.js +++ b/kubejs/server_scripts/tfc/recipes.materials.js @@ -60,6 +60,12 @@ function registerTFCMaterialsRecipes(event) { event.recipes.tfc.welding(doubleIngotItem, ingotItem, ingotItem, tfcProperty.getTier() - 1) .id(`tfc:welding/${material.getName()}_double_ingot`) + event.recipes.greate.compacting(doubleIngotItem, [ingotItem, ingotItem, 'tfc:powder/flux']) + .heated() + .recipeTier(tfcProperty.getTier() < 5 ? 0 : 1) + .circuitNumber(0) + .id(`greate:compacting/${material.getName()}_double_ingot`) + // Plates let plateItem = ChemicalHelper.get(TagPrefix.plate, material, 1) if (!plateItem.isEmpty()) { @@ -88,6 +94,11 @@ function registerTFCMaterialsRecipes(event) { .tier(tfcProperty.getTier()) .id(`tfc:welding/${material.getName()}_double_sheet`) + event.recipes.greate.compacting(doublePlateItem, [plateItem, plateItem, 'tfc:powder/flux']) + .heated() + .recipeTier(tfcProperty.getTier() < 4 ? 0 : 1) + .id(`greate:compacting/${material.getName()}_double_sheet`) + // Armor if (material.hasFlag(TFGMaterialFlags.HAS_TFC_ARMOR)) { //#region Шлем @@ -113,6 +124,11 @@ function registerTFCMaterialsRecipes(event) { .tier(tfcProperty.getTier()) .id(`tfc:welding/${material.getName()}_helmet`) + event.recipes.greate.compacting(`tfc:metal/helmet/${material.getName()}`, [`tfc:metal/unfinished_helmet/${material.getName()}`, plateItem, 'tfc:powder/flux']) + .heated() + .recipeTier(tfcProperty.getTier() < 4 ? 0 : 1) + .id(`greate:compacting/${material.getName()}_helmet`) + //#endregion //#region Нагрудник @@ -138,6 +154,11 @@ function registerTFCMaterialsRecipes(event) { .tier(tfcProperty.getTier()) .id(`tfc:welding/${material.getName()}_chestplate`) + event.recipes.greate.compacting(`tfc:metal/chestplate/${material.getName()}`, [`tfc:metal/unfinished_chestplate/${material.getName()}`, doublePlateItem, 'tfc:powder/flux']) + .heated() + .recipeTier(tfcProperty.getTier() < 4 ? 0 : 1) + .id(`greate:compacting/${material.getName()}_chestplate`) + //#endregion //#region Поножи @@ -163,6 +184,11 @@ function registerTFCMaterialsRecipes(event) { .tier(tfcProperty.getTier()) .id(`tfc:welding/${material.getName()}_greaves`) + event.recipes.greate.compacting(`tfc:metal/greaves/${material.getName()}`, [`tfc:metal/unfinished_greaves/${material.getName()}`, plateItem, 'tfc:powder/flux']) + .heated() + .recipeTier(tfcProperty.getTier() < 4 ? 0 : 1) + .id(`greate:compacting/${material.getName()}_greaves`) + //#endregion //#region Ботинки @@ -188,6 +214,11 @@ function registerTFCMaterialsRecipes(event) { .tier(tfcProperty.getTier()) .id(`tfc:welding/${material.getName()}_boots`) + event.recipes.greate.compacting(`tfc:metal/boots/${material.getName()}`, [`tfc:metal/unfinished_boots/${material.getName()}`, plateItem, 'tfc:powder/flux']) + .heated() + .recipeTier(tfcProperty.getTier() < 4 ? 0 : 1) + .id(`greate:compacting/${material.getName()}_boots`) + //#endregion } @@ -472,6 +503,10 @@ function registerTFCMaterialsRecipes(event) { .tier(tfcProperty.getTier()) .id(`tfc:anvil/${material.getName()}_long_rod`) + event.recipes.greate.compacting(longRodItem, [rodItem, rodItem, 'tfc:powder/flux']) + .heated() + .recipeTier(tfcProperty.getTier() < 4 ? 0 : 1) + .id(`greate:compacting/${material.getName()}_long_rod`) } // Bolt @@ -943,6 +978,11 @@ function registerTFCMaterialsRecipes(event) { event.recipes.tfc.welding(`tfc:metal/shears/${material.getName()}`, knifeHeadItem, knifeHeadItem, tfcProperty.getTier()) .id(`tfc:welding/${material.getName()}_shears`) + event.recipes.greate.compacting(`tfc:metal/shears/${material.getName()}`, [knifeHeadItem, knifeHeadItem, 'tfc:powder/flux']) + .heated() + .recipeTier(tfcProperty.getTier() < 4 ? 0 : 1) + .id(`greate:compacting/${material.getName()}_shears`) + // Декрафт инструмента в жидкость event.recipes.tfc.heating(`tfc:metal/shears/${material.getName()}`, tfcProperty.getMeltTemp()) .resultFluid(Fluid.of(outputMaterial.getFluid(), 288)) diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index 4035f6e09..f1cf79fbc 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -212,6 +212,11 @@ function registerTFCMetalsRecipes(event) { event.recipes.tfc.welding('tfc:jacks', '#forge:rods/brass', '#forge:plates/brass', 2) .id(`tfc:welding/jacks`) + event.recipes.greate.compacting('tfc:jacks', ['#forge:rods/brass', '#forge:plates/brass', 'tfc:powder/flux']) + .heated() + .recipeTier(0) + .id('greate:compacting/jacks') + // Декрафт Jacks event.recipes.tfc.heating('tfc:jacks', 930) .resultFluid(Fluid.of('gtceu:brass', 144)) diff --git a/kubejs/server_scripts/tfc/recipes.sand.js b/kubejs/server_scripts/tfc/recipes.sand.js index 09a797e21..d910070d5 100644 --- a/kubejs/server_scripts/tfc/recipes.sand.js +++ b/kubejs/server_scripts/tfc/recipes.sand.js @@ -32,29 +32,41 @@ function registerTFCSandRecipes(event) { // Песчанник -> Песок event.recipes.gtceu.forge_hammer(`raw_${sandColor}_sandstone_to_sand`) .itemInputs(`tfc:raw_sandstone/${sandColor}`) - .itemOutputs(`tfc:sand/${sandColor}`) - .duration(400) + .itemOutputs(`4x tfc:sand/${sandColor}`) + .duration(200) .EUt(2) + event.recipes.greate.pressing(`4x tfc:sand/${sandColor}`, `tfc:raw_sandstone/${sandColor}`) + .recipeTier(1) + .id(`greate:pressing/raw_${sandColor}_sandstone_to_sand`) + // Гладкий песчанник -> Песок event.recipes.gtceu.forge_hammer(`smooth_${sandColor}_sandstone_to_sand`) .itemInputs(`tfc:smooth_sandstone/${sandColor}`) - .itemOutputs(`tfc:sand/${sandColor}`) - .duration(400) + .itemOutputs(`4x tfc:sand/${sandColor}`) + .duration(200) .EUt(2) + event.recipes.greate.pressing(`4x tfc:sand/${sandColor}`, `tfc:smooth_sandstone/${sandColor}`) + .recipeTier(1) + .id(`greate:pressing/smooth_${sandColor}_sandstone_to_sand`) + // Обрезанный песчанник -> Песок event.recipes.gtceu.forge_hammer(`cut_${sandColor}_sandstone_to_sand`) .itemInputs(`tfc:cut_sandstone/${sandColor}`) - .itemOutputs(`tfc:sand/${sandColor}`) - .duration(400) + .itemOutputs(`4x tfc:sand/${sandColor}`) + .duration(200) .EUt(2) + event.recipes.greate.pressing(`4x tfc:sand/${sandColor}`, `tfc:cut_sandstone/${sandColor}`) + .recipeTier(1) + .id(`greate:pressing/cut_${sandColor}_sandstone_to_sand`) + // Песок -> Песчанник event.recipes.gtceu.compressor(`sand_${sandColor}_to_sandstone`) .itemInputs(`4x tfc:sand/${sandColor}`) .itemOutputs(`tfc:raw_sandstone/${sandColor}`) - .duration(800) + .duration(400) .EUt(2) // Песчанник -> Гладкий песчанник @@ -125,49 +137,76 @@ function registerTFCSandRecipes(event) { event.recipes.gtceu.forge_hammer('brown_gravel_to_sand') .itemInputs('#tfc:brown_gravel') .itemOutputs('tfc:sand/brown') - .duration(400) + .duration(200) .EUt(2) + event.recipes.greate.pressing('tfc:sand/brown', '#tfc:brown_gravel') + .recipeTier(1) + .id(`greate:pressing/brown_gravel_to_sand`) + // Белый гравий -> Песок event.recipes.gtceu.forge_hammer('white_gravel_to_sand') .itemInputs('#tfc:white_gravel') .itemOutputs('tfc:sand/white') - .duration(400) + .duration(200) .EUt(2) + event.recipes.greate.pressing('tfc:sand/white', '#tfc:white_gravel') + .recipeTier(1) + .id(`greate:pressing/white_gravel_to_sand`) + // Черный гравий -> Песок event.recipes.gtceu.forge_hammer('black_gravel_to_sand') .itemInputs('#tfc:black_gravel') .itemOutputs('tfc:sand/black') - .duration(400) + .duration(200) .EUt(2) + event.recipes.greate.pressing('tfc:sand/black', '#tfc:black_gravel') + .recipeTier(1) + .id(`greate:pressing/black_gravel_to_sand`) + // Красный гравий -> Песок event.recipes.gtceu.forge_hammer('red_gravel_to_sand') .itemInputs('#tfc:red_gravel') .itemOutputs('tfc:sand/red') - .duration(400) + .duration(200) .EUt(2) + event.recipes.greate.pressing('tfc:sand/red', '#tfc:red_gravel') + .recipeTier(1) + .id(`greate:pressing/red_gravel_to_sand`) + // Желтый гравий -> Песок event.recipes.gtceu.forge_hammer('yellow_gravel_to_sand') .itemInputs('#tfc:yellow_gravel') .itemOutputs('tfc:sand/yellow') - .duration(400) + .duration(200) .EUt(2) + event.recipes.greate.pressing('tfc:sand/yellow', '#tfc:yellow_gravel') + .recipeTier(1) + .id(`greate:pressing/yellow_gravel_to_sand`) + // Зеленый гравий -> Песок event.recipes.gtceu.forge_hammer('green_gravel_to_sand') .itemInputs('#tfc:green_gravel') .itemOutputs('tfc:sand/green') - .duration(400) + .duration(200) .EUt(2) + event.recipes.greate.pressing('tfc:sand/green', '#tfc:green_gravel') + .recipeTier(1) + .id(`greate:pressing/green_gravel_to_sand`) + // Розовый гравий -> Песок event.recipes.gtceu.forge_hammer('pink_gravel_to_sand') .itemInputs('#tfc:pink_gravel') .itemOutputs('tfc:sand/pink') - .duration(400) + .duration(200) .EUt(2) + event.recipes.greate.pressing('tfc:sand/pink', '#tfc:pink_gravel') + .recipeTier(1) + .id(`greate:pressing/pink_gravel_to_sand`) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/recipes.stone.js b/kubejs/server_scripts/tfc/recipes.stone.js index b2e8bf5c1..f27234e47 100644 --- a/kubejs/server_scripts/tfc/recipes.stone.js +++ b/kubejs/server_scripts/tfc/recipes.stone.js @@ -31,6 +31,10 @@ function registerTFCStoneRecipes(event) { .duration(10) .EUt(16) + event.recipes.greate.pressing(`tfc:rock/cobble/${stone}`, `tfc:rock/raw/${stone}`) + .recipeTier(1) + .id(`greate:pressing/${stone}_raw_to_cobble`) + // ? -> Сырая нажимная пластина event.shaped(`tfc:rock/pressure_plate/${stone}`, [ ' B ', @@ -174,6 +178,10 @@ function registerTFCStoneRecipes(event) { .duration(10) .EUt(16) + event.recipes.greate.pressing(`tfc:rock/gravel/${stone}`, `tfc:rock/cobble/${stone}`) + .recipeTier(1) + .id(`greate:pressing/${stone}_cobble_to_gravel`) + // Камни -> Булыжник event.shaped(`tfc:rock/cobble/${stone}`, [ 'ABA', @@ -215,6 +223,10 @@ function registerTFCStoneRecipes(event) { .duration(25) .EUt(8) + event.recipes.greate.pressing(`tfc:rock/cracked_bricks/${stone}`, `tfc:rock/bricks/${stone}`) + .recipeTier(1) + .id(`greate:pressing/cracked_bricks_${stone}`) + //#endregion //#region Замшелый булыжник diff --git a/kubejs/server_scripts/tfg/recipes.paper.js b/kubejs/server_scripts/tfg/recipes.paper.js index 0ef641700..eb6d1c28e 100644 --- a/kubejs/server_scripts/tfg/recipes.paper.js +++ b/kubejs/server_scripts/tfg/recipes.paper.js @@ -110,8 +110,9 @@ function registerTFGPapermakingRecipes(event) { //Beat thermochemically treated hardwood dust into soaked unrefined paper event.recipes.tfc.anvil('tfg:soaked_unrefined_paper', 'gtceu:thermochemically_treated_hardwood_dust', ['hit_last', 'hit_last', 'hit_last']) .id('tfg:anvil/soaked_unrefined_paper') - event.recipes.createDeploying(Item.of('tfg:soaked_unrefined_paper').withChance(0.8), ['gtceu:thermochemically_treated_hardwood_dust', '#forge:tools/hammers']) - .id('tfg:pressing/soaked_unrefined_paper') + event.recipes.greate.pressing(Item.of('tfg:soaked_unrefined_paper'), 'gtceu:thermochemically_treated_hardwood_dust') + .recipeTier(0) + .id('greate:pressing/soaked_unrefined_paper') event.custom({ type: "firmalife:stomping", ingredient: { diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index aba108047..5c667bfc1 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -145,6 +145,10 @@ function registerTFGRockRecipes(event) { .itemOutputs(x.cracked) .duration(12) .EUt(8) + + event.recipes.greate.pressing(x.cracked, x.raw) + .recipeTier(1) + .id(`greate:pressing/${x.raw}_to_${x.cracked}`.replace(/:/g, '_')) }) // forge hammer @@ -183,6 +187,10 @@ function registerTFGRockRecipes(event) { .itemOutputs(x.hammered) .duration(12) .EUt(8) + + event.recipes.greate.pressing(x.hammered, x.raw) + .recipeTier(1) + .id(`greate:pressing/${x.raw}_to_${x.hammered}`.replace(/:/g, '_')) }) // slabs, stairs, walls diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index ab38793d3..86410f3f4 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -138,8 +138,15 @@ const registerTFGItemTags = (event) => { global.UNIVERSAL_CIRCUIT_TIERS.forEach(tier => { event.add(`gtceu:circuits/${tier}`, `tfg:${tier}_universal_circuit`); }) // Use either cast or wrought iron - event.add('forge:double_iron_ingots', '#forge:double_ingots/iron') - event.add('forge:double_iron_ingots', '#forge:double_ingots/wrought_iron') + event.add('tfg:any_iron_double_ingot', '#forge:double_ingots/iron') + event.add('tfg:any_iron_double_ingot', '#forge:double_ingots/wrought_iron') + + event.add('tfg:any_iron_plate', '#forge:double_plates/iron') + event.add('tfg:any_iron_plate', '#forge:double_plates/wrought_iron') + + event.add('tfg:any_bronze_frame', '#forge:frames/bronze') + event.add('tfg:any_bronze_frame', '#forge:frames/bismuth_bronze') + event.add('tfg:any_bronze_frame', '#forge:frames/black_bronze') //#region Food const RAW_MEATS = [ diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index a0f494083..d8d63ff86 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -82,39 +82,13 @@ function registerVintageImprovementsRecipes(event) { 'BBE', 'C D' ], { - A: '#forge:frames/bronze', + A: '#tfg:any_bronze_frame', B: '#tfg:hardwood', - C: '#forge:double_iron_ingots', + C: '#tfg:any_iron_double_ingot', D: 'greate:andesite_alloy_cogwheel', E: '#minecraft:planks', F: '#forge:tools/hammers' - }).id('tfg:vi/shaped/helve_hammer_bronze') - - event.shaped('vintageimprovements:helve_hammer', [ - 'F A', - 'BBE', - 'C D' - ], { - A: '#forge:frames/black_bronze', - B: '#tfg:hardwood', - C: '#forge:double_iron_ingots', - D: 'greate:andesite_alloy_cogwheel', - E: '#minecraft:planks', - F: '#forge:tools/hammers' - }).id('tfg:vi/shaped/helve_hammer_black_bronze') - - event.shaped('vintageimprovements:helve_hammer', [ - 'F A', - 'BBE', - 'C D' - ], { - A: '#forge:frames/bismuth_bronze', - B: '#tfg:hardwood', - C: '#forge:double_iron_ingots', - D: 'greate:andesite_alloy_cogwheel', - E: '#minecraft:planks', - F: '#forge:tools/hammers' - }).id('tfg:vi/shaped/helve_hammer_bismuth_bronze') + }).id('tfg:vi/shaped/helve_hammer') event.recipes.create.mechanical_crafting('vintageimprovements:lathe', [ 'DEEFE', @@ -414,32 +388,6 @@ function registerVintageImprovementsRecipes(event) { } // #endregion - - // #region Pressurizing - - if (material.hasFlag(TFGMaterialFlags.GENERATE_DOUBLE_INGOTS)) { - const ingotItem = ChemicalHelper.get(TagPrefix.ingot, material, 1); - - event.custom({ - type: 'vintageimprovements:pressurizing', - ingredients: [ingotItem, ingotItem, { item: 'tfc:powder/flux' }], - heatRequirement: "heated", - results: [ChemicalHelper.get(TFGTagPrefix.ingotDouble, material, 1)], - processingTime: material.getMass() * 6 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/pressurizing/${material.getName()}_double_ingot`) - - const plateItem = ChemicalHelper.get(TagPrefix.plate, material, 1); - - event.custom({ - type: 'vintageimprovements:pressurizing', - ingredients: [plateItem, plateItem, { item: 'tfc:powder/flux' }], - heatRequirement: "heated", - results: [ChemicalHelper.get(TagPrefix.plateDouble, material, 1)], - processingTime: material.getMass() * 6 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER - }).id(`tfg:vi/pressurizing/${material.getName()}_double_plate`) - } - - // #endregion }) diff --git a/kubejs/startup_scripts/greate/constants.js b/kubejs/startup_scripts/greate/constants.js index 5de64da69..32a6aebb4 100644 --- a/kubejs/startup_scripts/greate/constants.js +++ b/kubejs/startup_scripts/greate/constants.js @@ -30,13 +30,6 @@ global.GREATE_DISABLED_ITEMS = [ 'greate:stainless_steel_mechanical_saw', 'greate:titanium_mechanical_saw', - // Disable these until it's possible to disable spring recipes in them - 'greate:andesite_alloy_mechanical_press', - 'greate:steel_mechanical_press', - 'greate:aluminium_mechanical_press', - 'greate:stainless_steel_mechanical_press', - 'greate:titanium_mechanical_press', - // You should be graduating to IV multiblocks in IV 'greate:tungsten_steel_shaft', 'greate:tungsten_steel_cogwheel', diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index bc617528e..ad4f3ad3b 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -92,6 +92,20 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:zpm_solar_panel', 'gtceu:uv_solar_panel', + 'gtceu:lv_air_scrubber', + 'gtceu:mv_air_scrubber', + 'gtceu:hv_air_scrubber', + 'gtceu:ev_air_scrubber', + + 'gtceu:lv_world_accelerator', + 'gtceu:mv_world_accelerator', + 'gtceu:hv_world_accelerator', + 'gtceu:ev_world_accelerator', + 'gtceu:iv_world_accelerator', + 'gtceu:luv_world_accelerator', + 'gtceu:zpm_world_accelerator', + 'gtceu:uv_world_accelerator', + 'gtceu:compressed_clay', // Sculk