illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into feature/create-6

Browse source
This commit is contained in:
Pyritie 2025-06-05 12:25:01 +01:00
commit 686831a719
31 changed files with 1146 additions and 413 deletions
Download patch file Download diff file Expand all files Collapse all files

3
kubejs/startup_scripts/create/constants.js
View file

@ -272,9 +272,6 @@ global.CREATE_DISABLED_ITEMS = [
'create:crushed_raw_osmium',
'create:crushed_raw_iron',
'create:experience_nugget',
'create:andesite_bars',
'create:brass_bars',
'create:copper_bars',
'create:tree_fertilizer',
'create:handheld_worldshaper',
'create:creative_crate',

25
kubejs/startup_scripts/create/modifications.js Normal file
View file

@ -0,0 +1,25 @@
// priority: 0
function registerCreateItemModifications(event) {
// Change durability to match armor
event.modify('create:copper_diving_helmet', item => {
item.maxDamage = 150
})
event.modify('create:copper_backtank', item => {
item.maxDamage = 215
})
event.modify('create:copper_diving_boots', item => {
item.maxDamage = 160
})
event.modify('create:netherite_diving_helmet', item => {
item.maxDamage = 748
})
event.modify('create:netherite_backtank', item => {
item.maxDamage = 1088
})
event.modify('create:netherite_diving_boots', item => {
item.maxDamage = 860
})
}

34
kubejs/startup_scripts/gtceu/machines.js
View file

@ -15,6 +15,7 @@ const registerGTCEuMachines = (event) => {
event.create('greenhouse', 'multiblock')
.rotationState(RotationState.NON_Y_AXIS)
.recipeType('greenhouse')
.recipeModifiers([GTRecipeModifiers.OC_PERFECT])
.appearanceBlock(GTBlocks.CASING_STEEL_SOLID)
.pattern(definition => FactoryBlockPattern.start()
.aisle("CCCCCCC", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", " F ")
@ -26,7 +27,7 @@ const registerGTCEuMachines = (event) => {
.aisle("CCCYCCC", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", " F ")
.where('X', Predicates.blocks('ae2:quartz_glass'))
.where('F', Predicates.frames('steel'))
.where('D', Predicates.blocks('tfc:dirt/silt')
.where('D', Predicates.blocks('tfc:grass/silt')
.or(Predicates.blocks('tfc:dirt/loam'))
.or(Predicates.blocks('tfc:dirt/sandy_loam'))
.or(Predicates.blocks('tfc:dirt/silty_loam'))
@ -35,12 +36,39 @@ const registerGTCEuMachines = (event) => {
.or(Predicates.blocks('tfc:grass/sandy_loam'))
.or(Predicates.blocks('tfc:grass/silty_loam')))
.where('C', Predicates.blocks('gtceu:steel_machine_casing').or(Predicates.autoAbilities(definition.getRecipeTypes())))
.where('#', Predicates.air())
.where('#', Predicates.air()
.or(Predicates.blockTag($Tags.block("minecraft:logs")))
.or(Predicates.blockTag($Tags.block("minecraft:leaves"))))
.where(' ', Predicates.any())
.where('Y', Predicates.controller(Predicates.blocks(definition.get())))
.build()
)
.workableCasingRenderer('gtceu:block/casings/solid/machine_casing_solid_steel', 'gtceu:block/multiblock/implosion_compressor', false)
.shapeInfo(controller => MultiblockShapeInfo.builder()
.aisle("CCCCCCC", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", " F ")
.aisle("CDDDDDC", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", " XXFXX ")
.aisle("CDDDDDC", "X#####X", "X#####X", "X#####X", "X##L##X", "X#LLL#X", "X##L##X", "X#####X", " XXFXX ")
.aisle("CDDDDDC", "F##W##F", "F##W##F", "F##W##F", "F#LWL#F", "F#LWL#F", "F#LLL#F", "F#####F", "FFFFFFF")
.aisle("CDDDDDC", "X#####X", "X#####X", "X#####X", "X##L##X", "X#LLL#X", "X##L##X", "X#####X", " XXFXX ")
.aisle("CDDDDDC", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", " XXFXX ")
.aisle("CitYfeC", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", " F ")
.where('Y', controller, Direction.SOUTH)
.where('C', GTBlocks.STEEL_HULL.get())
.where('D', Block.getBlock('tfc:grass/silt'))
.where('F', Block.getBlock('gtceu:steel_frame'))
.where('X', Block.getBlock('ae2:quartz_glass'))
.where('W', Block.getBlock('tfc:wood/log/oak'))
.where('L', Block.getBlock('tfc:wood/leaves/oak'))
.where(' ', Block.getBlock('minecraft:air'))
.where('i', GTMachines.ITEM_IMPORT_BUS[GTValues.ULV], Direction.SOUTH)
.where('t', GTMachines.ITEM_EXPORT_BUS[GTValues.ULV], Direction.SOUTH)
.where('f', GTMachines.FLUID_IMPORT_HATCH[GTValues.ULV], Direction.SOUTH)
.where('e', GTMachines.ENERGY_INPUT_HATCH[GTValues.LV], Direction.SOUTH)
.build()
)
.workableCasingRenderer(
'gtceu:block/casings/solid/machine_casing_solid_steel',
'gtceu:block/multiblock/implosion_compressor', false
)
//#endregion

1
kubejs/startup_scripts/main_startup_script.js
View file

@ -28,6 +28,7 @@ BlockEvents.modification(event => {
ItemEvents.modification(event => {
registerBeneathItemModifications(event)
registerConstructionWandsItemModifications(event)
registerCreateItemModifications(event)
registerMinecraftItemModifications(event)
})

6
kubejs/startup_scripts/minecraft/modifications.js
View file

@ -20,4 +20,10 @@ function registerMinecraftItemModifications(event) {
event.modify('minecraft:elytra', item => {
item.maxDamage = 2046
})
// Matches blue steel greaves
event.modify('minecraft:netherite_leggings', item => {
item.maxDamage = 960
})
}