diff --git a/kubejs/server_scripts/Early_Game.js b/kubejs/server_scripts/Early_Game.js index e690ce94d..ab4ac5711 100644 --- a/kubejs/server_scripts/Early_Game.js +++ b/kubejs/server_scripts/Early_Game.js @@ -42,6 +42,9 @@ event.recipes.gtceu.electric_blast_furnace("aluminium_ingot_gas") event.shapeless("minecraft:sand", ["minecraft:gravel", "#forge:tools/hammers"]) event.shapeless("kubejs:dust", ["minecraft:sand", "#forge:tools/hammers"]) + // Dust hydration + event.shapeless("minecraft:clay", ["kubejs:dust", "minecraft:water_bucket"]) + // EIO Solar event.recipes.gtceu.alloy_smelter("photovoltaic_plate") .itemInputs("2x enderio:photovoltaic_composite", "gtceu:electrical_steel_plate") diff --git a/kubejs/server_scripts/Remove_Recipes.js b/kubejs/server_scripts/Remove_Recipes.js index 23ec62988..e97e658ee 100644 --- a/kubejs/server_scripts/Remove_Recipes.js +++ b/kubejs/server_scripts/Remove_Recipes.js @@ -110,11 +110,6 @@ ServerEvents.recipes(event => { // PEX event.remove({ output: ['packagedexcrafting:flux_crafter', 'packagedexcrafting:basic_crafter'] }) - // Utilitarian - event.remove({ id: /utilitarian:.*_soliciting_carpet/ }) - event.remove({ output: ['utilitarian:snad', 'utilitarian:red_snad', 'utilitarian:soul_snad', 'utilitarian:fluid_hopper', 'utilitarian:no_soliciting_banner']}) - event.remove({ id: 'utilitarian:utility/logs_to_hopper'}) - // Shrink event.remove({ output: 'shrink:shrinking_device'}) }) diff --git a/kubejs/server_scripts/mods/HostileNeuralNetworks.js b/kubejs/server_scripts/mods/HostileNeuralNetworks.js index 39b866511..2e2c9c4a8 100644 --- a/kubejs/server_scripts/mods/HostileNeuralNetworks.js +++ b/kubejs/server_scripts/mods/HostileNeuralNetworks.js @@ -108,19 +108,6 @@ ServerEvents.recipes(event => { .duration(100) .EUt(20) - event.recipes.gtceu.forge_hammer('dust') - .itemInputs('minecraft:sand') - .itemOutputs('kubejs:dust') - .duration(16) - .EUt(10) - - event.recipes.gtceu.chemical_reactor('gt_clay') - .itemInputs('kubejs:dust') - .itemOutputs('minecraft:clay') - .inputFluids('water') - .duration(20) - .EUt(15) - event.recipes.gtceu.alloy_smelter('carbon_fiber_mesh_coal') .itemInputs(['4x minecraft:string', 'gtceu:coal_dust']) .itemOutputs('gtceu:carbon_fiber_mesh') diff --git a/kubejs/server_scripts/mods/utilitarian.js b/kubejs/server_scripts/mods/utilitarian.js new file mode 100644 index 000000000..a917fa513 --- /dev/null +++ b/kubejs/server_scripts/mods/utilitarian.js @@ -0,0 +1,20 @@ +ServerEvents.recipes(event => { + //Remove No Soliciting Carpets + event.remove({ id: /utilitarian:.*_soliciting_carpet/ }) + + //Remove snad & variants + event.remove({ output: ['utilitarian:snad', 'utilitarian:red_snad', 'utilitarian:soul_snad', 'utilitarian:fluid_hopper', 'utilitarian:no_soliciting_banner']}) + + //Remove utility recipes when they overshadow GT recipes + event.remove({ id: 'utilitarian:utility/logs_to_hopper'}) + if(isHardMode) { + event.remove({ id: 'utilitarian:utility/charcoal_from_campfire'}) + } + if(isHarderMode) { + event.remove({ id: 'utilitarian:utility/logs_to_ladders'}) + event.remove({ id: 'utilitarian:utility/logs_to_chests'}) + event.remove({ id: 'utilitarian:utility/logs_to_sticks'}) + event.remove({ id: 'utilitarian:utility/logs_to_bowls'}) + event.remove({ id: /utilitarian:.*_logs_to_.*/}) + } +}) \ No newline at end of file diff --git a/kubejs/server_scripts/normal_mode.js b/kubejs/server_scripts/normal_mode.js index 0c2650004..0ad45adc0 100644 --- a/kubejs/server_scripts/normal_mode.js +++ b/kubejs/server_scripts/normal_mode.js @@ -8,8 +8,6 @@ ServerEvents.recipes(event => { event.smelting("gtceu:steel_ingot", "gtceu:steel_dust") event.remove({ type: "gtceu:primitive_blast_furnace", output: "gtceu:steel_ingot" }) event.remove({ type: "gtceu:electric_blast_furnace", output: "gtceu:steel_ingot" }) - - event.remove({ type: "minecraft:smelting", output: "gtceu:firebrick" }) event.remove({ id: /fireclay/ }) event.remove({ output: ['gtceu:firebrick', 'gtceu:firebricks', 'gtceu:primitive_blast_furnace'] }) @@ -33,9 +31,6 @@ ServerEvents.recipes(event => { event.remove({ type: "minecraft:smelting", output: "gtceu:wrought_iron_nugget" }) event.smelting("gtceu:wrought_iron_ingot", "minecraft:iron_ingot") - // Dust hydration - event.shapeless("minecraft:clay", ["kubejs:dust", "minecraft:water_bucket"]) - // Make clay electrolysis an LV recipe event.remove({ id: "gtceu:electrolyzer/decomposition_electrolyzing_clay" }) event.recipes.gtceu.electrolyzer("clay_electrolysis_lv") @@ -109,7 +104,7 @@ ServerEvents.recipes(event => { R: "gtceu:sticky_resin" } ) - + // Compressor rubber - better, but not perfect - that's chemical reactor rubber event.recipes.gtceu.compressor("compressor_rubber_sheet") .itemInputs("gtceu:sticky_resin") @@ -186,8 +181,6 @@ ServerEvents.recipes(event => { .duration(100) .EUt(128) - event.remove({ type: "minecraft:smelting", output: "gtceu:firebrick" }) - //GT Steam Age gtMachines.forEach(machine => { event.remove({ output: ['gtceu:lp_steam_' + machine, 'gtceu:hp_steam_' + machine] }) diff --git a/kubejs/server_scripts/random_recipes.js b/kubejs/server_scripts/random_recipes.js index 7c498b966..e655e8b8f 100644 --- a/kubejs/server_scripts/random_recipes.js +++ b/kubejs/server_scripts/random_recipes.js @@ -66,9 +66,6 @@ ServerEvents.recipes(event => { event.shapeless('minecraft:blaze_rod', 'minecraft:brewing_stand') event.replaceInput({ input: 'gtceu:wood_plate' }, 'gtceu:wood_plate', '#minecraft:planks') - // Dust hydration - event.shapeless("minecraft:clay", ["kubejs:dust", "minecraft:water_bucket"]) - // Sculk LCR recipes event.recipes.gtceu.large_chemical_reactor("sculk_catalyst") @@ -900,5 +897,19 @@ ServerEvents.recipes(event => { .duration(200) .EUt(7) + //Clay synthesis from Dust + event.recipes.gtceu.forge_hammer('dust') + .itemInputs('minecraft:sand') + .itemOutputs('kubejs:dust') + .duration(16) + .EUt(10) + + event.recipes.gtceu.chemical_reactor('gt_clay') + .itemInputs('kubejs:dust') + .itemOutputs('minecraft:clay') + .inputFluids('water') + .duration(20) + .EUt(15) + })