diff --git a/kubejs/server_scripts/ae2/tags.facades.js b/kubejs/server_scripts/ae2/tags.facades.js new file mode 100644 index 000000000..a46259c1f --- /dev/null +++ b/kubejs/server_scripts/ae2/tags.facades.js @@ -0,0 +1,10 @@ +// priority: 0 +"use strict"; + +function registerAe2FacadeWhitelistTags(event) { + + //createdeco catwalks + global.CREATE_DECO_CATWALK_TYPES.forEach(facade_material => { + event.add('ae2:whitelisted/facades', `createdeco:${ facade_material }_catwalk`) + }) +} \ No newline at end of file diff --git a/kubejs/server_scripts/ae2/tags.js b/kubejs/server_scripts/ae2/tags.js index 30ad88670..c959424f3 100644 --- a/kubejs/server_scripts/ae2/tags.js +++ b/kubejs/server_scripts/ae2/tags.js @@ -43,6 +43,8 @@ const registerAE2ItemTags = (event) => { const registerAE2BlockTags = (event) => { + registerAe2FacadeWhitelistTags(event) + global.AE2_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) }) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 286317a9c..23cb67f1d 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -339,8 +339,8 @@ function registerTFCItemTags(event) { event.add("tfc:wet_mud_bricks", wetMudBrick); }); - global.TFC_MUD_BRICKS.forEach((mudBrick) => { - event.add("tfc:mud_bricks", mudBrick); + global.TFC_DRY_MUD_BRICKS.forEach((dryMudBrick) => { + event.add("tfc:dry_mud_bricks", dryMudBrick); }); } diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index b4c36efa0..af969ecc3 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -98,7 +98,7 @@ function registerTFGItemSize(event) { event.itemSize(Ingredient.of("#forge:rods/long"), "large", "medium", "long_rods"); event.itemSize(Ingredient.of("#tfg:metal_bars"), "small", "very_light", "metal_bars"); event.itemSize( - Ingredient.of("#tfc:mud_bricks").or("#tfc:wet_mud_bricks"), + Ingredient.of("#tfc:dry_mud_bricks").or("#tfc:wet_mud_bricks"), "very_small", "very_light", "mud_bricks" diff --git a/kubejs/server_scripts/tfg/tags.facades.js b/kubejs/server_scripts/tfg/tags.facades.js index 9040c8c89..f322f1520 100644 --- a/kubejs/server_scripts/tfg/tags.facades.js +++ b/kubejs/server_scripts/tfg/tags.facades.js @@ -265,6 +265,11 @@ function registerFacadeWhitelistTags(event) { event.add('tfg:whitelisted/facades', `createdeco:cracked_${ facade_material}`) event.add('tfg:whitelisted/facades', `createdeco:mossy_${ facade_material}`) }); + + //createdeco catwalks + global.CREATE_DECO_CATWALK_TYPES.forEach(facade_material => { + event.add('tfg:whitelisted/facades', `createdeco:${ facade_material }_catwalk`) + }) //everycomp windows global.TFC_WOOD_TYPES.forEach(facade_material => { diff --git a/kubejs/startup_scripts/createdeco/constants.js b/kubejs/startup_scripts/createdeco/constants.js index 7ac5e69bd..8bfec458a 100644 --- a/kubejs/startup_scripts/createdeco/constants.js +++ b/kubejs/startup_scripts/createdeco/constants.js @@ -32,3 +32,12 @@ global.CREATE_DECO_GLASS_PANES = /** @type {const} */ ([ "createdeco:brass_window_pane", "createdeco:zinc_window_pane", ]); + +global.CREATE_DECO_CATWALK_TYPES = /** @type {const} */ ([ + "andesite", + "brass", + "iron", + "copper", + "industrial_iron", + "zinc", +]); diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index afdef90f9..b23774f81 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -1093,7 +1093,7 @@ global.TFC_CURDS_AND_CHEESES = /** @type {const} */ ([ }, ]); -global.TFC_MUD_BRICKS = /** @type {const} */ ([ +global.TFC_DRY_MUD_BRICKS = /** @type {const} */ ([ "tfc:mud_brick/loam", "tfc:mud_brick/sandy_loam", "tfc:mud_brick/silt",