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

Ultimate Gem Rework #1446

Closed
wants to merge 19 commits into from
Closed
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
1 change: 1 addition & 0 deletions kubejs/assets/gtceu/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@
"material.gtceu.resonating_redstone": "Resonating Redstone Crystal",
"material.gtceu.ender_shard": "Ender Shard",
"material.gtceu.elemental_reduction_fluid": "Elemental Reduction Fluid",
"material.gtceu.abyss_crystal_mixture": "Abyss Crystal Mixture",
"__POST_TANK_MATERIALS__.header": "=======================",
"__POST_TANK_MATERIALS__.flufff": "> Post-Tank Materials <",
"__POST_TANK_MATERIALS__.footer": "=======================",
Expand Down
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.
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 0 additions & 32 deletions kubejs/server_scripts/End_Game.js
Original file line number Diff line number Diff line change
Expand Up @@ -238,38 +238,6 @@ ServerEvents.recipes(event => {
.duration(100)
.EUt(GTValues.VA[GTValues.ZPM])

// Ultimate Gem
event.recipes.extendedcrafting.shapeless_table(
'kubejs:ultimate_gem',
[
"kubejs:destabilized_clathrate",
"gtceu:enori_empowered_gem",
"enderio:ender_crystal",
"enderio:vibrant_crystal",
"kubejs:dilithium_crystal",
"enderio:enticing_crystal",
"enderio:weather_crystal",
"enderio:prescient_crystal",
"enderio:pulsating_crystal",
"minecraft:prismarine_shard",
"gtceu:cinnabar_gem",
"kubejs:energized_clathrate",
"minecraft:quartz",
"gtceu:certus_quartz_gem",
"gtceu:fluix_gem",
"gtceu:restonia_empowered_gem",
"gtceu:palis_empowered_gem",
"gtceu:diamatine_empowered_gem",
"gtceu:void_empowered_gem",
"gtceu:emeradic_empowered_gem",
"kubejs:resonating_crystal",
"minecraft:emerald",
"redstone_arsenal:flux_gem",
"minecraft:diamond",
"kubejs:resonant_clathrate"
]
)

event.recipes.extendedcrafting.shaped_table('gtceu:zero_point_module', [
' PPPPP ',
' PBCBP ',
Expand Down
36 changes: 13 additions & 23 deletions kubejs/server_scripts/Infinity_Toolset.js
Original file line number Diff line number Diff line change
Expand Up @@ -188,29 +188,19 @@ ServerEvents.recipes(event => {
});

// Ultimate Core
event.recipes.extendedcrafting.shaped_table('kubejs:ultimate_core', [
' A ',
' KBCBK ',
' KABDBAK ',
' BBEIFBB ',
'AGHIJIHGA',
' BBFIEBB ',
' KABDBAK ',
' KBCBK ',
' A ',
], {
A: 'kubejs:the_ultimate_material',
B: 'enderio:reinforced_obsidian_block',
C: 'gtceu:dense_blue_alloy_plate',
D: 'gtceu:dense_cryolobus_plate',
E: 'gtceu:dense_dark_soularium_plate',
F: 'gtceu:dense_zeron_100_plate',
G: 'gtceu:dense_manyullyn_plate',
H: 'gtceu:dense_enriched_sunnarium_plate',
I: 'gtceu:gravi_star',
J: 'kubejs:quasi_stable_neutron_star',
K: 'kubejs:wither_bone'
})

event.recipes.gtceu.assembly_line('infinity_toolset/ultimate_core')
.itemInputs('gtceu:activated_netherite_frame', '12x kubejs:the_ultimate_material', 'kubejs:quasi_stable_neutron_star', '4x gtceu:gravi_star', '4x kubejs:eternal_catalyst', '6x gtceu:dense_cryococcus_plate', '6x gtceu:dense_cryolobus_plate','6x gtceu:dense_manyullyn_plate', '6x gtceu:dense_obsidian_plate')
.inputFluids('gtceu:nether_star 1152', 'gtceu:omnium 576', 'enderio:xp_juice 20000', 'gtceu:americium_plasma 5000')
.itemOutputs('kubejs:ultimate_core')
.duration(1200)
.EUt(GTValues.VHA[GTValues.UEV])

.stationResearch(b => b
.researchStack('kubejs:the_ultimate_material')
.CWUt(144, 576000)
.EUt(1048576)
)

// Infinity Power Unit
event.recipes.gtceu.assembly_line('infinity_toolset/infinity_power_unit')
Expand Down
6 changes: 6 additions & 0 deletions kubejs/server_scripts/gregtech/discharger.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,10 @@ ServerEvents.recipes(event => {
.itemOutputs('kubejs:sculk_core')
.EUt(524288)
.duration(100)

event.recipes.gtceu.charger("kubejs:extreme_energy_crystal_charge")
.itemInputs(['kubejs:extreme_energy_crystal', '2x kubejs:empowered_stabilization_lattice'])
.itemOutputs('kubejs:energized_extreme_energy_crystal')
.EUt(GTValues.VHA[GTValues.UEV])
.duration(150)
})
135 changes: 135 additions & 0 deletions kubejs/server_scripts/gregtech/ultimate_gem.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
/**
* Ultimate Gem
* This is the all new processing line for the Ultimate Gem, replacing the original extended crafting recipe.
*/

ServerEvents.recipes(event => {

// Ender Gem

event.recipes.gtceu.mixer('ender_gem_mixture_mix')
.itemInputs('enderio:pulsating_powder', 'enderio:ender_crystal_powder', 'enderio:prescient_powder', 'enderio:vibrant_powder', 'kubejs:grains_of_innocence')
.itemOutputs('5x kubejs:ender_gem_dust')
.duration(480)
.EUt(GTValues.VHA[GTValues.ZPM])

event.recipes.gtceu.autoclave('ender_gem_autoclave')
.itemInputs('15x kubejs:ender_gem_dust')
.inputFluids('gtceu:naquadria 144')
.itemOutputs('kubejs:ender_gem')
.duration(900)
.EUt(GTValues.VHA[GTValues.ZPM])

event.recipes.gtceu.large_chemical_reactor('gem_of_the_end')
.itemInputs('kubejs:ender_gem', '2x kubejs:ender_star', 'kubejs:endest_star')
.inputFluids('kubejs:molten_aerotheum 1500')
.itemOutputs('kubejs:gem_of_the_end')
.duration(600)
.EUt(GTValues.VHA[GTValues.UHV])

// Abyss Crystal

event.recipes.gtceu.large_chemical_reactor('abyss_crystal_base')
.itemInputs('12x gtceu:black_quartz_dust', '12x gtceu:fluix_dust')
.notConsumable('gtceu:blacklight')
.inputFluids('gtceu:void_empowered 576', 'gtceu:palis_empowered 720', 'kubejs:molten_petrotheum 300')
.outputFluids('gtceu:abyss_crystal_mixture 1000')
.duration(1500)
.EUt(GTValues.VHA[GTValues.UHV])

event.recipes.gtceu.fluid_solidifier('uncut_abyss_crystal')
.inputFluids('gtceu:abyss_crystal_mixture 3000')
.notConsumable('gtceu:cylinder_casting_mold')
.itemOutputs('kubejs:uncut_abyss_crystal')
.duration(1200)
.EUt(GTValues.VHA[GTValues.EV])

function AbyssCrystalCut(name, fluid, time) {
event.recipes.gtceu.cutter(name)
.itemInputs('kubejs:uncut_abyss_crystal')
.inputFluids(fluid)
.itemOutputs('kubejs:abyss_crystal')
.duration(time)
.EUt(GTValues.VHA[GTValues.UV])
}

AbyssCrystalCut("abyss_lubricant", 'gtceu:lubricant 10', 20);
AbyssCrystalCut("abyss_distilled", 'gtceu:distilled_water 30', 20);
AbyssCrystalCut("abyss_water", 'minecraft:water 40', 20);

// Pure Gem

event.recipes.gtceu.mixer('pure_shards')
.itemInputs('4x gtceu:diamond_dust', '8x gtceu:lapis_dust', '7x minecraft:redstone', '3x gtceu:emerald_dust', '4x gtceu:nether_quartz_dust', '2x minecraft:prismarine_crystals')
.itemOutputs('kubejs:pure_shards')
.duration(1200)
.EUt(GTValues.VHA[GTValues.IV])

function DimPureCrystal(name, explosive) {
event.recipes.gtceu.implosion_compressor(name)
.itemInputs('9x kubejs:pure_shards')
.itemInputs(explosive)
.chancedOutput('kubejs:blank_pure_crystal', 5000, 0)
.duration(30)
.EUt(GTValues.VHA[GTValues.LV])
}

DimPureCrystal("pure_crystal_dynamite", '2x gtceu:dynamite');
DimPureCrystal("pure_crystal_industrial_tnt", 'gtceu:industrial_tnt');
DimPureCrystal("pure_crystal_tnt", '4x minecraft:tnt');
DimPureCrystal("pure_crystal_powderbarrel", '8x gtceu:powderbarrel');

event.recipes.gtceu.omnic_forge('blank_to_bright_pure_crystal')
.itemInputs('kubejs:blank_pure_crystal', '#forge:lenses/red', '#forge:lenses/blue', '#forge:lenses/green')
.chancedInput('gtceu:uev_emitter', 2000, 0)
.itemOutputs('kubejs:bright_pure_crystal')
.duration(1000)
.EUt(GTValues.VHA[GTValues.UEV])

event.recipes.gtceu.chemical_bath('pure_crystal_final')
.itemInputs('kubejs:bright_pure_crystal')
.inputFluids('gtceu:emeradic_empowered 288')
.itemOutputs('kubejs:pure_crystal')
.duration(2400)
.EUt(GTValues.VHA[GTValues.ZPM])

// Extreme Energy Crystal

event.recipes.gtceu.mixer('extreme_energy_blend')
.itemInputs('3x gtceu:lapotron_dust', '3x gtceu:europium_dust', '3x gtceu:dilithium_dust', '6x gtceu:darmstadtium_dust')
.inputFluids('gtceu:einsteinium 432', 'gtceu:americium 432')
.itemOutputs('15x kubejs:extreme_energy_blend')
.duration(1500)
.EUt(GTValues.VHA[GTValues.LuV])

event.recipes.gtceu.autoclave('extreme_energy_crystal')
.itemInputs('15x kubejs:extreme_energy_blend')
.inputFluids('gtceu:restonia_empowered 288')
.itemOutputs('kubejs:extreme_energy_crystal')
.duration(2000)
.EUt(GTValues.VHA[GTValues.UV])

event.recipes.gtceu.assembler('empowered_stabilization_lattice')
.itemInputs('kubejs:diamond_lattice', '4x gtceu:diamatine_empowered_plate', '6x gtceu:enori_empowered_plate', 'redstone_arsenal:flux_gem')
.itemOutputs('kubejs:empowered_stabilization_lattice')
.duration(500)
.EUt(GTValues.VHA[GTValues.EV])

event.recipes.extendedcrafting.shaped_flux_crafter('kubejs:energized_extreme_energy_crystal', [
' ',
'EBE',
' '
], {
B: "kubejs:extreme_energy_crystal",
E: 'kubejs:empowered_stabilization_lattice',
}, 2000000000).powerRate(2000000000);

// Final Combination

event.recipes.extendedcrafting.combination(
"kubejs:ultimate_gem",
"kubejs:ultimate_core", ["kubejs:gem_of_the_end", "kubejs:abyss_crystal", "kubejs:pure_crystal", "kubejs:energized_extreme_energy_crystal"],
400000000, 40000000
)

})
12 changes: 10 additions & 2 deletions kubejs/server_scripts/mods/EnderIO.js
Original file line number Diff line number Diff line change
Expand Up @@ -551,8 +551,16 @@ ServerEvents.recipes(event => {
.itemInputs('minecraft:nether_star')
.inputFluids('enderio:dew_of_the_void 8000')
.itemOutputs('kubejs:ender_star')
.duration(2000)
.EUt(400)
.duration(1200)
.EUt(240)

event.recipes.gtceu.electric_blast_furnace("endest_star")
.itemInputs('kubejs:ender_star', '8x gtceu:ender_eye_dust', '4x gtceu:ender_pearl_plate')
.inputFluids(Fluid.of('thermal:ender', 1000))
.itemOutputs('kubejs:endest_star')
.duration(500)
.EUt(GTValues.VHA[GTValues.IV])
.blastFurnaceTemp(5000)

// Painting Machine
event.remove({ id: 'enderio:painting_machine' })
Expand Down
9 changes: 0 additions & 9 deletions kubejs/server_scripts/mods/kubeJS.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,4 @@ ServerEvents.recipes(event => {
.EUt(30)
}

// Endest Star
event.shaped('kubejs:endest_star', [
' E ',
'ESE',
' E '
], {
E: 'minecraft:ender_eye',
S: 'minecraft:nether_star'
})
})
4 changes: 4 additions & 0 deletions kubejs/startup_scripts/gregtech_material_registry/misc.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,10 @@ GTCEuStartupEvents.registry('gtceu:material', event => {
.fluid()
.color(0xF16AA5)

event.create("abyss_crystal_mixture")
.fluid()
.color(0x281832)

event.create('holmium_oxide')
.dust()
.color(0xD29092)
Expand Down
48 changes: 44 additions & 4 deletions kubejs/startup_scripts/registry/item_registry.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,16 @@ StartupEvents.registry('item', event => {
if (!isNormalMode) event.create('omnic_data')

// Infinity Fluid Cell Base
if(isNormalMode) {
if (isNormalMode) {
event.create('infinity_cell_base').displayName("ME Infinity Cell Base")
}


// Endgame Items
event.create('diamond_lattice')
event.create('neutron_emitter')
event.create('ultimate_gem').displayName("§dUltimate Gem").glow(true)
event.create('ultimate_gem').displayName("§dUltimate Gem")
.texture('kubejs:item/ultimategem/ultimate_gem').glow(true)
event.create('mote_of_omnium').displayName("Mote of Omnium")
.glow(true).rarity("epic")
event.create('heart_of_a_universe').displayName("§dHeart Of A Universe")
Expand Down Expand Up @@ -225,7 +226,6 @@ StartupEvents.registry('item', event => {
event.create('dense_hydrogen').rarity('Uncommon')
event.create('ultra_dense_hydrogen').rarity('Rare')


// Stabilized Elements
const stabilized_elements = [
['einsteinium', '#ce9f00'],
Expand Down Expand Up @@ -254,7 +254,7 @@ StartupEvents.registry('item', event => {
event.create('radium_salt').rarity('Epic')

// Thrusters
const thrusters = ['conductive_iron','leadstone','electrical_steel','hardened','energetic','reinforced','resonant','vibrant','dark_soularium','fluxed']
const thrusters = ['conductive_iron', 'leadstone', 'electrical_steel', 'hardened', 'energetic', 'reinforced', 'resonant', 'vibrant', 'dark_soularium', 'fluxed']

thrusters.forEach(thruster => {
event.create(`${thruster}_thruster`).texture(`kubejs:item/thruster/${thruster}`)
Expand Down Expand Up @@ -434,6 +434,46 @@ StartupEvents.registry('item', event => {
event.create('quantum_soc_chip_base').texture('kubejs:item/quantumsoc/quantum_soc_chip_base').displayName('Quantum SoC Chip Base')
event.create('quantum_soc_chip').texture('kubejs:item/quantumsoc/quantum_soc_chip').displayName('Quantum SoC Chip')

// Ultimate Gem
event.create('ender_gem_dust')
.displayName("Ender Gem Dust")
.texture("kubejs:item/ultimategem/ender_gem_dust")
event.create('ender_gem')
.displayName("Ender Gem")
.texture("kubejs:item/ultimategem/ender_gem")
event.create('gem_of_the_end')
.displayName("Gem of the End")
.texture("kubejs:item/ultimategem/gem_of_the_end")
event.create('uncut_abyss_crystal')
.displayName("Uncut Abyss Crystal")
.texture("kubejs:item/ultimategem/uncut_abyss_crystal")
event.create('abyss_crystal')
.displayName("Abyss Crystal")
.texture("kubejs:item/ultimategem/abyss_crystal")
event.create('pure_shards')
.displayName("Pure Shards")
.texture("kubejs:item/ultimategem/pure_shards")
event.create('blank_pure_crystal')
.displayName("Blank Pure Crystal")
.texture("kubejs:item/ultimategem/blank_pure_crystal")
event.create('bright_pure_crystal')
.displayName("Bright Pure Crystal")
.texture("kubejs:item/ultimategem/bright_pure_crystal")
event.create('pure_crystal')
.displayName("Pure Crystal")
.texture("kubejs:item/ultimategem/pure_crystal")
event.create('empowered_stabilization_lattice')
.displayName("Empowered Stabilization Lattice")
.texture("kubejs:item/ultimategem/empowered_stabilization_lattice")
event.create('extreme_energy_blend')
.displayName("Extreme Energy Blend")
.texture("kubejs:item/ultimategem/extreme_energy_blend")
event.create('extreme_energy_crystal')
.displayName("Extreme Energy Crystal")
.texture("kubejs:item/ultimategem/extreme_energy_crystal")
event.create('energized_extreme_energy_crystal')
.displayName("Energized Extreme Energy Crystal")
.texture("kubejs:item/ultimategem/energized_extreme_energy_crystal")

// Complex SMDs
const smds = [
Expand Down