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

Dilithium Time :3 #1492

Merged
merged 3 commits into from
Feb 6, 2025
Merged

Dilithium Time :3 #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2995859
Dilithium material set + item conversion
WithersChat Feb 6, 2025
1e9c7ac
Lint is screaming at me because :skull: or sth
WithersChat Feb 6, 2025
e97b7d5
Re lint fix :skull:
WithersChat Feb 6, 2025
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
8 changes: 8 additions & 0 deletions kubejs/assets/gtceu/models/item/material_sets/dilithium/gem.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent":"item/generated",
"textures": {
"layer0":"gtceu:item/material_sets/dilithium/gem",
"layer1":"gtceu:item/material_sets/dilithium/gem_secondary",
"layer2":"gtceu:item/material_sets/dilithium/gem_overlay"
}
}
8 changes: 8 additions & 0 deletions kubejs/assets/gtceu/models/item/material_sets/dilithium/gem_exquisite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent":"item/generated",
"textures": {
"layer0":"gtceu:item/material_sets/dilithium/gem_exquisite",
"layer1":"gtceu:item/material_sets/dilithium/gem_exquisite_secondary",
"layer2":"gtceu:item/material_sets/dilithium/gem_exquisite_overlay"
}
}
8 changes: 8 additions & 0 deletions kubejs/assets/gtceu/models/item/material_sets/dilithium/gem_flawless.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent":"item/generated",
"textures": {
"layer0":"gtceu:item/material_sets/dilithium/gem_flawless",
"layer1":"gtceu:item/material_sets/dilithium/gem_flawless_secondary",
"layer2":"gtceu:item/material_sets/dilithium/gem_flawless_overlay"
}
}
Binary file added kubejs/assets/gtceu/textures/item/material_sets/dilithium/gem.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions kubejs/assets/gtceu/textures/item/material_sets/dilithium/gem.png.mcmeta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"interpolate": false,
"frametime": 3
}
}
Binary file added kubejs/assets/gtceu/textures/item/material_sets/dilithium/gem_exquisite.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions kubejs/assets/gtceu/textures/item/material_sets/dilithium/gem_exquisite.png.mcmeta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"animation": {
"frametime": 1,
"frames": [
{"index": 0, "time":32},
1,
2,
3,
4,
5,
6,
7,
8
]
}
}
Binary file added ...js/assets/gtceu/textures/item/material_sets/dilithium/gem_exquisite_overlay.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions kubejs/assets/gtceu/textures/item/material_sets/dilithium/gem_exquisite_overlay.png.mcmeta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"animation": {
"frametime": 1,
"frames": [
{"index": 0, "time":32},
1,
2,
3,
4,
5,
6,
7,
8
]
}
}
Binary file added .../assets/gtceu/textures/item/material_sets/dilithium/gem_exquisite_secondary.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions kubejs/assets/gtceu/textures/item/material_sets/dilithium/gem_exquisite_secondary.png.mcmeta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"animation": {
"frametime": 1,
"frames": [
{"index": 0, "time":32},
1,
2,
3,
4,
5,
6,
7,
8
]
}
}
Binary file added kubejs/assets/gtceu/textures/item/material_sets/dilithium/gem_flawless.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions kubejs/assets/gtceu/textures/item/material_sets/dilithium/gem_flawless.png.mcmeta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"animation": {
"frametime": 1,
"frames": [
{"index": 0, "time":33},
1,
2,
3,
4,
5,
6,
7
]
}
}
Binary file added kubejs/assets/gtceu/textures/item/material_sets/dilithium/gem_flawless_overlay.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions kubejs/assets/gtceu/textures/item/material_sets/dilithium/gem_flawless_overlay.png.mcmeta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"animation": {
"frametime": 1,
"frames": [
{"index": 0, "time":33},
1,
2,
3,
4,
5,
6,
7
]
}
}
Binary file added ...s/assets/gtceu/textures/item/material_sets/dilithium/gem_flawless_secondary.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions kubejs/assets/gtceu/textures/item/material_sets/dilithium/gem_flawless_secondary.png.mcmeta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"animation": {
"frametime": 1,
"frames": [
{"index": 0, "time":33},
1,
2,
3,
4,
5,
6,
7
]
}
}
Binary file added kubejs/assets/gtceu/textures/item/material_sets/dilithium/gem_overlay.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions kubejs/assets/gtceu/textures/item/material_sets/dilithium/gem_overlay.png.mcmeta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"interpolate": false,
"frametime": 3
}
}
Binary file added kubejs/assets/gtceu/textures/item/material_sets/dilithium/gem_secondary.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions kubejs/assets/gtceu/textures/item/material_sets/dilithium/gem_secondary.png.mcmeta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"interpolate": false,
"frametime": 3
}
}
2 changes: 1 addition & 1 deletion kubejs/server_scripts/End_Game.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ ServerEvents.recipes(event => {
"gtceu:enori_empowered_gem",
"enderio:ender_crystal",
"enderio:vibrant_crystal",
"kubejs:dilithium_crystal",
"gtceu:dilithium_gem",
"enderio:enticing_crystal",
"enderio:weather_crystal",
"enderio:prescient_crystal",
Expand Down
2 changes: 1 addition & 1 deletion kubejs/server_scripts/aa_planet_resources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ ServerEvents.recipes(event => {
event.recipes.gtceu.autoclave('dilithium_helium')
.itemInputs('4x gtceu:dilithium_dust')
.inputFluids('gtceu:helium 1000')
.itemOutputs('4x kubejs:dilithium_crystal')
.itemOutputs('4x gtceu:dilithium_gem')
.duration(400)
.EUt(110)
})
Expand Down
40 changes: 20 additions & 20 deletions kubejs/server_scripts/gregtech/microverse_recipes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,8 @@ ServerEvents.recipes(event => {
event.recipes.gtceu.advanced_microverse_ii('kubejs:t_seven_first')
.itemInputs(
'kubejs:microminer_t7',
'64x kubejs:dilithium_crystal',
'64x kubejs:dilithium_crystal',
'64x gtceu:dilithium_gem',
'64x gtceu:dilithium_gem',
'kubejs:gem_sensor',
'64x kubejs:deep_dark_data',
'64x kubejs:deep_dark_data',
Expand All @@ -343,8 +343,8 @@ ServerEvents.recipes(event => {
.itemInputs(
'kubejs:microminer_t7',
'32x kubejs:quantum_flux',
'64x kubejs:dilithium_crystal',
'64x kubejs:dilithium_crystal',
'64x gtceu:dilithium_gem',
'64x gtceu:dilithium_gem',
'32x kubejs:deep_dark_data'
)
.itemOutputs(
Expand Down Expand Up @@ -372,10 +372,10 @@ ServerEvents.recipes(event => {
.itemInputs(
'kubejs:microminer_t8',
'64x kubejs:quantum_flux',
'64x kubejs:dilithium_crystal',
'64x kubejs:dilithium_crystal',
'64x kubejs:dilithium_crystal',
'64x kubejs:dilithium_crystal',
'64x gtceu:dilithium_gem',
'64x gtceu:dilithium_gem',
'64x gtceu:dilithium_gem',
'64x gtceu:dilithium_gem',
'kubejs:lair_of_the_warden_data'
)
.itemOutputs(
Expand All @@ -396,10 +396,10 @@ ServerEvents.recipes(event => {
.itemInputs(
'kubejs:microminer_t8',
'64x kubejs:quantum_flux',
'64x kubejs:dilithium_crystal',
'64x kubejs:dilithium_crystal',
'64x kubejs:dilithium_crystal',
'64x kubejs:dilithium_crystal',
'64x gtceu:dilithium_gem',
'64x gtceu:dilithium_gem',
'64x gtceu:dilithium_gem',
'64x gtceu:dilithium_gem',
'64x kubejs:dragon_lair_data'
)
.itemOutputs(
Expand Down Expand Up @@ -427,10 +427,10 @@ ServerEvents.recipes(event => {
.itemInputs(
'kubejs:microminer_t8',
'64x kubejs:quantum_flux',
'64x kubejs:dilithium_crystal',
'64x kubejs:dilithium_crystal',
'64x kubejs:dilithium_crystal',
'64x kubejs:dilithium_crystal',
'64x gtceu:dilithium_gem',
'64x gtceu:dilithium_gem',
'64x gtceu:dilithium_gem',
'64x gtceu:dilithium_gem',
'64x kubejs:wither_realm_data',
'64x kubejs:wither_realm_data'
)
Expand Down Expand Up @@ -532,10 +532,10 @@ ServerEvents.recipes(event => {
.itemInputs(
'kubejs:microminer_t8',
'64x kubejs:quantum_flux',
'64x kubejs:dilithium_crystal',
'64x kubejs:dilithium_crystal',
'64x kubejs:dilithium_crystal',
'64x kubejs:dilithium_crystal',
'64x gtceu:dilithium_gem',
'64x gtceu:dilithium_gem',
'64x gtceu:dilithium_gem',
'64x gtceu:dilithium_gem',
'64x minecraft:sculk_catalyst',
'kubejs:corrupted_universe_data',
'kubejs:lair_of_the_warden_data')
Expand Down
18 changes: 13 additions & 5 deletions kubejs/server_scripts/random_recipes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,12 +602,14 @@ ServerEvents.recipes(event => {
});
});
});

// Stonecut GTCEU warning blocks into each other
let hazardNames = ['acid', 'antimatter', 'bio', 'boss', 'causality', 'explosion', 'fire',
'generic', 'gregification', 'high_pressure', 'high_temperature', 'high_voltage',
'laser', 'magic', 'magnetic', 'mob_infestation', 'mob_spawner', 'noise',
'radioactive', 'spatial_storage', 'turret', 'void'];
let hazardNames = [
'acid', 'antimatter', 'bio', 'boss', 'causality', 'explosion', 'fire',
'generic', 'gregification', 'high_pressure', 'high_temperature', 'high_voltage',
'laser', 'magic', 'magnetic', 'mob_infestation', 'mob_spawner', 'noise',
'radioactive', 'spatial_storage', 'turret', 'void'
];
for (let hazardName of hazardNames) {
let hazard = `gtceu:${hazardName}_hazard_sign_block`
event.stonecutting(hazard, "gtceu:solid_machine_casing")
Expand Down Expand Up @@ -918,6 +920,12 @@ ServerEvents.recipes(event => {
.duration(50)
.EUt(120)

event.recipes.gtceu.atomic_reconstruction('dilithium_legacy_updater')
.itemInputs('kubejs:dilithium_crystal')
.itemOutputs('gtceu:dilithium_gem')
.duration(20)
.EUt(15)

// Patchouli Books that needed tweaking
event.shapeless(Item.of('patchouli:guide_book', '{"patchouli:book":"laserio:laseriobook"}'), ['minecraft:book', 'laserio:card_item']).id('laserio:my_book_recipe_shapeless')

Expand Down
3 changes: 2 additions & 1 deletion kubejs/startup_scripts/gregtech_material_registry/endgame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ GTCEuStartupEvents.registry('gtceu:material_icon_set', event => {
event.create('infinity').parent(GTMaterialIconSet.SHINY)
event.create('eltz').parent(GTMaterialIconSet.SHINY)
event.create('monium').parent(GTMaterialIconSet.SHINY)
event.create('dilithium').parent(GTMaterialIconSet.DULL)
})

GTCEuStartupEvents.registry('gtceu:material', event => {
Expand Down Expand Up @@ -106,7 +107,7 @@ GTCEuStartupEvents.registry('gtceu:material', event => {
event.create('eltic_actinate')
.gem()
.color(0xbb9966).secondaryColor(0x881105)
.iconSet(GTMaterialIconSet.GEM_HORIZONTAL)
.iconSet('dilithium')
.components('4x eltz', '1x actinium', '3x oxygen')
.flags(GTMaterialFlags.DISABLE_DECOMPOSITION, GTMaterialFlags.NO_SMASHING)

Expand Down
15 changes: 12 additions & 3 deletions kubejs/startup_scripts/gregtech_material_registry/misc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
*/

// AE2 Materials

GTCEuStartupEvents.registry('gtceu:element', event => {
event.create('dilithium')
.protons(119)
.neutrons(229)
.symbol('Dl')
})

GTCEuStartupEvents.registry('gtceu:material', event => {
event.create('charged_certus_quartz')
.gem()
Expand All @@ -27,10 +35,11 @@ GTCEuStartupEvents.registry('gtceu:material', event => {
GTCEuStartupEvents.registry('gtceu:material', event => {
event.create("dilithium")
.dust()
.gem()
.ore(2, 1)
.color(0xd1b5b4)
.iconSet(GTMaterialIconSet.CERTUS)
.components('2x lithium')
.element(GTElements.get("dilithium"))
.color(0xfdd2df).secondaryColor(0xfa52b5)
.iconSet('dilithium')
.addOreByproducts('lithium', 'cobalt', 'platinum')

event.create('calcium_perchlorate')
Expand Down