From 5a187602c8f5f9c6a1419a82c2d3383b2b6b70fa Mon Sep 17 00:00:00 2001 From: Victoria Fischer Date: Sun, 15 Jun 2025 16:03:10 +0200 Subject: [PATCH] grist: buff improved build grist, cut out the janky dissolution chamber fluid conversions, fix flour crushing in create --- kubejs/server_scripts/grist/agricultural.js | 3 ++- kubejs/server_scripts/grist/build.js | 6 +++--- kubejs/server_scripts/grist/primordeal.js | 4 ++-- kubejs/server_scripts/ore-processing.js | 10 ++++++---- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/kubejs/server_scripts/grist/agricultural.js b/kubejs/server_scripts/grist/agricultural.js index d7f0383..9a7c027 100755 --- a/kubejs/server_scripts/grist/agricultural.js +++ b/kubejs/server_scripts/grist/agricultural.js @@ -9,7 +9,8 @@ ServerEvents.recipes(event => { // Vanilla crafting with a hammer gives 0.5x flour per wheat event.shapeless(flourItem.withCount(1), ['2x #croptopia:flourable', '#alltheores:ore_hammers']); // Basic tier of grist gives 2x flour per wheat - event.recipes.createCrushing(flourItem.withCount(2), '#croptopia:flourable'); + event.recipes.create.crushing(flourItem.withCount(2), '#croptopia:flourable'); + event.recipes.create.milling(flourItem.withCount(2), '#croptopia:flourable'); // Late basic gives 4x per wheat event.recipes.thermal.pulverizer('#croptopia:flourable', [flourItem.withCount(4)]); diff --git a/kubejs/server_scripts/grist/build.js b/kubejs/server_scripts/grist/build.js index 67c72d5..b9bc73e 100755 --- a/kubejs/server_scripts/grist/build.js +++ b/kubejs/server_scripts/grist/build.js @@ -83,11 +83,11 @@ ServerEvents.recipes(event => { grist blend comes from basic + improved primordeal block + sulfur in induction smelter */ event.recipes.thermal.crystallizer( - '4x kubejs:grist_build_improved', - ['4x minecraft:clay', '2x #kubejs:grist/build/improved', Fluid.of('kubejs:grist_primordeal_improved_fluid', 4500)] + 'kubejs:grist_build_improved_block', + ['4x minecraft:clay', '#kubejs:grist/build/improved', Fluid.of('kubejs:grist_primordeal_improved_fluid', 4500)] ); event.recipes.thermal.crystallizer( - 'kubejs:grist_build_improved', + 'kubejs:grist_build_improved_block', ['32x kubejs:reinforced_grist_ingot', Fluid.of('kubejs:grist_primordeal_improved_fluid', 4000)] ); diff --git a/kubejs/server_scripts/grist/primordeal.js b/kubejs/server_scripts/grist/primordeal.js index 0417052..3a53bf6 100755 --- a/kubejs/server_scripts/grist/primordeal.js +++ b/kubejs/server_scripts/grist/primordeal.js @@ -51,7 +51,7 @@ ServerEvents.recipes(event => { event.shapeless(blockID, [`9x ${id}`]); event.shapeless(`9x ${id}`, [blockID]); - event.custom({ + /*event.custom({ type: "industrialforegoing:dissolution_chamber", input: [], inputFluid: `{Amount:250,FluidName:\"${fluidID}\"}`, @@ -73,7 +73,7 @@ ServerEvents.recipes(event => { }, outputFluid: `{Amount:250,FluidName:\"${fluidID}\"}`, processingTime: 50 - }); + });*/ }); // Progression along primordeals and universals diff --git a/kubejs/server_scripts/ore-processing.js b/kubejs/server_scripts/ore-processing.js index 52570b0..6eedd17 100755 --- a/kubejs/server_scripts/ore-processing.js +++ b/kubejs/server_scripts/ore-processing.js @@ -308,6 +308,8 @@ ServerEvents.recipes(event => { // Andesite alloy is the progression item, as it unlocks most of the next tier of create event.shapeless('create:andesite_alloy', [global.dustItem('tin'), '2x minecraft:andesite']); + let xpNugget = Item.of('create:experience_nugget'); + // Andesite age: Crushing wheels to crush, then the crushed ore is smelted normally. Alloys require the create mixer. Ore washing to double crushed ore is unlocked, but fans require invar instead of iron. Gears can be crafted on a crafting table for (const tier of ['primitive', 'vanilla', 'andesite']) { for (const [metal, ingredients] of Object.entries(progression[tier])) { @@ -323,8 +325,8 @@ ServerEvents.recipes(event => { if (rawType.id != 'minecraft:air') { if (crushedType.id != 'minecraft:air') { - event.recipes.create.crushing([crushedType.withCount(2)], rawType); - event.recipes.create.crushing([crushedType.withCount(18)], rawBlockType); + event.recipes.create.crushing([crushedType.withCount(2), xpNugget.withCount(2).withChance(0.75)], rawType); + event.recipes.create.crushing([crushedType.withCount(18), xpNugget.withCount(18).withChance(0.75)], rawBlockType); event.recipes.create.milling([crushedType.withCount(2)], rawType); event.recipes.create.milling([crushedType.withCount(18)], rawBlockType); event.smelting(ingotType, crushedType); @@ -447,8 +449,8 @@ ServerEvents.recipes(event => { let rawBlockType = metalForm(`raw_${metal}`, 'storage_blocks', 'block'); if (rawType.id != 'minecraft:air') { if (crushedType.id != 'minecraft:air') { - event.recipes.thermal.pulverizer([crushedType.withCount(4), crushedType.withChance(0.25)], rawType); - event.recipes.thermal.pulverizer([crushedType.withCount(4 * 9), crushedType.withChance(0.25)], rawBlockType); + event.recipes.thermal.pulverizer([crushedType.withCount(4), crushedType.withChance(0.25), xpNugget.withCount(4).withChance(0.75)], rawType); + event.recipes.thermal.pulverizer([crushedType.withCount(4 * 9), crushedType.withChance(0.25), xpNugget.withCount(4 * 9).withChance(0.75)], rawBlockType); event.recipes.thermal.centrifuge([dustType.withCount(4), dustType.withChance(0.25)], crushedType); } else { console.error(`No ${metal} ore centrifuing available!`);