diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index cdabe7546..1e3f0bf0f 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -1233,7 +1233,7 @@ subtitle: "{quests.tfg_tips.refrigerator.subtitle}" tasks: [{ id: "2D43E8E907B39B46" - item: "tfcea:refrigerator" + item: "tfg:mv_food_refrigerator" type: "item" }] title: "{quests.tfg_tips.refrigerator.title}" diff --git a/defaultconfigs/tfcea-server.toml b/defaultconfigs/tfcea-server.toml deleted file mode 100644 index 087adc875..000000000 --- a/defaultconfigs/tfcea-server.toml +++ /dev/null @@ -1,6 +0,0 @@ - -[general] - #The modifier for the 'Refrigerating' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitRefrigeratingModifier = 0.125 - diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index af09eb1cc..35c6ecb20 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -24,6 +24,9 @@ const registerTooltips = (event) => event.addAdvanced(["treetap:tap"], (item, advanced, text) => { text.add(1, [text.of("§4Obsolete§f: Replaced by the AFC TreeTap, you can craft it from this one by placing this in a crafting table!")]) }) + event.addAdvanced(["tfcea:refrigerator"], (item, advanced, text) => { + text.add(1, [text.of("§4Obsolete§f: Replaced by the GregTech Refrigerator, you can craft it from this one by placing this in a crafting table!")]) + }) event.addAdvanced(['create:blaze_burner'], (item, advanced, text) => { text.add(1, text.of('§cSuperheat§r §7with Coke, Anthracite, or Flawless and Exquisite coal gems.')) }) diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 168fdf928..f623955f5 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -226,7 +226,6 @@ ServerEvents.recipes(event => { registerRnrRecipes(event) registerSophisticatedBackpacksRecipes(event) registerSimplylightRecipes(event) - registerTfceaRecipes(event) registerTFCRecipes(event) registerTFCBetterBFRecipes(event) registerTFCLunchBoxRecipes(event) diff --git a/kubejs/server_scripts/tfcea/recipes.js b/kubejs/server_scripts/tfcea/recipes.js deleted file mode 100644 index c6a96e870..000000000 --- a/kubejs/server_scripts/tfcea/recipes.js +++ /dev/null @@ -1,20 +0,0 @@ - - -const registerTfceaRecipes = (event) => { - //удаление рецептов мода - event.remove({ mod: 'tfcea' }) - - event.shaped('tfcea:refrigerator', [ - 'ABA', - 'BCB', - 'DEF' - ], { - A: '#forge:single_cables/tin', - B: '#forge:normal_fluid_pipes/potin', - C: 'gtceu:steel_crate', - D: 'gtceu:lv_fluid_regulator', - E: 'gtceu:lv_machine_hull', - F: 'gtceu:lv_electric_pump', - }).id('tfcea:refrigerator') - -} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.converting.js b/kubejs/server_scripts/tfg/recipes.converting.js index b36839cf5..15b9447ad 100644 --- a/kubejs/server_scripts/tfg/recipes.converting.js +++ b/kubejs/server_scripts/tfg/recipes.converting.js @@ -3,28 +3,19 @@ function registerTFGConvertingRecipes(event) { event.shapeless("afc:tree_tap", "treetap:tap") + event.shapeless("tfcea:refrigerator", "tfg:mv_food_refrigerator") event.shapeless('greate:steel_cogwheel', 'create:cogwheel') - event.shapeless('greate:large_steel_cogwheel', 'create:large_cogwheel') - event.shapeless('greate:steel_shaft', 'create:shaft') - event.shapeless('greate:steel_crushing_wheel', 'create:crushing_wheel') - event.shapeless('greate:steel_encased_fan', 'create:encased_fan') - event.shapeless('greate:steel_gearbox', 'create:gearbox') - event.shapeless('greate:steel_mechanical_mixer', 'create:mechanical_mixer') - event.shapeless('greate:steel_mechanical_saw', 'create:mechanical_saw') - event.shapeless('greate:steel_mechanical_pump', 'create:mechanical_pump') - - event.shapeless('greate:rubber_belt_connector', 'create:belt_connector') - event.shapeless('greate:steel_vertical_gearbox', 'create:vertical_gearbox') + event.shapeless('greate:rubber_belt_connector', 'create:belt_connector') event.shapeless('create:zinc_ingot', 'gtceu:zinc_ingot') event.shapeless('create:brass_ingot', 'gtceu:brass_ingot') diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index bd1f86ab8..b06687e60 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -647,4 +647,8 @@ function registerTFGFoodRecipes(event) { event.replaceInput({id: 'gtceu:shaped/mv_food_oven'}, 'gtceu:mv_electric_piston', '#tfg:metal_bars') event.replaceInput({id: 'gtceu:shaped/hv_food_oven'}, 'gtceu:hv_electric_piston', '#tfg:metal_bars') event.replaceInput({id: 'gtceu:shaped/ev_food_oven'}, 'gtceu:ev_electric_piston', '#tfg:metal_bars') + + event.replaceInput({id: 'gtceu:shaped/mv_food_refrigerator'}, 'gtceu:mv_machine_hull', 'gtceu:mv_hermetic_casing') + event.replaceInput({id: 'gtceu:shaped/hv_food_refrigerator'}, 'gtceu:hv_machine_hull', 'gtceu:hv_hermetic_casing') + event.replaceInput({id: 'gtceu:shaped/ev_food_refrigerator'}, 'gtceu:ev_machine_hull', 'gtceu:ev_hermetic_casing') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 112abc34e..0331d0a24 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -153,6 +153,7 @@ const registerTFGItemTags = (event) => { // #region 0.7.19 -> 0.9 conversion event.add('c:hidden_from_recipe_viewers', 'treetap:tap') + event.add('c:hidden_from_recipe_viewers', 'tfcea:refrigerator') event.add('c:hidden_from_recipe_viewers', 'gtceu:zinc_ingot') event.add('c:hidden_from_recipe_viewers', 'gtceu:brass_ingot') diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index fb7167977..f3c2df8fe 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -90,11 +90,15 @@ const registerTFGBlocks = (event) => { // #endregion - // #region Deprecated tree tap + // #region Deprecated event.create('treetap:tap') .requiresTool(false) .textureAll('tfg:item/deprecated') + event.create('tfcea:refrigerator') + .requiresTool(false) + .textureAll('tfg:item/deprecated') + // #endregion } diff --git a/pakku-lock.json b/pakku-lock.json index ea7ddfe14..3e2566214 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -7938,42 +7938,6 @@ } ] }, - { - "pakku_id": "wwI6IXC4zcB3Dra6", - "type": "MOD", - "slug": { - "curseforge": "tfc-electrical-appliances" - }, - "name": { - "curseforge": "TFC Electrical Appliances" - }, - "id": { - "curseforge": "1017637" - }, - "files": [ - { - "type": "curseforge", - "file_name": "tfcea-0.0.2.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "beta", - "url": "https://edge.forgecdn.net/files/5338/560/tfcea-0.0.2.jar", - "id": "5338560", - "parent_id": "1017637", - "hashes": { - "sha1": "13638888685ddf65e138bdeb6e4c684b0a956cbb", - "md5": "62644682b902533ee9b54dac7e7e2ca9" - }, - "required_dependencies": [], - "size": 60960, - "date_published": "2024-05-12T17:09:43.310Z" - } - ] - }, { "pakku_id": "zerUE7n4nmHdsmgn", "pakku_links": [