Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

KJS folder cleanup #1072

Merged
merged 4 commits into from
Nov 7, 2024
Merged

KJS folder cleanup #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
063be69
Move and Merge some files
ThePansmith Nov 7, 2024
b33537c
Add tooltip for qb
ThePansmith Nov 7, 2024
0a46a7e
Cleaned up some recipes via converting them to functions
ThePansmith Nov 7, 2024
6828262
Moved the BB fix to its own file so its easier for other packdevs to …
ThePansmith Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...ptionalCompats/projectred_transmission.js → ...ptionalCompats/projectred_transmission.js
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions kubejs/client_scripts/tooltips.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ ItemEvents.tooltip(tooltip => {
// Endgame Items
tooltip.add('kubejs:ultimate_gem', '§eRecipe is shapeless.')

// Questbook
tooltip.addAdvanced(`ftbquests:book`, (item, adv, text) => {text.add(2, Text.gray('The quest window can also be opened with a keybind.'))})

// DML Data Model
tooltip.add('hostilenetworks:blank_data_model', '§7use it in the crafting table instead!')
tooltip.add('hostilenetworks:data_model', '§7Upgrades when used in the §3Simulation Chamber')
Expand Down
28 changes: 11 additions & 17 deletions kubejs/server_scripts/Early_Game.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ ServerEvents.recipes(event => {
.duration(100)
.EUt(8)


//Resin Board stuff
event.recipes.gtceu.assembler('kubejs:resin_board_assembler')
.itemInputs('#minecraft:planks')
Expand All @@ -91,11 +91,11 @@ ServerEvents.recipes(event => {

//phenol

let steam = new JSONObject()
steam.add('amount', 4000)
steam.add('value', {tag:'forge:steam'})
let steam = new JSONObject()
steam.add('amount', 4000)
steam.add('value', { tag: 'forge:steam' })

//JSON object and FluidIngredientJS are loaded in server script _initial.js
//JSON object and FluidIngredientJS are loaded in server script _initial.js
event.recipes.gtceu.pyrolyse_oven('phenol_coal')
.itemInputs('16x minecraft:coal')
.inputFluids(FluidIngredientJS.of(steam))
Expand Down Expand Up @@ -132,18 +132,12 @@ ServerEvents.recipes(event => {
//Toolbelts
event.replaceInput({ output: 'toolbelt:pouch' }, 'minecraft:gold_ingot', 'gtceu:steel_ingot')

// early canning (using this explicitly as it has types)
// lithium, cadmium, sodium
event.recipes.minecraft.crafting_shapeless('gtceu:lv_lithium_battery', [
'gtceu:lv_battery_hull', '2x #forge:dusts/lithium'
]).id('moni:lv_lithium_battery')
event.recipes.minecraft.crafting_shapeless('gtceu:lv_cadmium_battery', [
'gtceu:lv_battery_hull', '2x #forge:dusts/cadmium'
]).id('moni:lv_cadmium_battery')
event.recipes.minecraft.crafting_shapeless('gtceu:lv_sodium_battery', [
'gtceu:lv_battery_hull', '2x #forge:dusts/sodium'
]).id('moni:lv_sodium_battery')
// early canning (using this explicitly as it has types)
// lithium, cadmium, sodium
event.recipes.minecraft.crafting_shapeless('gtceu:lv_lithium_battery', ['gtceu:lv_battery_hull', '2x #forge:dusts/lithium']).id('moni:lv_lithium_battery')
event.recipes.minecraft.crafting_shapeless('gtceu:lv_cadmium_battery', ['gtceu:lv_battery_hull', '2x #forge:dusts/cadmium']).id('moni:lv_cadmium_battery')
event.recipes.minecraft.crafting_shapeless('gtceu:lv_sodium_battery', ['gtceu:lv_battery_hull', '2x #forge:dusts/sodium']).id('moni:lv_sodium_battery')

//Battery Alloy Dust
event.shapeless("4x gtceu:battery_alloy_dust", ["4x gtceu:lead_dust", "gtceu:antimony_dust"])
event.shapeless("4x gtceu:battery_alloy_dust", ["4x gtceu:lead_dust", "gtceu:antimony_dust"])
})
13 changes: 13 additions & 0 deletions kubejs/server_scripts/End_Game.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,19 @@ ServerEvents.recipes(event => {
.duration(200)
.EUt(400)

// Ultimate Material
event.recipes.gtceu.assembly_line("kubejs:the_ultimate_material")
.itemInputs('kubejs:warden_heart', '4x kubejs:guardian_scale', '8x kubejs:wither_bone', '12x kubejs:ender_dragon_scale')
.itemOutputs('kubejs:the_ultimate_material')
.duration(600)
.EUt(491520)

.stationResearch(b => b
.researchStack('kubejs:warden_heart')
.CWUt(96, 384000)
.EUt(491520)
)

// Flux Plating
event.shaped(
'4x redstone_arsenal:flux_plating', [
Expand Down
0 kubejs/server_scripts/_hardmode/harder.js → ...ver_scripts/_hardmode/expert_exclusion.js
View file
Open in desktop
File renamed without changes.
0 ...rver_scripts/_hardmode/expert_missions.js → ...er_scripts/_hardmode/hardmode_missions.js
View file
Open in desktop
File renamed without changes.
206 changes: 43 additions & 163 deletions kubejs/server_scripts/extractor_solidifer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,166 +1,46 @@
ServerEvents.recipes(event => {

//Solidified to Gas again
event.recipes.gtceu.extractor('neon')
.itemInputs(['kubejs:solidified_neon'])
.outputFluids(['gtceu:neon 1000'])
.duration(200)
.EUt(30)

event.recipes.gtceu.extractor('krypton')
.itemInputs(['kubejs:solidified_krypton'])
.outputFluids(['gtceu:krypton 1000'])
.duration(200)
.EUt(30)

event.recipes.gtceu.extractor('xenon')
.itemInputs(['kubejs:solidified_xenon'])
.outputFluids(['gtceu:xenon 1000'])
.duration(200)
.EUt(30)

//Solidified to Gas
extractgas('neon', 'kubejs:solidified_neon', Fluid.of('gtceu:neon', 1000));
extractgas('krypton', 'kubejs:solidified_krypton', Fluid.of('gtceu:krypton', 1000));
extractgas('xenon', 'kubejs:solidified_xenon', Fluid.of('gtceu:xenon', 1000));
//Extract Nuclearcraft Isotopes
event.recipes.gtceu.extractor('thorium_230')
.itemInputs(['nuclearcraft:thorium_230'])
.outputFluids(['gtceu:thorium 144'])
.duration(200)
.EUt(30)

event.recipes.gtceu.extractor('thorium_232')
.itemInputs(['nuclearcraft:thorium_232'])
.outputFluids(['gtceu:thorium 144'])
.duration(200)
.EUt(30)

event.recipes.gtceu.extractor('uranium_233')
.itemInputs(['nuclearcraft:uranium_233'])
.outputFluids(['gtceu:uranium_235 144']) //TODO: Add Uranium 233 element
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('uranium_235')
.itemInputs(['nuclearcraft:uranium_235'])
.outputFluids(['gtceu:uranium_235 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('uranium_238')
.itemInputs(['nuclearcraft:uranium_238'])
.outputFluids(['gtceu:uranium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('neptunium_237')
.itemInputs(['nuclearcraft:neptunium_237'])
.outputFluids(['gtceu:neptunium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('neptunium_236')
.itemInputs(['nuclearcraft:neptunium_236'])
.outputFluids(['gtceu:neptunium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('plutonium_241')
.itemInputs(['nuclearcraft:plutonium_241'])
.outputFluids(['gtceu:plutonium_241 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('plutonium_242')
.itemInputs(['nuclearcraft:plutonium_242'])
.outputFluids(['gtceu:plutonium_241 144']) // a mate of mine is a chemist who plays moni, he's going to hate me for this -ciggy
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('plutonium_238')
.itemInputs(['nuclearcraft:plutonium_238'])
.outputFluids(['gtceu:plutonium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('plutonium_239')
.itemInputs(['nuclearcraft:plutonium_239'])
.outputFluids(['gtceu:plutonium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('curium_243')
.itemInputs(['nuclearcraft:curium_243'])
.outputFluids(['gtceu:curium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('curium_245')
.itemInputs(['nuclearcraft:curium_245'])
.outputFluids(['gtceu:curium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('curium_246')
.itemInputs(['nuclearcraft:curium_246'])
.outputFluids(['gtceu:curium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('curium_247')
.itemInputs(['nuclearcraft:curium_247'])
.outputFluids(['gtceu:curium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('americium_241')
.itemInputs(['nuclearcraft:americium_241'])
.outputFluids(['gtceu:americium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('americium_242')
.itemInputs(['nuclearcraft:americium_242'])
.outputFluids(['gtceu:americium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('americium_243')
.itemInputs(['nuclearcraft:americium_243'])
.outputFluids(['gtceu:americium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('berkelium_247')
.itemInputs(['nuclearcraft:berkelium_247'])
.outputFluids(['gtceu:berkelium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('berkelium_248')
.itemInputs(['nuclearcraft:berkelium_248'])
.outputFluids(['gtceu:berkelium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('californium_249')
.itemInputs(['nuclearcraft:californium_249'])
.outputFluids(['gtceu:californium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('californium_250')
.itemInputs(['nuclearcraft:californium_250'])
.outputFluids(['gtceu:californium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('californium_251')
.itemInputs(['nuclearcraft:californium_251'])
.outputFluids(['gtceu:californium 144'])
.duration(180)
.EUt(6)

event.recipes.gtceu.extractor('californium_252')
.itemInputs(['nuclearcraft:californium_252'])
.outputFluids(['gtceu:californium 144'])
.duration(180)
.EUt(6)
extractisotope('thorium_230', 'nuclearcraft:thorium_230', Fluid.of('gtceu:thorium', 144));
extractisotope('thorium_232', 'nuclearcraft:thorium_232', Fluid.of('gtceu:thorium', 144));
extractisotope('uranium_233', 'nuclearcraft:uranium_233', Fluid.of('gtceu:uranium_235', 144));
extractisotope('uranium_235', 'nuclearcraft:uranium_235', Fluid.of('gtceu:uranium_235', 144));
extractisotope('uranium_238', 'nuclearcraft:uranium_238', Fluid.of('gtceu:uranium', 144));
extractisotope('neptunium_237', 'nuclearcraft:neptunium_237', Fluid.of('gtceu:neptunium', 144));
extractisotope('neptunium_236', 'nuclearcraft:neptunium_236', Fluid.of('gtceu:neptunium', 144));
extractisotope('plutonium_241', 'nuclearcraft:plutonium_241', Fluid.of('gtceu:plutonium_241', 144));
extractisotope('plutonium_242', 'nuclearcraft:plutonium_242', Fluid.of('gtceu:plutonium_241', 144));
extractisotope('plutonium_238', 'nuclearcraft:plutonium_238', Fluid.of('gtceu:plutonium', 144));
extractisotope('plutonium_239', 'nuclearcraft:plutonium_239', Fluid.of('gtceu:plutonium', 144));
extractisotope('curium_243', 'nuclearcraft:curium_243', Fluid.of('gtceu:curium', 144));
extractisotope('curium_245', 'nuclearcraft:curium_245', Fluid.of('gtceu:curium', 144));
extractisotope('curium_246', 'nuclearcraft:curium_246', Fluid.of('gtceu:curium', 144));
extractisotope('curium_247', 'nuclearcraft:curium_247', Fluid.of('gtceu:curium', 144));
extractisotope('americium_241', 'nuclearcraft:americium_241', Fluid.of('gtceu:americium', 144));
extractisotope('americium_242', 'nuclearcraft:americium_242', Fluid.of('gtceu:americium', 144));
extractisotope('americium_243', 'nuclearcraft:americium_243', Fluid.of('gtceu:americium', 144));
extractisotope('berkelium_247', 'nuclearcraft:berkelium_247', Fluid.of('gtceu:berkelium', 144));
extractisotope('berkelium_248', 'nuclearcraft:berkelium_248', Fluid.of('gtceu:berkelium', 144));
extractisotope('californium_249', 'nuclearcraft:californium_249', Fluid.of('gtceu:californium', 144));
extractisotope('californium_250', 'nuclearcraft:californium_250', Fluid.of('gtceu:californium', 144));
extractisotope('californium_251', 'nuclearcraft:californium_251', Fluid.of('gtceu:californium', 144));
extractisotope('californium_252', 'nuclearcraft:californium_252', Fluid.of('gtceu:californium', 144));

function extractgas(recipename, input, output) {
event.recipes.gtceu.extractor(recipename)
.itemInputs(input)
.outputFluids(output)
.duration(200)
.EUt(30)
}
function extractisotope(recipename, input, output) {
event.recipes.gtceu.extractor(recipename)
.itemInputs(input)
.outputFluids(output)
.duration(180)
.EUt(6)
}
})
0 ...server_scripts/Better_Dynamo_Placement.js → ...s/fixes_tweaks/Better_Dynamo_Placement.js
View file
Open in desktop
File renamed without changes.
0 kubejs/server_scripts/Fixes_Server.js → ...rver_scripts/fixes_tweaks/Fixes_Server.js
View file
Open in desktop
File renamed without changes.
0 kubejs/server_scripts/Starting_Items.js → ...er_scripts/fixes_tweaks/Starting_Items.js
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 deletions kubejs/server_scripts/fixes_tweaks/bountry_board.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
//Bounty board recipes only accept oak. The dev has stated this is intended. https://github.com/ejektaflex/Bountiful/issues/271
ServerEvents.recipes(event => {
if (isNormalMode) {
event.replaceInput({ id: "bountiful:crafting/bountyboard" }, "minecraft:oak_log", "#minecraft:logs")
event.replaceInput({ id: "bountiful:crafting/bountyboard" }, "minecraft:oak_planks", "#minecraft:planks")
}})
0 kubejs/server_scripts/enchantments.js → ...rver_scripts/fixes_tweaks/enchantments.js
View file
Open in desktop
File renamed without changes.
0 ..._scripts/fix_enderio_redstone_conduits.js → ...s_tweaks/fix_enderio_redstone_conduits.js
View file
Open in desktop
File renamed without changes.
0 kubejs/server_scripts/glass_breaking.js → ...er_scripts/fixes_tweaks/glass_breaking.js
View file
Open in desktop
File renamed without changes.
0 kubejs/server_scripts/gregtech_credits.js → ..._scripts/fixes_tweaks/gregtech_credits.js
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...s/server_scripts/gregtech/hatch_revert.js → ...rver_scripts/fixes_tweaks/hatch_revert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Reverts the GTM 1.4.1 hatch recipe nerf for NM and HM
ServerEvents.recipes(event => {
if (!isExpertMode) {
event.remove({ id: /item_import_bus_/})
Expand Down
0 kubejs/server_scripts/no_strongholds.js → ...er_scripts/fixes_tweaks/no_strongholds.js
View file
Open in desktop
File renamed without changes.
0 kubejs/server_scripts/quest_scripts.js → ...ver_scripts/fixes_tweaks/quest_scripts.js
View file
Open in desktop
File renamed without changes.
0 ...s/server_scripts/superconducting_coils.js → ...pts/fixes_tweaks/superconducting_coils.js
View file
Open in desktop
File renamed without changes.
0 .../server_scripts/unification/loottables.js → ...ts/fixes_tweaks/unification/loottables.js
View file
Open in desktop
File renamed without changes.
0 .../server_scripts/unification/other_tags.js → ...ts/fixes_tweaks/unification/other_tags.js
View file
Open in desktop
File renamed without changes.
0 .../server_scripts/unification/quest_tags.js → ...ts/fixes_tweaks/unification/quest_tags.js
View file
Open in desktop
File renamed without changes.
0 kubejs/server_scripts/unification/tags.js → ..._scripts/fixes_tweaks/unification/tags.js
View file
Open in desktop
File renamed without changes.
0 kubejs/server_scripts/energy_cores.js → ...s/server_scripts/gregtech/energy_cores.js
View file
Open in desktop
File renamed without changes.
0 kubejs/server_scripts/Netherite.js → kubejs/server_scripts/gregtech/netherite.js
View file
Open in desktop
File renamed without changes.
0 ...er_scripts/gregtech/Actually_Additions.js → ...server_scripts/gregtech/reconstruction.js
View file
Open in desktop
File renamed without changes.
0 kubejs/server_scripts/scrap.js → kubejs/server_scripts/gregtech/scrap.js
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions kubejs/server_scripts/mods/AE2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,4 +1170,7 @@ ServerEvents.recipes(event => {
colors.forEach(coloredCoveredCable)
colors.forEach(coveredDenseCable)
colors.forEach(smartDenseCable)

// BetterP2P
event.shapeless('betterp2p:advanced_memory_card', ['ae2:memory_card', 'ae2:network_tool'])
})
15 changes: 0 additions & 15 deletions kubejs/server_scripts/mods/armorPlus.js
View file
Open in desktop

This file was deleted.

Loading