diff --git a/.gitignore b/.gitignore index 53147909..01cd88db 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ usercache.json usernamecache.json /XaeroWaypoints* /XaeroWorldMap +/xaero .vscode kubejs/server_scripts/debug/ kubejs/server_scripts/jsconfig.json @@ -48,3 +49,8 @@ node-tail.js ESM texturepacks ldlib +.curseclient +manifest.json +minecraftinstance.json +modlist.html +/downloads diff --git a/kubejs/server_scripts/main_server.js b/kubejs/server_scripts/main_server.js index 4539c8a7..21572aa9 100644 --- a/kubejs/server_scripts/main_server.js +++ b/kubejs/server_scripts/main_server.js @@ -12,6 +12,7 @@ ServerEvents.recipes((event) => { spaceDustChain(event) certusSemiconductors(event) gregifyAE2(event) + replaceDisc(event) }) LootJS.modifiers((event) => { diff --git a/kubejs/server_scripts/mods/scguns/replaceDisc.js b/kubejs/server_scripts/mods/scguns/replaceDisc.js new file mode 100644 index 00000000..1ac603e9 --- /dev/null +++ b/kubejs/server_scripts/mods/scguns/replaceDisc.js @@ -0,0 +1,71 @@ +let replaceDisc = (/** @type {Internal.RecipesEventJS} */ event) => { + function replaceDiscRecipe(input,output) { + event.remove({ output: output, mod: 'scguns' }) + event.custom({ + type: "scguns:mechanical_pressing", + processingTime: 400, + ingredients: [ + { + "item": "gtceu:polyvinyl_chloride_plate" + }, + { + "item": "minecraft:charcoal" + }, + { + "item": input + } + + ], + mold: { + "item": "scguns:disc_mold" + }, + result: { + "item": output, + "count": 1 + } + }) + event.custom({ + type: "scguns:powered_mechanical_pressing", + processingTime: 200, + energyUse: 500, + ingredients: [ + { + "item": "gtceu:polyvinyl_chloride_plate" + }, + { + "item": "minecraft:charcoal" + }, + { + "item": input + } + + ], + mold: { + "item": "scguns:disc_mold" + }, + result: { + "item": output, + "count": 1 + } + }) + } + + replaceDiscRecipe('minecraft:blackstone','minecraft:music_disc_11') + replaceDiscRecipe('minecraft:gold_ingot','minecraft:music_disc_13') + replaceDiscRecipe('scguns:peal','minecraft:music_disc_5') + replaceDiscRecipe('minecraft:redstone','minecraft:music_disc_blocks') + replaceDiscRecipe('minecraft:string','minecraft:music_disc_cat') + replaceDiscRecipe('minecraft:feather','minecraft:music_disc_chirp') + replaceDiscRecipe('minecraft:ender_pearl','minecraft:music_disc_far') + replaceDiscRecipe('minecraft:emerald','minecraft:music_disc_mall') + replaceDiscRecipe('scguns:vehement_coal','scguns:music_disc_mass_destruction') + replaceDiscRecipe('scguns:anthralite_ingot','scguns:music_disc_mass_production') + replaceDiscRecipe('minecraft:note_block','minecraft:music_disc_mellohi') + replaceDiscRecipe('minecraft:prismarine_shard','minecraft:music_disc_otherside') + replaceDiscRecipe('minecraft:porkchop','minecraft:music_disc_pigstep') + replaceDiscRecipe('scguns:netherite_scrap_chunk','minecraft:music_disc_relic') + replaceDiscRecipe('minecraft:coal','minecraft:music_disc_stal') + replaceDiscRecipe('minecraft:tropical_fish','minecraft:music_disc_strad') + replaceDiscRecipe('minecraft:clock','minecraft:music_disc_wait') + replaceDiscRecipe('minecraft:nether_wart','minecraft:music_disc_ward') +} \ No newline at end of file diff --git a/kubejs/server_scripts/recipes/replace.js b/kubejs/server_scripts/recipes/replace.js index 34489115..aef3a80c 100644 --- a/kubejs/server_scripts/recipes/replace.js +++ b/kubejs/server_scripts/recipes/replace.js @@ -371,7 +371,7 @@ let replaceRecipes = (/** @type {Internal.RecipesEventJS} */ event) => { //gtceu event.replaceInput({ mod: "gtceu" }, "minecraft:chest", "#forge:chests/wooden") //fix ULV buses requiring vanilla chest - + event.replaceInput({ mod: "gtceu" , not: { output: 'minecraft:magma_cream' }}, "minecraft:slime_ball", "tfc:glue") event.replaceInput({ input: "minecraft:phantom_membrane" }, "minecraft:phantom_membrane", "#gravitas:phantom") //tfcea