From 2372f4139483ec510ac8fba8750849d9e9045bb8 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Sep 2025 00:02:49 +0100 Subject: [PATCH] goodbye, VI lathe, you jank piece of crap --- CHANGELOG.md | 1 + .../quests/chapters/questssteam_age.snbt | 4 +- .../vintageimprovements-server.toml | 4 +- .../vintageimprovements_turning.json | 1 - kubejs/assets/tfg/lang/en_us.json | 6 +- kubejs/server_scripts/afc/recipes.js | 6 +- kubejs/server_scripts/beneath/recipes.js | 6 +- .../gregtech/recipes.materials.js | 3 +- kubejs/server_scripts/gregtech/utility.js | 3 +- kubejs/server_scripts/tfc/recipes.machines.js | 6 +- .../server_scripts/tfg/recipes.converting.js | 3 + .../vintage_improvements/recipes.js | 84 +++++++++---------- .../vintage_improvements/constants.js | 5 +- 13 files changed, 68 insertions(+), 64 deletions(-) delete mode 100644 kubejs/assets/emi/category/properties/vintageimprovements_turning.json diff --git a/CHANGELOG.md b/CHANGELOG.md index dc4dc8232..9912e07c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Drums now require a Soft Mallet to turn on their auto-output instead of a Screwdriver - New overworld structures with new enemies and loot! You can find them in cold and wet climates (#1836) @KrestenFM @Pyritie - You can no longer light nether portals. Existing ones will still work. @Pyritie +- The old Create Lathe has been replaced with the Belt Grinder, which does exactly the same things as the lathe did, and is much easier to automate. Put your old lathe in a crafting grid to convert it. @Pyritie ### Changes - Changed and unified stack sizes for many items (check [here](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/pull/1778) for a full list) (#1778) @KonSola5 - Reduced the durability of wooden tongs @Pyritie diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index 30b2bb0a8..96a430cff 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -828,8 +828,8 @@ optional: true subtitle: "{quests.steam_age.lathe.subtitle}" tasks: [{ - id: "269D79581AC1E0D6" - item: "vintageimprovements:lathe" + id: "23961EE69549B16E" + item: "vintageimprovements:belt_grinder" type: "item" }] title: "{quests.steam_age.lathe.title}" diff --git a/defaultconfigs/vintageimprovements-server.toml b/defaultconfigs/vintageimprovements-server.toml index c16f1472f..acec72cc1 100644 --- a/defaultconfigs/vintageimprovements-server.toml +++ b/defaultconfigs/vintageimprovements-server.toml @@ -21,7 +21,7 @@ #. #Medium speed value for grinder crafts, speedLimits = 2. #Range: 1 ~ 256 - mediumSpeedValue = 64 + mediumSpeedValue = 128 #. #Allows sandpaper crafts on belt grinder, when recipes collides belt grinder recipe have priority. allowSandpaperPolishingOnGrinder = true @@ -82,7 +82,7 @@ #Configure the individual stress impact of mechanical blocks. Note that this cost is doubled for every speed increase it receives. [kinetics.stressValues.v2.impact] laser = 0.25 - belt_grinder = 0.5 + belt_grinder = 0.25 vacuum_chamber = 0.5 lathe = 0.25 lathe_moving = 0.25 diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_turning.json b/kubejs/assets/emi/category/properties/vintageimprovements_turning.json deleted file mode 100644 index edb1050f4..000000000 --- a/kubejs/assets/emi/category/properties/vintageimprovements_turning.json +++ /dev/null @@ -1 +0,0 @@ -{"vintageimprovements:turning":{"order":104}} \ 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 0efef4fa0..bf23cd3da 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -3044,9 +3044,9 @@ "quests.steam_age.vibrating_table.title": "Vibrating Table", "quests.steam_age.vibrating_table.subtitle": "Identical to the LV Sifter", "quests.steam_age.vibrating_table.desc": "The &3Vibrating Table&r can process gem ores (including coal) in a different way, yielding much more output than anything else you have access to right now. As a bonus, it can also process any gravel ore deposits you may still have. No more sluicing!", - "quests.steam_age.lathe.title": "Lathe", - "quests.steam_age.lathe.subtitle": "You're not gonna believe which LV machine this is the same as", - "quests.steam_age.lathe.desc": "The &3Lathe&r can automatically turn a single ingot into two rods, and single bolts into screws. If you're making a lot of those, and you will be, this machine will be a good investment.", + "quests.steam_age.lathe.title": "Belt Grinder", + "quests.steam_age.lathe.subtitle": "A joint LV Lathe and metal confetti machine", + "quests.steam_age.lathe.desc": "The &3Belt Grinder&r can automatically turn a single ingot into two rods, single bolts into screws, polish gems, and a few other things. If you're needing a lot of rods and screws, and you will be, this machine will be a good investment.", "quests.steam_age.steel_saw.title": "Steel Mechanical Saw", "quests.steam_age.steel_saw.subtitle": "A stonecutter and LV Cutter in one!", "quests.steam_age.steel_saw.desc": "It's an upgrade to your Basic Mechanical Saw that can also process some metal recipes, like turning rods into four bolts, and cutting blocks into plates. These recipes will all require a fluid to work, but you can just use water for now.\n\nYou can also use this for cheaper Rubber Sheets, if you first use an Alloy Smelter to turn your pulp into a block.", diff --git a/kubejs/server_scripts/afc/recipes.js b/kubejs/server_scripts/afc/recipes.js index 1ef18f35f..5cf435746 100644 --- a/kubejs/server_scripts/afc/recipes.js +++ b/kubejs/server_scripts/afc/recipes.js @@ -352,16 +352,18 @@ const registerAFCRecipes = (event) => { .EUt(2) event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [{ item: `afc:wood/log/${wood}` }], results: [{ item: `afc:wood/stripped_log/${wood}` }], + speed_limits: 0, processingTime: 50 }).id(`tfg:vi/lathe/stripping_${wood}_log`) event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [{ item: `afc:wood/wood/${wood}` }], results: [{ item: `afc:wood/stripped_wood/${wood}` }], + speed_limits: 0, processingTime: 50 }).id(`tfg:vi/lathe/stripping_${wood}_wood`) }) diff --git a/kubejs/server_scripts/beneath/recipes.js b/kubejs/server_scripts/beneath/recipes.js index 7289608a4..78ddf2ab7 100644 --- a/kubejs/server_scripts/beneath/recipes.js +++ b/kubejs/server_scripts/beneath/recipes.js @@ -96,9 +96,10 @@ const registerBeneathRecipes = (event) => { .EUt(GTValues.VA[GTValues.ULV]) event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [{ item: 'beneath:wood/wood/crimson' }], results: [{ item: 'beneath:wood/stripped_wood/crimson' }], + speed_limits: 0, processingTime: 50 }).id(`tfg:vi/lathe/stripping_crimson_wood`) @@ -126,9 +127,10 @@ const registerBeneathRecipes = (event) => { .EUt(GTValues.VA[GTValues.ULV]) event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [{ item: 'beneath:wood/wood/warped' }], results: [{ item: 'beneath:wood/stripped_wood/warped' }], + speed_limits: 0, processingTime: 50 }).id(`tfg:vi/lathe/stripping_warped_wood`) diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index 290976514..cf53e4599 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -1094,9 +1094,10 @@ function registerGTCEUMetalRecipes(event) { if (isLowTier) { event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [doublePlateItem], results: [buzzsawBladeItem], + speed_limits: 0, processingTime: material.getMass() * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER }).id(`tfg:vi/lathe/${material.getName()}_buzzsaw`) } diff --git a/kubejs/server_scripts/gregtech/utility.js b/kubejs/server_scripts/gregtech/utility.js index 28b4d7c08..f975af3bf 100644 --- a/kubejs/server_scripts/gregtech/utility.js +++ b/kubejs/server_scripts/gregtech/utility.js @@ -319,9 +319,10 @@ function woodBuilder(event, name, lumber, logs, log, stripped_log, plank, stair, .EUt(GTValues.VA[GTValues.ULV]) event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [{ item: log }], results: [{ item: stripped_log }], + speed_limits: 0, processingTime: 50 }).id(`tfg:vi/lathe/stripping_${name}_log`) } diff --git a/kubejs/server_scripts/tfc/recipes.machines.js b/kubejs/server_scripts/tfc/recipes.machines.js index 7402f708c..b5641cb63 100644 --- a/kubejs/server_scripts/tfc/recipes.machines.js +++ b/kubejs/server_scripts/tfc/recipes.machines.js @@ -406,16 +406,18 @@ function registerTFCMachineRecipes(event) { .EUt(2) event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [{ item: `tfc:wood/log/${wood}` }], results: [{ item: `tfc:wood/stripped_log/${wood}` }], + speed_limits: 0, processingTime: 50 }).id(`tfg:vi/lathe/stripping_${wood}_log`) event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [{ item: `tfc:wood/wood/${wood}` }], results: [{ item: `tfc:wood/stripped_wood/${wood}` }], + speed_limits: 0, processingTime: 50 }).id(`tfg:vi/lathe/stripping_${wood}_wood`) }) diff --git a/kubejs/server_scripts/tfg/recipes.converting.js b/kubejs/server_scripts/tfg/recipes.converting.js index f29da9fe2..ceaac3631 100644 --- a/kubejs/server_scripts/tfg/recipes.converting.js +++ b/kubejs/server_scripts/tfg/recipes.converting.js @@ -115,4 +115,7 @@ function registerTFGConvertingRecipes(event) { event.shapeless('tfc:ore/rich_sphalerite', 'gtceu:rich_raw_sphalerite') event.shapeless('tfc:ore/normal_sphalerite', 'gtceu:raw_sphalerite') event.shapeless('tfc:ore/poor_sphalerite', 'gtceu:poor_raw_sphalerite') + + + event.shapeless('vintageimprovements:belt_grinder', 'vintageimprovements:lathe') } \ No newline at end of file diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 7d1c15db7..9627ccdf8 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -91,33 +91,28 @@ function registerVintageImprovementsRecipes(event) { F: '#forge:tools/hammers' }).id('tfg:vi/shaped/helve_hammer') - event.recipes.create.mechanical_crafting('vintageimprovements:lathe', [ - 'DEEFE', - 'AB CG', - 'DEEFE' + event.shaped('vintageimprovements:grinder_belt', [ + 'AAA', + 'CBC' + ], { + A: 'createaddition:diamond_grit_sandpaper', + B: 'greate:rubber_belt_connector', + C: 'tfc:glue' + }).id('tfg:vi/shaped/grinder_belt') + + event.shaped('vintageimprovements:belt_grinder', [ + 'GBG', + 'EAF', + 'DCD' ], { A: 'gtceu:ulv_machine_hull', - B: 'minecraft:piston', - C: 'minecraft:diamond', - D: '#forge:plates/treated_wood', - E: '#forge:rods/black_steel', - F: '#gtceu:circuits/ulv', - G: 'create:precision_mechanism' - }).id('tfg:vi/mechanical_crafting/lathe') - - // Re-enable this thing's EMI category as well, if we end up using it - //event.shaped('vintageimprovements:laser', [ - // 'FBF', - // 'EAE', - // 'DCD' - //], { - // A: 'gtceu:ulv_machine_hull', - // B: 'create:precision_mechanism', - // C: 'tfc:lens', - // D: 'gtceu:red_alloy_single_wire', - // E: 'minecraft:piston', - // F: '#gtceu:circuits/ulv' - //}).id('tfg:vi/shaped/laser') + B: 'vintageimprovements:grinder_belt', + C: 'greate:steel_cogwheel', + D: '#gtceu:circuits/ulv', + E: 'create:precision_mechanism', + F: 'minecraft:diamond', + G: '#forge:rods/black_steel' + }).id('tfg:vi/shaped/belt_grinder') // #endregion @@ -138,16 +133,6 @@ function registerVintageImprovementsRecipes(event) { .duration(20 * 20) .EUt(20) - event.shaped('vintageimprovements:recipe_card', [ - ' B ', - 'CA ', - ' B ' - ], { - A: '#forge:plates/brass', - B: '#forge:screws/wrought_iron', - C: '#forge:tools/screwdrivers' - }).id('tfg:vi/shaped/recipe_card') - event.shaped('vintageimprovements:helve_hammer_slot_cover', [ 'B B', 'CA ', @@ -387,19 +372,21 @@ function registerVintageImprovementsRecipes(event) { if (latheInput !== null) { event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [latheInput], results: [ChemicalHelper.get(TagPrefix.rod, material, 2)], - processingTime: material.getMass() * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER + speed_limits: 3, + processingTime: material.getMass() * 4 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER }).id(`tfg:vi/lathe/${material.getName()}_to_rod`) } } if (material.hasFlag(MaterialFlags.GENERATE_BOLT_SCREW)) { event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [ChemicalHelper.get(TagPrefix.bolt, material, 1)], results: [ChemicalHelper.get(TagPrefix.screw, material, 1)], + speed_limits: 2, processingTime: Math.max(1, material.getMass() / 8) * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER }).id(`tfg:vi/lathe/${material.getName()}_bolt_to_screw`) } @@ -459,51 +446,58 @@ function registerVintageImprovementsRecipes(event) { // #region Lathe event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [{ tag: 'forge:glass' }], results: [{ item: 'tfc:lens' }], + speed_limits: 1, processingTime: 100 }).id(`tfg:vi/lathe/lens`) event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [{ tag: 'forge:exquisite_gems/rose_quartz' }], results: [{ item: 'gtceu:rose_quartz_lens' }, { item: 'gtceu:rose_quartz_dust', count: 2 }], + speed_limits: 1, processingTime: 100 }).id(`tfg:vi/lathe/rose_quartz_lens`) event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [{ tag: 'forge:exquisite_gems/diamond' }], results: [{ item: 'gtceu:diamond_lens' }, { item: 'gtceu:diamond_dust', count: 2 }], + speed_limits: 1, processingTime: 100 }).id(`tfg:vi/lathe/diamond_lens`) event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [{ tag: 'forge:exquisite_gems/emerald' }], results: [{ item: 'gtceu:emerald_lens' }, { item: 'gtceu:emerald_dust', count: 2 }], + speed_limits: 1, processingTime: 100 }).id(`tfg:vi/lathe/emerald_lens`) event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [{ tag: 'forge:exquisite_gems/ruby' }], results: [{ item: 'gtceu:ruby_lens' }, { item: 'gtceu:ruby_dust', count: 2 }], + speed_limits: 1, processingTime: 100 }).id(`tfg:vi/lathe/ruby_lens`) event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [{ tag: 'forge:exquisite_gems/sapphire' }], results: [{ item: 'gtceu:sapphire_lens' }, { item: 'gtceu:sapphire_dust', count: 2 }], + speed_limits: 1, processingTime: 100 }).id(`tfg:vi/lathe/sapphire_lens`) event.custom({ - type: 'vintageimprovements:turning', + type: 'vintageimprovements:polishing', ingredients: [{ tag: 'forge:exquisite_gems/amethyst' }], results: [{ item: 'gtceu:amethyst_lens' }, { item: 'gtceu:amethyst_dust', count: 2 }], + speed_limits: 1, processingTime: 100 }).id(`tfg:vi/lathe/amethyst_lens`) diff --git a/kubejs/startup_scripts/vintage_improvements/constants.js b/kubejs/startup_scripts/vintage_improvements/constants.js index d08263ff7..717cdf593 100644 --- a/kubejs/startup_scripts/vintage_improvements/constants.js +++ b/kubejs/startup_scripts/vintage_improvements/constants.js @@ -6,13 +6,12 @@ global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER = 4; global.VINTAGE_IMPROVEMENTS_DISABLED_ITEMS = [ - 'vintageimprovements:belt_grinder', 'vintageimprovements:convex_curving_head', 'vintageimprovements:concave_curving_head', 'vintageimprovements:w_shaped_curving_head', 'vintageimprovements:v_shaped_curving_head', - 'vintageimprovements:grinder_belt', 'vintageimprovements:spring_coiling_machine_wheel', + 'vintageimprovements:lathe', 'vintageimprovements:laser', 'vintageimprovements:laser_item', 'vintageimprovements:sulfur_chunk', @@ -22,6 +21,7 @@ global.VINTAGE_IMPROVEMENTS_DISABLED_ITEMS = [ 'vintageimprovements:copper_sulfate', 'vintageimprovements:incomplete_redstone_module', 'vintageimprovements:incomplete_recipe_card', + 'vintageimprovements:recipe_card', 'vintageimprovements:bronze_sheet', 'vintageimprovements:amethyst_bronze_sheet', @@ -91,7 +91,6 @@ global.VINTAGE_IMPROVEMENTS_DISABLED_ITEMS = [ global.VINTAGE_IMPROVEMENTS_DISABLED_BLOCKS = [ - 'vintageimprovements:belt_grinder', 'vintageimprovements:sulfur_block', ]