illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse source
This commit is contained in:
Pyritie 2025-08-29 01:05:44 +01:00
commit 943835fbad
6 changed files with 64 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kubejs/server_scripts/sandworm/recipes.js
View file

@ -6,7 +6,7 @@ const registerSandwormRecipes = (event) => {
event.remove({ mod: 'sandworm_mod'})
event.recipes.gtceu.assembler('sandworm_mod:thumper')
.itemInputs('6x #forge:plates/maraging_steel_300', '#gtceu:circuits/iv', 'gtceu:ev_electric_piston')
.itemInputs('6x #forge:plates/ostrum', '#gtceu:circuits/iv', 'gtceu:ev_electric_piston')
.inputFluids(Fluid.of('gtceu:radon', 100))
.itemOutputs('sandworm_mod:thumper')
.duration(200)

20
kubejs/server_scripts/tfc/recipes.sand.js
View file

@ -34,7 +34,7 @@ function registerTFCSandRecipes(event) {
event.recipes.gtceu.forge_hammer(`raw_${sandColor}_sandstone_to_sand`)
.itemInputs(`tfc:raw_sandstone/${sandColor}`)
.itemOutputs(`4x tfc:sand/${sandColor}`)
.duration(200)
.duration(20*3.5)
.EUt(2)
event.recipes.greate.pressing(`4x tfc:sand/${sandColor}`, `tfc:raw_sandstone/${sandColor}`)
@ -45,7 +45,7 @@ function registerTFCSandRecipes(event) {
event.recipes.gtceu.forge_hammer(`smooth_${sandColor}_sandstone_to_sand`)
.itemInputs(`tfc:smooth_sandstone/${sandColor}`)
.itemOutputs(`4x tfc:sand/${sandColor}`)
.duration(200)
.duration(20*3.5)
.EUt(2)
event.recipes.greate.pressing(`4x tfc:sand/${sandColor}`, `tfc:smooth_sandstone/${sandColor}`)
@ -56,7 +56,7 @@ function registerTFCSandRecipes(event) {
event.recipes.gtceu.forge_hammer(`cut_${sandColor}_sandstone_to_sand`)
.itemInputs(`tfc:cut_sandstone/${sandColor}`)
.itemOutputs(`4x tfc:sand/${sandColor}`)
.duration(200)
.duration(20*3.5)
.EUt(2)
event.recipes.greate.pressing(`4x tfc:sand/${sandColor}`, `tfc:cut_sandstone/${sandColor}`)
@ -138,7 +138,7 @@ function registerTFCSandRecipes(event) {
event.recipes.gtceu.forge_hammer('brown_gravel_to_sand')
.itemInputs('#tfc:brown_gravel')
.itemOutputs('tfc:sand/brown')
.duration(200)
.duration(20*3.5)
.EUt(2)
event.recipes.greate.pressing('tfc:sand/brown', '#tfc:brown_gravel')
@ -149,7 +149,7 @@ function registerTFCSandRecipes(event) {
event.recipes.gtceu.forge_hammer('white_gravel_to_sand')
.itemInputs('#tfc:white_gravel')
.itemOutputs('tfc:sand/white')
.duration(200)
.duration(20*3.5)
.EUt(2)
event.recipes.greate.pressing('tfc:sand/white', '#tfc:white_gravel')
@ -160,7 +160,7 @@ function registerTFCSandRecipes(event) {
event.recipes.gtceu.forge_hammer('black_gravel_to_sand')
.itemInputs('#tfc:black_gravel')
.itemOutputs('tfc:sand/black')
.duration(200)
.duration(20*3.5)
.EUt(2)
event.recipes.greate.pressing('tfc:sand/black', '#tfc:black_gravel')
@ -171,7 +171,7 @@ function registerTFCSandRecipes(event) {
event.recipes.gtceu.forge_hammer('red_gravel_to_sand')
.itemInputs('#tfc:red_gravel')
.itemOutputs('tfc:sand/red')
.duration(200)
.duration(20*3.5)
.EUt(2)
event.recipes.greate.pressing('tfc:sand/red', '#tfc:red_gravel')
@ -182,7 +182,7 @@ function registerTFCSandRecipes(event) {
event.recipes.gtceu.forge_hammer('yellow_gravel_to_sand')
.itemInputs('#tfc:yellow_gravel')
.itemOutputs('tfc:sand/yellow')
.duration(200)
.duration(20*3.5)
.EUt(2)
event.recipes.greate.pressing('tfc:sand/yellow', '#tfc:yellow_gravel')
@ -193,7 +193,7 @@ function registerTFCSandRecipes(event) {
event.recipes.gtceu.forge_hammer('green_gravel_to_sand')
.itemInputs('#tfc:green_gravel')
.itemOutputs('tfc:sand/green')
.duration(200)
.duration(20*3.5)
.EUt(2)
event.recipes.greate.pressing('tfc:sand/green', '#tfc:green_gravel')
@ -204,7 +204,7 @@ function registerTFCSandRecipes(event) {
event.recipes.gtceu.forge_hammer('pink_gravel_to_sand')
.itemInputs('#tfc:pink_gravel')
.itemOutputs('tfc:sand/pink')
.duration(200)
.duration(20*3.5)
.EUt(2)
event.recipes.greate.pressing('tfc:sand/pink', '#tfc:pink_gravel')

24
kubejs/server_scripts/tfg/recipes.rocks.js
View file

@ -159,30 +159,30 @@ function registerTFGRockRecipes(event) {
const HAMMERING = [
{ raw: 'minecraft:deepslate', hammered: 'minecraft:cobbled_deepslate', duration: 10, eu: 16 },
{ raw: 'minecraft:cobbled_deepslate', hammered: 'tfc:sand/black', duration: 200, eu: 2 },
{ raw: 'minecraft:blackstone', hammered: 'tfc:sand/black', duration: 200, eu: 2 },
{ raw: 'beneath:crackrack', hammered: 'tfc:sand/pink', duration: 200, eu: 2 },
{ raw: 'minecraft:dripstone_block', hammered: 'tfc:sand/brown', duration: 200, eu: 2 },
{ raw: 'minecraft:cobbled_deepslate', hammered: 'tfc:sand/black', duration: 20*3.5, eu: 2 },
{ raw: 'minecraft:blackstone', hammered: 'tfc:sand/black', duration: 20*3.5, eu: 2 },
{ raw: 'beneath:crackrack', hammered: 'tfc:sand/pink', duration: 20*3.5, eu: 2 },
{ raw: 'minecraft:dripstone_block', hammered: 'tfc:sand/brown', duration: 20*3.5, eu: 2 },
{ raw: 'ad_astra:moon_stone', hammered: 'ad_astra:moon_cobblestone', duration: 10, eu: 16 },
{ raw: 'tfg:rock/hardened_moon_stone', hammered: 'ad_astra:moon_cobblestone', duration: 10, eu: 16 },
{ raw: 'ad_astra:moon_cobblestone', hammered: 'ad_astra:moon_sand', duration: 200, eu: 2 },
{ raw: 'ad_astra:moon_deepslate', hammered: 'ad_astra:moon_sand', duration: 200, eu: 2 },
{ raw: 'tfg:rock/hardened_moon_deepslate', hammered: 'ad_astra:moon_sand', duration: 200, eu: 2 },
{ raw: 'ad_astra:moon_cobblestone', hammered: 'ad_astra:moon_sand', duration: 20*3.5, eu: 2 },
{ raw: 'ad_astra:moon_deepslate', hammered: 'ad_astra:moon_sand', duration: 20*3.5, eu: 2 },
{ raw: 'tfg:rock/hardened_moon_deepslate', hammered: 'ad_astra:moon_sand', duration: 20*3.5, eu: 2 },
{ raw: 'ad_astra:mars_stone', hammered: 'ad_astra:mars_cobblestone', duration: 10, eu: 16 },
{ raw: 'tfg:rock/hardened_mars_stone', hammered: 'ad_astra:mars_cobblestone', duration: 10, eu: 16 },
{ raw: 'ad_astra:mars_cobblestone', hammered: 'ad_astra:mars_sand', duration: 200, eu: 2 },
{ raw: 'ad_astra:mars_cobblestone', hammered: 'ad_astra:mars_sand', duration: 20*3.5, eu: 2 },
{ raw: 'ad_astra:venus_stone', hammered: 'ad_astra:venus_cobblestone', duration: 10, eu: 16 },
{ raw: 'tfg:rock/hardened_venus_stone', hammered: 'ad_astra:venus_cobblestone', duration: 10, eu: 16 },
{ raw: 'ad_astra:venus_cobblestone', hammered: 'ad_astra:venus_sand', duration: 200, eu: 2 },
{ raw: 'ad_astra:venus_cobblestone', hammered: 'ad_astra:venus_sand', duration: 20*3.5, eu: 2 },
{ raw: 'ad_astra:mercury_stone', hammered: 'ad_astra:mercury_cobblestone', duration: 10, eu: 16 },
{ raw: 'tfg:rock/hardened_mercury_stone', hammered: 'ad_astra:mercury_cobblestone', duration: 10, eu: 16 },
{ raw: 'ad_astra:mercury_cobblestone', hammered: 'tfc:sand/red', duration: 200, eu: 2 },
{ raw: 'ad_astra:mercury_cobblestone', hammered: 'tfc:sand/red', duration: 20*3.5, eu: 2 },
{ raw: 'ad_astra:glacio_stone', hammered: 'ad_astra:glacio_cobblestone', duration: 10, eu: 16 },
{ raw: 'tfg:rock/hardened_glacio_stone', hammered: 'ad_astra:glacio_cobblestone', duration: 10, eu: 16 },
{ raw: 'ad_astra:glacio_cobblestone', hammered: 'tfc:sand/white', duration: 200, eu: 2 },
{ raw: 'ad_astra:glacio_cobblestone', hammered: 'tfc:sand/white', duration: 20*3.5, eu: 2 },
{ raw: 'ad_astra:conglomerate', hammered: 'tfc:rock/gravel/conglomerate', duration: 10, eu: 16 },
{ raw: 'ad_astra:permafrost', hammered: '4x gtceu:ice_dust', duration: 200, eu: 2 }
{ raw: 'ad_astra:permafrost', hammered: '4x gtceu:ice_dust', duration: 20, eu: 2 }
]
HAMMERING.forEach(x => {

7
kubejs/startup_scripts/minecraft/modifications.js
View file

@ -18,6 +18,13 @@ function registerMinecraftItemModifications(event) {
}
})
event.modify('minecraft:popped_chorus_fruit', item => {
item.foodProperties = food => {
food.hunger(2)
food.saturation(1)
}
})
event.modify('minecraft:elytra', item => {
item.maxDamage = 2046
})