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

Added recipes for create glass, more windows, fixed tinted glass recipe conflict #704

Merged
merged 4 commits into from
Jan 17, 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
92 changes: 92 additions & 0 deletions kubejs/server_scripts/create/recipes.js
Original file line number Diff line number Diff line change
Expand Up @@ -1217,4 +1217,96 @@ const registerCreateRecipes = (event) => {
.EUt(20)

//#endregion

// #region So-called "Shit Glass"

event.shaped('4x create:framed_glass',
[
'AA',
'AA'
], {
A: 'minecraft:glass'
}).id('tfg:create/framed_glass')

event.shaped('4x create:tiled_glass',
[
'A A',
' ',
'A A'
], {
A: 'minecraft:glass'
}).id('tfg:create/tiled_glass')

event.shaped('4x create:horizontal_framed_glass',
[
'AA',
' ',
'AA'
], {
A: 'minecraft:glass'
}).id('tfg:create/horizontal_framed_glass')

event.shaped('4x create:vertical_framed_glass',
[
'A A',
'A A'
], {
A: 'minecraft:glass'
}).id('tfg:create/vertical_framed_glass')

const CREATE_FRAMED_GLASS_WINDOWS =
[
'framed_glass',
'tiled_glass',
'horizontal_framed_glass',
'vertical_framed_glass'
]

CREATE_FRAMED_GLASS_WINDOWS.forEach(x => {
event.shapeless(`2x create:${x}_pane`,
[
`create:${x}`,
'#forge:tools/saws'
])
.id(`tfg:create/shapeless/${x}_pane`)

event.recipes.gtceu.cutter(`tfg:create/${x}_pane`)
.itemInputs(`3x create:${x}`)
.itemOutputs(`8x create:${x}_pane`)
.duration(40)
.EUt(20)
})

const CREATE_OTHER_GLASS_WINDOWS =
[
[ 'dark_oak', 'tfc:wood/lumber/hickory' ],
[ 'mangrove', 'tfc:wood/lumber/mangrove' ],
[ 'ornate_iron', 'gtceu:wrought_iron_rod' ]
]

CREATE_OTHER_GLASS_WINDOWS.forEach(x => {
event.shaped(`2x create:${x[0]}_window`,
[
' B ',
'BAB'
], {
A: 'minecraft:glass',
B: x[1]
}).id(`tfg:create/shaped/${x[0]}_window`)

event.shapeless(`2x create:${x[0]}_window_pane`,
[
`create:${x[0]}_window`,
'#forge:tools/saws'
])
.id(`tfg:create/shapeless/${x[0]}_window_pane`)

event.recipes.gtceu.cutter(`tfg:create/${x[0]}_window_pane`)
.itemInputs(`3x create:${x[0]}_window`)
.itemOutputs(`8x create:${x[0]}_window_pane`)
.duration(40)
.EUt(20)
})

// #endregion
}
22 changes: 22 additions & 0 deletions kubejs/server_scripts/every_compat/recipes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// priority: 0

const registerEveryCompatRecipes = (event) => {

global.TFC_WOOD_TYPES.forEach(wood =>
{
event.remove({ id: `everycomp:c/tfc/${wood}_window_pane` })

event.shapeless(`2x everycomp:c/tfc/${wood}_window_pane`,
[
`everycomp:c/tfc/${wood}_window`,
'#forge:tools/saws'
])
.id(`tfg:everycompat/shapeless/${wood}_window_pane`)

event.recipes.gtceu.cutter(`tfg:everycompat/shapeless/${wood}_window_pane`)
.itemInputs(`3x everycomp:c/tfc/${wood}_window`)
.itemOutputs(`8x everycomp:c/tfc/${wood}_window_pane`)
.duration(40)
.EUt(20)
})
}
9 changes: 9 additions & 0 deletions kubejs/server_scripts/every_compat/tags.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// priority: 0

const registerEveryCompatItemTags = (event) => {

event.removeAllTagsFrom('everycomp:c/gtceu/rubber_window')
event.removeAllTagsFrom('everycomp:c/gtceu/rubber_window_pane')
event.add('c:hidden_from_recipe_viewers', 'everycomp:c/gtceu/rubber_window')
event.add('c:hidden_from_recipe_viewers', 'everycomp:c/gtceu/rubber_window_pane')
}
2 changes: 2 additions & 0 deletions kubejs/server_scripts/main_server_script.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ ServerEvents.tags('item', event => {
registerComputerCraftItemTags(event)
registerCreateItemTags(event)
registerCreateAdditionsItemTags(event)
registerEveryCompatItemTags(event)
registerExtendedAE2ItemTags(event)
registerFirmaCivItemTags(event)
registerFirmaLifeItemTags(event)
Expand Down Expand Up @@ -118,6 +119,7 @@ ServerEvents.recipes(event => {
registerCreateRecipes(event)
registerCreateAdditionsRecipes(event)
registerCreateConnectedRecipes(event)
registerEveryCompatRecipes(event)
registerExtendedAE2Recipes(event)
registerExposureRecipes(event)
registerEtchedRecipes(event)
Expand Down
5 changes: 2 additions & 3 deletions kubejs/server_scripts/minecraft/recipes.js
Original file line number Diff line number Diff line change
Expand Up @@ -2206,9 +2206,8 @@ const registerMinecraftRecipes = (event) => {

//#region Выход: Тонированное стекло

event.recipes.gtceu.chemical_bath('tfg:minecraft/tinted_glass')
.itemInputs('minecraft:glass')
.inputFluids(Fluid.of('gtceu:black_dye', 144))
event.recipes.gtceu.alloy_smelter('tfg:minecraft/tinted_glass')
.itemInputs('minecraft:glass', 'tfc:powder/amethyst')
.itemOutputs('minecraft:tinted_glass')
.duration(260)
.EUt(16)
Expand Down
24 changes: 5 additions & 19 deletions kubejs/startup_scripts/create/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -322,33 +322,20 @@ global.CREATE_DISABLED_ITEMS = [
'create:granite_pillar',

// Shit Glass
'create:tiled_glass',
'create:framed_glass',
'create:horizontal_framed_glass',
'create:vertical_framed_glass',
'create:tiled_glass_pane',
'create:horizontal_framed_glass_pane',
'create:vertical_framed_glass_pane',
'create:crimson_window',
'create:warped_window',
'create:oak_window',
'create:spruce_window',
'create:birch_window',
'create:jungle_window',
'create:acacia_window',
'create:dark_oak_window',
'create:mangrove_window',
'create:crimson_window',
'create:warped_window',
'create:ornate_iron_window',
'create:oak_window_pane',
'create:spruce_window_pane',
'create:birch_window_pane',
'create:jungle_window_pane',
'create:acacia_window_pane',
'create:dark_oak_window_pane',
'create:mangrove_window_pane',
'create:crimson_window_pane',
'create:crimson_window_pane',
'create:warped_window_pane',
'create:ornate_iron_window_pane',

// Blocks
'create:zinc_block',
Expand Down Expand Up @@ -468,6 +455,5 @@ global.CREATE_DISABLED_ITEMS = [
'create:empty_blaze_burner',
'create:minecart_contraption',
'create:furnace_minecart_contraption',
'create:chest_minecart_contraption',
'create:framed_glass_pane'
];
'create:chest_minecart_contraption'
];