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.

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

Sorry, I dropped the microminers. #1518

Merged
merged 4 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified kubejs/assets/kubejs/textures/item/microverse/microminer_t4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified kubejs/assets/kubejs/textures/item/microverse/microminer_t6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified kubejs/assets/kubejs/textures/item/microverse/microminer_t7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions kubejs/server_scripts/microverse/advanced_ii_missions.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ ServerEvents.recipes(event => {
})

// T9MM missions
microverse_mission(event, 9, 3, undefined, undefined, 100).forEach(builder => {
microverse_mission(event, 9, 3).forEach(builder => {
builder
.inputFluids("gtceu:nitrogen_plasma 5000")
.itemInputs(
Expand All @@ -132,28 +132,28 @@ ServerEvents.recipes(event => {
.itemOutputs("kubejs:universe_creation_data")
})

microverse_mission(event, 9, 3, undefined, undefined, 50).forEach(builder => {
microverse_mission(event, 9, 3).forEach(builder => {
builder
.inputFluids("gtceu:argon_plasma 5000")
.itemInputs("8x gtceu:neutron_reflector", "4x gtceu:cryococcus_block", "kubejs:stellar_creation_data")
.itemOutputs("64x gtceu:neutronium_ingot")
})

microverse_mission(event, 9, 3, undefined, undefined, 100).forEach(builder => {
microverse_mission(event, 9, 3).forEach(builder => {
builder
.inputFluids("gtceu:oxygen_plasma 10000")
.itemInputs("64x gtceu:gravi_star", "64x gtceu:gravi_star", "16x kubejs:shattered_star_data")
.itemOutputs("32x kubejs:quasi_stable_neutron_star")
})

// T10MM missions
microverse_mission(event, 10, 3, undefined, undefined, 50).forEach(builder => {
microverse_mission(event, 10, 3).forEach(builder => {
builder
.itemInputs("8x gtceu:cryococcus_block", "kubejs:universe_creation_data")
.itemOutputs("kubejs:heart_of_a_universe")
})

microverse_mission(event, 10, 3, undefined, undefined, 0).forEach(builder => {
microverse_mission(event, 10, 3).forEach(builder => {
builder
.itemInputs("16x #forge:storage_blocks/activated_netherite", "64x kubejs:stellar_creation_data")
.itemOutputs("kubejs:creative_storage_data")
Expand Down
2 changes: 1 addition & 1 deletion kubejs/server_scripts/microverse/hardmode_missions.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ ServerEvents.recipes(event => {
})

// HM/EM need a mission to give them their first sculk catalyst.
microverse_mission(event, 6, 3, undefined, undefined, 0).forEach(builder => {
microverse_mission(event, 6, 3).forEach(builder => {
builder
.itemInputs(
"16x kubejs:quantum_flux",
Expand Down
18 changes: 9 additions & 9 deletions kubejs/server_scripts/microverse/hyperbolic_missions.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,28 +44,28 @@ ServerEvents.recipes(event => {
})

// T9MM mission
microverse_mission(event, 9, 4, undefined, undefined, 100).forEach(builder => {
microverse_mission(event, 9, 4).forEach(builder => {
builder
.inputFluids("gtceu:nitrogen_plasma 15000")
.itemInputs("kubejs:shattered_universe_data", "64x kubejs:shattered_star_data")
.itemOutputs("kubejs:corrupted_universe_data")
})

// T10MM missions
microverse_mission(event, 10, 4, undefined, undefined, 75).forEach(builder => {
microverse_mission(event, 10, 4).forEach(builder => {
builder
.itemInputs("8x kubejs:infinity_catalyst", "kubejs:corrupted_universe_data")
.itemOutputs("16x kubejs:heart_of_a_universe")
})

microverse_mission(event, 10, 4, undefined, undefined, 100).forEach(builder => {
microverse_mission(event, 10, 4).forEach(builder => {
builder
.itemInputs("64x kubejs:singularity_containment_unit", "kubejs:shattered_universe_data",)
.itemOutputs("64x kubejs:contained_singularity")
})

// T11MM missions
microverse_mission(event, 11, 4, undefined, undefined, 100).forEach(builder => {
microverse_mission(event, 11, 4).forEach(builder => {
builder
.itemInputs("kubejs:infinity_catalyst", "gtceu:neutronium_drill_head", "kubejs:shattered_universe_data")
.itemOutputs(
Expand All @@ -77,7 +77,7 @@ ServerEvents.recipes(event => {
)
})

microverse_mission(event, 11, 4, undefined, undefined, 100).forEach(builder => {
microverse_mission(event, 11, 4).forEach(builder => {
builder
.itemInputs(
"64x gtceu:gravi_star",
Expand All @@ -98,7 +98,7 @@ ServerEvents.recipes(event => {
)
})

microverse_mission(event, 11, 4, undefined, undefined, 0).forEach(builder => {
microverse_mission(event, 11, 4).forEach(builder => {
builder
.itemInputs(
"16x gtceu:holmium_block",
Expand All @@ -111,13 +111,13 @@ ServerEvents.recipes(event => {
.itemOutputs("kubejs:creative_computation_data")
})

microverse_mission(event, 12, 4, undefined, undefined, 50).forEach(builder => {
microverse_mission(event, 12, 4).forEach(builder => {
builder
.itemInputs("64x gtceu:infinity_ingot", "4x kubejs:universe_creation_data")
.itemOutputs("64x gtceu:monium_ingot")
})

microverse_mission(event, 12, 4, undefined, undefined, 0).forEach(builder => {
microverse_mission(event, 12, 4).forEach(builder => {
builder
.itemInputs(
"16x gtceu:eltz_block",
Expand All @@ -132,7 +132,7 @@ ServerEvents.recipes(event => {
.itemOutputs("kubejs:creative_energy_data")
})

microverse_mission(event, 12, 4, undefined, GTValues.VA[GTValues.UXV], 10).forEach(builder => {
microverse_mission(event, 12, 4, undefined, GTValues.VA[GTValues.UXV]).forEach(builder => {
builder
.itemInputs("8x kubejs:timeless_monic_heavy_plating", "4x kubejs:universe_creation_data", "2x kubejs:shattered_universe_data", "2x kubejs:corrupted_universe_data")
.itemOutputs("4x kubejs:causality_exempt_monic_heavy_plating")
Expand Down
60 changes: 2 additions & 58 deletions kubejs/server_scripts/microverse/repair.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,11 @@
* Compare with missionDurations of mission_utils.js.
*/
const repairDurations = {
"1": 60,
"2": 80,
"2half": 80,
"3": 100,
"4": 120,
"4half": 120,
"5": 150,
"6": 160,
"7": 180,
"8": 200,
"8half": 200,
"9": 240,
"10": 300,
"11": 360,
"12": 420
"8": 200
}

ServerEvents.recipes(event => {
Expand All @@ -32,12 +22,11 @@ ServerEvents.recipes(event => {
* @param {string[]} doublePlateList List of the names of the double plate materials used to repair the hull.
* @param {string[]} heavyPlatingList List of the names of the heavy plating materials used to repair the hull.
*/
function repairing(minerTier, doublePlateList, heavyPlatingList) {
function repairing(minerTier, doublePlateList) {
let minerTierNumber;

if(minerTier == "2half") minerTierNumber = 2.5;
else if(minerTier == "4half") minerTierNumber = 4.5;
else if(minerTier == "8half") minerTierNumber = 8.5;
else minerTierNumber = minerTier;

const builder = event.recipes.gtceu.assembler(`kubejs:repair_t${minerTier}`)
Expand All @@ -52,12 +41,6 @@ ServerEvents.recipes(event => {
})
}

if(heavyPlatingList != undefined) {
heavyPlatingList.forEach((name, index) => {
builder.chancedInput(`3x kubejs:${name}_heavy_plating`, 9000 - 1000 * index, -1000 + 200 * index)
})
}

return builder;
}

Expand All @@ -83,37 +66,6 @@ ServerEvents.recipes(event => {
.chancedInput("kubejs:advanced_micro_miner_guidance_system", 4000, -2000)
.chancedInput("kubejs:warp_core", 2400, -600)

repairing(9, [], ["quantum_fluxed_eternium"])
.EUt(GTValues.VA[GTValues.UV])
.chancedInput("kubejs:hadal_energy_core", 4000, -800)
.chancedInput("kubejs:hadal_warp_engine", 2800, -1300)
.chancedInput("kubejs:universal_navigator", 4000, -700)
.chancedInput("kubejs:universal_warp_core", 2000, -400)

repairing(10, [], ["universe_resistant_neutronium"])
.EUt(GTValues.VA[GTValues.UHV])
.chancedInput("kubejs:hadal_warp_engine", 6000, -1000)
.chancedInput("gtceu:tungstensteel_gearbox", 5500, -1000)
.chancedInput("kubejs:universal_navigator", 5000, -750)
.chancedInput("kubejs:universal_warp_core", 3000, -600)
.chancedInput("kubejs:universal_warp_controller", 2400, -300)

repairing(11, ["crystal_matrix"], ["elementally_infused_omnic_matrix"])
.EUt(GTValues.VA[GTValues.UEV])
.chancedInput("kubejs:hadal_warp_engine", 7500, -1200)
.chancedInput("kubejs:universal_navigator", 7000, -900)
.chancedInput("kubejs:universal_warp_core", 3000, -500)
.chancedInput("kubejs:universal_warp_controller", 2400, -500)
.chancedInput("kubejs:infinity_power_unit", 2000, -200)

repairing(12, [], ["dimensionally_stabilized_infinity", "universe_resistant_neutronium"])
.EUt(GTValues.VA[GTValues.UIV])
.chancedInput("kubejs:hadal_warp_engine", 7500, -1000)
.chancedInput("kubejs:extradimensional_navigator", 6000, -600)
.chancedInput("kubejs:field_stabilised_omnic_pulsar_compound", 5000, -1000)
.chancedInput("kubejs:infinity_power_unit", 4500, -500)
.chancedInput("solarflux:sp_custom_infinity", 2500, -300)

// Hardmode miners always need repairs for engaging in combat
if(isHardMode) {
repairing("2half", ["dark_steel"])
Expand All @@ -128,13 +80,5 @@ ServerEvents.recipes(event => {
.chancedInput("kubejs:energetic_thruster", 2000, -1000)
.chancedInput("kubejs:basic_micro_miner_guidance_system", 3000, -3000)
.chancedInput("kubejs:signalum_micro_miner_core", 1800, -600)

repairing("8half", ["trinium", "naquadah_alloy"])
.EUt(GTValues.VA[GTValues.ZPM])
.chancedInput("kubejs:supercharged_laser_array", 4800, -1200)
.chancedInput("kubejs:warp_engine", 5000, -2500)
.chancedInput("kubejs:advanced_micro_miner_guidance_system", 4500, -4500)
.chancedInput("kubejs:warp_core", 2400, -800)
.chancedInput("kubejs:abyssal_energy_core", 1200, -400)
}
})
6 changes: 3 additions & 3 deletions kubejs/startup_scripts/registry/item_registry.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ StartupEvents.registry("item", event => {
// Regular Microminers
for (let tier = 1; tier <= 12; tier++) {
event.create(`microminer_t${tier}`).maxStackSize(16).texture(`kubejs:item/microverse/microminer_t${tier}`)
if(tier > 5) event.create(`damaged_microminer_t${tier}`).maxStackSize(16).textureJson({ layer0: `kubejs:item/microverse/microminer_t${tier}`, layer1: "minecraft:block/destroy_stage_2" })
if(tier >= 6 && tier < 9) event.create(`damaged_microminer_t${tier}`).maxStackSize(16).texture(`kubejs:item/microverse/microminer_t${tier}_damaged`)
}


// HM/EM Microminers
if (!isNormalMode) {
event.create("microminer_t2half").maxStackSize(16).texture("kubejs:item/microverse/microminer_t2half")
event.create("damaged_microminer_t2half").maxStackSize(16).textureJson({ layer0: "kubejs:item/microverse/microminer_t2half", layer1: "minecraft:block/destroy_stage_2" })
event.create("damaged_microminer_t2half").maxStackSize(16).texture("kubejs:item/microverse/microminer_t2half_damaged")
event.create("microminer_t4half").maxStackSize(16).texture("kubejs:item/microverse/microminer_t4half")
event.create("damaged_microminer_t4half").maxStackSize(16).textureJson({ layer0: "kubejs:item/microverse/microminer_t4half", layer1: "minecraft:block/destroy_stage_2" })
event.create("damaged_microminer_t4half").maxStackSize(16).texture("kubejs:item/microverse/microminer_t4half_damaged")
event.create("microminer_t8half").maxStackSize(16).texture("kubejs:item/microverse/microminer_t8half")

// Stabilized Miners
Expand Down