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

More resources & ores from GCyR planets #939

Merged
merged 22 commits into from
Nov 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a71b843
Add fluid veins to GCyR planets
Xefyr0 Oct 14, 2024
9df8e54
Rename bedrock fluid veins file & move into worldgen folder
Xefyr0 Oct 14, 2024
b65a2dd
Move all custom ore veins to worldgen folder, make Luna Fluorite vein…
Xefyr0 Oct 14, 2024
32e27a5
Add and modify surface indicators to be more uniform
Xefyr0 Oct 14, 2024
165feef
Remove duplicate ilmenite/bauxite/rutile vein from Luna
Xefyr0 Oct 14, 2024
2f9f035
Make Chromite veins more common in The End
Xefyr0 Oct 14, 2024
8628bf4
Add Laurite/Cuprorhodsite vein to The Nether
Xefyr0 Oct 14, 2024
22eb08c
Change laurite vein height to make carver not gut it every time and a…
Xefyr0 Oct 14, 2024
aafe073
Remove redundant density, discard chance settings that are immediatel…
Xefyr0 Oct 14, 2024
4c6614f
Make Realgar appear 3x as often in its vein
Xefyr0 Oct 16, 2024
e5784fc
Futureproofing attempt
Xefyr0 Oct 17, 2024
f3bedd0
oops futureproofing attempt 2
Xefyr0 Oct 17, 2024
df495fa
oops my previous implementation was broke.
Xefyr0 Oct 18, 2024
6cfbe29
Add chromite to Luna (Chromite is in lunar regolith IRL)
Xefyr0 Oct 25, 2024
75de175
Remove Realgar alterations & change Chromite buff in The End to give …
Xefyr0 Oct 25, 2024
ec55520
Add more chanced outputs to moon dust centrifuging that are present IRL
Xefyr0 Oct 25, 2024
e6047cf
make fluid veins yield less when depleted and fix Mars' vein's biome-…
Xefyr0 Oct 25, 2024
717074e
changed Moon dust centrifuging again to make it more interesting
Xefyr0 Oct 25, 2024
cb542e0
Other planets' rock dusts & centrifuging
Xefyr0 Nov 6, 2024
128d002
Add attempted futureproofing attempt to Custom_Ore_Veins.js too
Xefyr0 Nov 6, 2024
e5dd186
Remove laurite Nether vein
Xefyr0 Nov 6, 2024
71317f4
Remove all futureproofing attempts - it's the launchers' fault we had…
Xefyr0 Nov 10, 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
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 @@ -215,6 +215,7 @@
"material.gtceu.dark_soularium": "Dark Soularium",

"material.gtceu.dilithium": "Dilithium",
"material.gtceu.calcium_perchlorate": "Calcium Perchlorate",
"material.gtceu.restonia": "§cRestonia Crystal",
"material.gtceu.enori": "§7Enori Crystal",
"material.gtceu.void": "§8Void Crystal",
Expand Down
Binary file added kubejs/assets/kubejs/textures/item/mars_dust.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added kubejs/assets/kubejs/textures/item/mercury_dust.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added kubejs/assets/kubejs/textures/item/venus_dust.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 0 additions & 25 deletions kubejs/server_scripts/_hardmode/hardmode.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,28 +77,3 @@ ServerEvents.recipes(event => {
.duration(640)
.EUt(120)
}})

// HM Ore Gen

GTCEuServerEvents.oreVeins(event => {
if (isHardMode) {
// Fluorite is not registerd in NM
event.add("kubejs:luna/fluorite", vein => {
vein.weight(40)
vein.clusterSize(25)
vein.density(0.7)
vein.discardChanceOnAirExposure(0)
vein.layer("moon")
vein.dimensions("gcyr:luna")
vein.biomes("gcyr:moon")
vein.heightRangeUniform(-40, 50)
vein.layeredVeinGenerator(generator => generator
.buildLayerPattern(pattern => pattern
.layer(l => l.weight(5).mat(GTMaterials.get('fluorite')).size(1, 1))
.layer(l => l.weight(3).mat(GTMaterials.Sphalerite).size(2, 4))
.layer(l => l.weight(2).mat(GTMaterials.Bastnasite).size(2, 4))
)
)
})
}
})
37 changes: 0 additions & 37 deletions kubejs/server_scripts/bedrock_fluid.js

This file was deleted.

88 changes: 88 additions & 0 deletions kubejs/server_scripts/gcyr_planet_resources.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
ServerEvents.recipes(event => {
//Regolith dusts
let regolithDustResources = [
[['moon_sand', 'moon_cobblestone', 'moon_stone'], 'moon_dust', 'minecraft:diamond'],
[['mars_regolith', 'martian_cobblestone', 'martian_rock'], 'mars_dust', 'gtceu:monazite_gem'],
[['venus_sand', 'venusian_regolith', 'venus_cobblestone', 'venus_rock'], 'venus_dust', 'gtceu:olivine_gem'],
[['mercury_rock'], 'mercury_dust', 'gtceu:cinnabar_gem']
]

regolithDustResources.forEach((planetResources, fluxCount) => {
//Planetary dust maceration recipe
planetResources[0].forEach(rocksToMacerate => {
event.recipes.gtceu.macerator(rocksToMacerate)
.itemInputs('gcyr:' + rocksToMacerate)
.itemOutputs('kubejs:' + planetResources[1])
.duration(200)
.EUt(GTValues.VHA[GTValues.HV])
})

//Recipes to make quantum flux from planets' rock dusts
event.shaped(
(fluxCount+1) + 'x kubejs:quantum_flux', [
' B ',
'BAB',
' B '
], {
A: planetResources[2],
B: 'kubejs:' + planetResources[1]
}
)
})

//Rock dust centrifuging
event.recipes.gtceu.centrifuge('moon_dust_centrifuging')
.itemInputs('kubejs:moon_dust')
.chancedOutput('gtceu:small_stone_dust', 2500, 0)
.chancedOutput('gtceu:small_aluminium_dust', 1700, 20)
.chancedOutput('gtceu:small_quicklime_dust', 950, 15)
.chancedOutput('gtceu:small_glass_dust', 700, 30)
.chancedOutput('gtceu:small_pyrolusite_dust', 700, 10)
.chancedOutput('gtceu:small_iron_dust', 550, 5)
.outputFluids(Fluid.of('gtceu:deuterium', 100))
.duration(200)
.EUt(GTValues.VA[GTValues.MV])

event.recipes.gtceu.centrifuge('mars_dust_centrifuging')
.itemInputs('kubejs:mars_dust')
.chancedOutput('gtceu:small_stone_dust', 2500, 0)
.chancedOutput('gtceu:small_hematite_dust', 1500, 20)
.chancedOutput('gtceu:small_calcium_perchlorate_dust', 100, 10)
.chancedOutput('gtceu:small_ice_dust', 300, 35)
.chancedOutput('gtceu:small_silicon_dioxide_dust', 3000, 50)
.outputFluids(Fluid.of('gtceu:carbon_dioxide', 150))
.duration(200)
.EUt(GTValues.VA[GTValues.HV])

event.recipes.gtceu.centrifuge('venus_dust_centrifuging')
.itemInputs('kubejs:venus_dust')
.chancedOutput('gtceu:small_basaltic_mineral_sand_dust', 2500, 0)
.chancedOutput('gtceu:small_olivine_dust', 700, 15)
.chancedOutput('gtceu:small_biotite_dust', 950, 25)
.chancedOutput('gtceu:small_silicon_dioxide_dust', 3000, 50)
.chancedOutput('gtceu:small_garnierite_dust', 550, 10)
.outputFluids(Fluid.of('gtceu:sulfur_dioxide', 100))
.duration(200)
.EUt(GTValues.VA[GTValues.EV])

event.recipes.gtceu.centrifuge('mercury_dust_centrifuging')
.itemInputs('kubejs:mercury_dust')
.chancedOutput('gtceu:small_stone_dust', 2500, 0)
.chancedOutput('gtceu:small_carbon_dust', 1000, 25)
.chancedOutput('gtceu:small_sulfur_dust', 750, 15)
.chancedOutput('gtceu:small_magnesium_dust', 550, 5)
.chancedOutput('gtceu:small_ilmenite_dust', 100, 10)
.chancedOutput('gtceu:small_silicon_dioxide_dust', 2750, 50)
.outputFluids(Fluid.of('gtceu:sodium_persulfate', 50))
.duration(200)
.EUt(GTValues.VA[GTValues.EV])


//Dilithium
event.recipes.gtceu.autoclave('dilithium_helium')
.itemInputs('4x gtceu:dilithium_dust')
.inputFluids('gtceu:helium 1000')
.itemOutputs('4x kubejs:dilithium_crystal')
.duration(400)
.EUt(110)
})
80 changes: 40 additions & 40 deletions kubejs/server_scripts/mods/Gregicality_Rocketry.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,46 +167,46 @@ ServerEvents.recipes(event => {
T: 'enderio:fluid_tank'
})

event.shaped(
'gcyr:advanced_rocket_motor', [
' P ',
'PPP',
'TTT'
], {
P: 'gtceu:double_tungsten_carbide_plate',
T: Item.of('ironjetpacks:thruster', '{Id:"ironjetpacks:energetic"}').weakNBT()
})
event.shaped(
'gcyr:advanced_fuel_tank', [
'PTP',
'PTP',
'PTP'
], {
P: 'gtceu:tungsten_steel_plate',
T: 'enderio:fluid_tank'
})
/*
event.shaped(
'gcyr:elite_rocket_motor', [
' P ',
'PPP',
'TTT'
], {
P: 'gtceu:double_titanium_tungsten_carbide_plate',
T: Item.of('ironjetpacks:thruster', '{Id:"ironjetpacks:vibrant"}').weakNBT()
})

event.shaped(
'gcyr:elite_fuel_tank', [
'PTP',
'PTP',
'PTP'
], {
P: 'gtceu:hsse_plate',
T: 'enderio:fluid_tank'
})
*/
event.shaped(
'gcyr:advanced_rocket_motor', [
' P ',
'PPP',
'TTT'
], {
P: 'gtceu:double_tungsten_carbide_plate',
T: Item.of('ironjetpacks:thruster', '{Id:"ironjetpacks:energetic"}').weakNBT()
})

event.shaped(
'gcyr:advanced_fuel_tank', [
'PTP',
'PTP',
'PTP'
], {
P: 'gtceu:tungsten_steel_plate',
T: 'enderio:fluid_tank'
})
/*
event.shaped(
'gcyr:elite_rocket_motor', [
' P ',
'PPP',
'TTT'
], {
P: 'gtceu:double_titanium_tungsten_carbide_plate',
T: Item.of('ironjetpacks:thruster', '{Id:"ironjetpacks:vibrant"}').weakNBT()
})

event.shaped(
'gcyr:elite_fuel_tank', [
'PTP',
'PTP',
'PTP'
], {
P: 'gtceu:hsse_plate',
T: 'enderio:fluid_tank'
})
*/
// Launch Pad
event.remove({id: 'gcyr:assembler/launch_pad'})
event.shaped(
Expand Down
24 changes: 0 additions & 24 deletions kubejs/server_scripts/mods/gregtech.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,6 @@ ServerEvents.recipes(event => {
.duration(20)
.EUt(30)


//SPACE STUFF

event.recipes.gtceu.centrifuge('moon_deuterium')
.itemInputs('kubejs:moon_dust')
.chancedOutput('gtceu:stone_dust', 3000, 500)
.chancedOutput('kubejs:dust', 1000, 100)
.chancedOutput('minecraft:sand', 500, 200)
.outputFluids(Fluid.of('gtceu:deuterium', 100))
.duration(200)
.EUt(20)

event.shaped(
'kubejs:quantum_flux', [
' B ',
Expand All @@ -134,18 +122,6 @@ ServerEvents.recipes(event => {
}
)


event.shaped(
'kubejs:quantum_flux', [
' B ',
'BAB',
' B '
], {
A: 'minecraft:diamond',
B: 'kubejs:moon_dust'
}
)

//Hot MV ingots
event.remove({ input: ['gtceu:hot_kanthal_ingot', "gtceu:hot_silicon_ingot"]})
event.replaceOutput(
Expand Down
78 changes: 78 additions & 0 deletions kubejs/server_scripts/worldgen/fluidVeins.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
const Registries = Java.loadClass('net.minecraft.core.registries.Registries')
const ResourceKey = Java.loadClass('net.minecraft.resources.ResourceKey')
const martianPolarCapsResourceKey = ResourceKey.create(Registries.BIOME, 'gcyr:martian_polar_caps')

GTCEuServerEvents.fluidVeins(event => {

// Void dim oil
event.add('kubejs:void/oil', vein => {
vein.dimensions('javd:void')
vein.fluid(() => Fluid.of("gtceu:oil_medium").fluid)
vein.weight(1000)
vein.minimumYield(300)
vein.maximumYield(300)
vein.depletionAmount(0)
vein.depletionChance(0)
vein.depletedYield(300)
})

// Luna fluid veins
event.add('kubejs:moon/deuterium', vein => {
vein.dimensions('gcyr:luna')
vein.fluid(() => Fluid.of("gtceu:deuterium").fluid)
vein.weight(60)
vein.minimumYield(10)
vein.maximumYield(30)
vein.depletionAmount(1)
vein.depletionChance(50)
vein.depletedYield(5)
})

event.add('kubejs:moon/helium_3', vein => {
vein.dimensions('gcyr:luna')
vein.fluid(() => Fluid.of("gtceu:helium_3").fluid)
vein.weight(35)
vein.minimumYield(5)
vein.maximumYield(20)
vein.depletionAmount(1)
vein.depletionChance(50)
vein.depletedYield(3)
})

// Mars fluid veins (haha water on Mars)
event.add('kubejs:mars/ice', vein => {
vein.dimensions('gcyr:mars')
vein.biomes(1, martianPolarCapsResourceKey) //TODO: add back in when GTCEu Modern fixes it
vein.fluid(() => Fluid.of("gtceu:ice").fluid)
vein.weight(0)
vein.minimumYield(10)
vein.maximumYield(30)
vein.depletionAmount(1)
vein.depletionChance(50)
vein.depletedYield(3)
})

// Venus fluid veins
event.add('kubejs:venus/sulfuric_acid', vein => {
vein.dimensions('gcyr:venus')
vein.fluid(() => Fluid.of("gtceu:sulfuric_acid").fluid)
vein.weight(1)
vein.minimumYield(10)
vein.maximumYield(40)
vein.depletionAmount(1)
vein.depletionChance(30)
vein.depletedYield(5)
})

//Mercury fluid veins (Haha Mercury is made of Mercury)
event.add('kubejs:mercury/mercury', vein => {
vein.dimensions('gcyr:mercury')
vein.fluid(() => Fluid.of("gtceu:mercury").fluid)
vein.weight(1)
vein.minimumYield(10)
vein.maximumYield(15)
vein.depletionAmount(0)
vein.depletionChance(0)
vein.depletedYield(2)
})
})
Loading