Jika/TFG
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse Source
This commit is contained in:
Pyritie
2026-03-08 17:22:57 +00:00
parent 05a5ada088 e74502d50f
commit 366313b58e
29 changed files with 691 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kubejs/assets/emixx/lang/en_us.json
View File

@@ -182,4 +182,4 @@
"stackgroup.emixx.tfg_workbenches": "Workbenches",
"stackgroup.emixx.tfg_wrench_tips": "Wrench Tips",
"stackgroup.emixx.tfg_zpm_wires": "ZPM Wires"
}
}

5
kubejs/assets/minecraft/stack_groups/axes.json Normal file
View File

@@ -0,0 +1,5 @@
{
"type": "emixx:tag",
"tag": "minecraft:axes",
"enabled": false
}

5
kubejs/assets/minecraft/stack_groups/boats.json Normal file
View File

@@ -0,0 +1,5 @@
{
"type": "emixx:tag",
"tag": "minecraft:boats",
"enabled": false
}

5
kubejs/assets/minecraft/stack_groups/decorated_pot_sherds.json Normal file
View File

@@ -0,0 +1,5 @@
{
"type": "emixx:tag",
"tag": "minecraft:decorated_pot_sherds",
"enabled": false
}

10
kubejs/assets/minecraft/stack_groups/enchanted_books.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "emixx:group",
"contents": [
{
"type": "item",
"id": "minecraft:enchanted_book"
}
],
"enabled": false
}

10
kubejs/assets/minecraft/stack_groups/goat_horns.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "emixx:group",
"contents": [
{
"type": "item",
"id": "minecraft:goat_horn"
}
],
"enabled": false
}

5
kubejs/assets/minecraft/stack_groups/hoes.json Normal file
View File

@@ -0,0 +1,5 @@
{
"type": "emixx:tag",
"tag": "minecraft:hoes",
"enabled": false
}

4
kubejs/assets/minecraft/stack_groups/infested_blocks.json Normal file
View File

@@ -0,0 +1,4 @@
{
"type": "emixx:infested_blocks",
"enabled": false
}

10
kubejs/assets/minecraft/stack_groups/lingering_potions.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "emixx:group",
"contents": [
{
"type": "item",
"id": "minecraft:lingering_potion"
}
],
"enabled": false
}

4
kubejs/assets/minecraft/stack_groups/minecarts.json Normal file
View File

@@ -0,0 +1,4 @@
{
"type": "emixx:minecarts",
"enabled": false
}

5
kubejs/assets/minecraft/stack_groups/pickaxes.json Normal file
View File

@@ -0,0 +1,5 @@
{
"type": "emixx:tag",
"tag": "minecraft:pickaxes",
"enabled": false
}

10
kubejs/assets/minecraft/stack_groups/potions.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "emixx:group",
"contents": [
{
"type": "item",
"id": "minecraft:potion"
}
],
"enabled": false
}

5
kubejs/assets/minecraft/stack_groups/shovels.json Normal file
View File

@@ -0,0 +1,5 @@
{
"type": "emixx:tag",
"tag": "minecraft:shovels",
"enabled": false
}

4
kubejs/assets/minecraft/stack_groups/spawn_eggs.json Normal file
View File

@@ -0,0 +1,4 @@
{
"type": "emixx:spawn_eggs",
"enabled": false
}

10
kubejs/assets/minecraft/stack_groups/splash_potions.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "emixx:group",
"contents": [
{
"type": "item",
"id": "minecraft:splash_potion"
}
],
"enabled": false
}

10
kubejs/assets/minecraft/stack_groups/suspicious_stews.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "emixx:group",
"contents": [
{
"type": "item",
"id": "minecraft:suspicious_stew"
}
],
"enabled": false
}

347
kubejs/client_scripts/emixx.js Normal file
View File

@@ -0,0 +1,347 @@
"use strict";
const registerSingleGroups = (event) => {
const SINGLE_GROUPS_TO_REGISTER = [
// Raw Ores
'#tfc:small_ore_pieces',
'#forge:poor_raw_materials',
'#forge:raw_materials',
'#forge:rich_raw_materials',
// Processed Ores
'#forge:crushed_ores',
'#forge:purified_ores',
'#forge:refined_ores',
'#forge:dusty_raw_materials',
// Dusts
'#forge:impure_dusts',
'#forge:tiny_dusts',
'#forge:small_dusts',
'#forge:dusts',
'#forge:pure_dusts',
'#forge:powders',
// Gems
'#forge:chipped_gems',
'#forge:flawed_gems',
'#forge:gems',
'#forge:flawless_gems',
'#forge:exquisite_gems',
// Gem Products
'#forge:lenses',
// Ore Products
'#forge:nuggets',
'#forge:ingots',
'#forge:hot_ingots',
'#forge:storage_blocks',
'#forge:double_ingots',
'#forge:dense_plates',
'#forge:plates',
'#forge:double_plates',
'#forge:foils',
'#forge:rods',
'#forge:rods/long',
'#forge:bolts',
'#forge:screws',
'#forge:rings',
'#forge:small_springs',
'#forge:springs',
'#forge:small_gears',
'#forge:gears',
'#forge:fine_wires',
'#forge:rotors',
'#forge:rounds',
'#forge:whisks',
'#forge:turbine_blades',
'#forge:chains',
// Tool Heads
'#forge:pickaxe_heads',
'#forge:shovel_heads',
'#forge:axe_heads',
'#forge:hoe_heads',
'#forge:sword_heads',
'#forge:butchery_knife_heads',
'#forge:drill_heads',
'#forge:screwdriver_tips',
'#forge:wire_cutter_heads',
'#forge:file_heads',
'#forge:chainsaw_heads',
'#forge:spade_heads',
'#forge:mining_hammer_heads',
'#forge:hammer_heads',
'#forge:knife_heads',
'#forge:saw_heads',
'#forge:wrench_tips',
'#forge:scythe_heads',
'#forge:buzz_saw_heads',
'#forge:javelin_heads',
'#forge:mace_heads',
'#forge:chisel_heads',
'#forge:propick_heads',
'#forge:mattock_heads',
'#tfchotornot:tong_parts',
'#tfcscraping:scraping_knife_blades',
'#forge:fish_hooks',
// Tools (Minecraft)
'#tfc:pickaxes',
'#tfc:shovels',
'#tfc:axes',
'#tfc:hoes',
// Tools (Forge)
'#forge:tools/butchery_knives',
'#forge:tools/drills',
'#forge:tools/screwdrivers',
'#forge:tools/wire_cutters',
'#forge:tools/files',
'#forge:tools/chainsaws',
'#forge:tools/spades',
'#forge:tools/mining_hammers',
'#forge:tools/hammers',
'#forge:tools/knives',
'#forge:tools/saws',
'#forge:tools/wrenches',
'#forge:tools/scythes',
'#forge:fishing_rods',
'#forge:shears',
'#forge:tools/crowbars',
'#forge:tools/plungers',
'#forge:tools/mallets',
'#forge:tools/mortars',
'#forge:tools/fishing_nets',
// Tools (Other)
'#tfc:javelins',
'#tfc:maces',
'#tfc:chisels',
'#tfc:propicks',
'#rnr:mattocks',
'#tfchotornot:tongs',
'#tfcscraping:scraping_knives',
// Items (Forge)
'#forge:seeds',
'#forge:dyes',
// Items (GTCEU)
'#gtceu:extruder_molds',
'#gtceu:casting_molds',
// Items (TFC)
'#tfc:unfired_molds',
'#tfc:fired_molds',
// Items (Astikor Carts)
'#tfcastikorcarts:cart_wheel',
'#tfcastikorcarts:supply_cart',
'#tfcastikorcarts:plow',
'#tfcastikorcarts:animal_cart',
// Blocks (Forge)
'#forge:fence_gates',
'#forge:chests',
'#forge:frames',
'#forge:surface_rocks',
'#forge:bud_indicators',
'#forge:glass',
'#forge:glass_panes',
// Blocks (GTCEU)
'#gtceu:lamps',
// Blocks (TFC)
'#tfc:lumber',
'#tfc:fallen_leaves',
'#tfc:bookshelves',
'#tfc:tool_racks',
'#tfc:workbenches',
'#tfc:looms',
'#tfc:sluices',
'#tfc:barrels',
'#tfc:lecterns',
'#tfc:scribing_tables',
'#tfc:sewing_tables',
'#tfc:jar_shelves',
'#tfc:support_beams',
'#tfc:minecarts',
'#tfc:anvils',
'#tfc:ore_deposits',
// Stone-related
'#tfc:rock/hardened',
'#tfc:rock/raw',
'#forge:cobblestone',
'#tfc:rock/smooth',
'#tfc:rock/gravel',
'#tfc:rock/aqueducts',
// Blocks (Firmalife)
'#firmalife:food_shelves',
'#firmalife:hangers',
'#firmalife:jarbnets',
'#firmalife:big_barrels',
'#firmalife:stomping_barrels',
'#firmalife:barrel_presses',
'#firmalife:wine_shelves',
// Blocks (FirmaCiv)
'#alekiroofs:roofing',
// RNR
'#rnr:cobbled_roads',
'#rnr:sett_roads',
'#rnr:flagstone_roads',
'#rnr:gravel_roads',
'#rnr:macadam_roads',
'#rnr:concrete_roads',
'#rnr:gravel_road_items',
'#rnr:flagstone_road_items',
'#rnr:shingles',
'#rnr:roof_blocks',
// Macaw's
'#mcw_tfc_aio:bridges',
'#mcw_tfc_aio:roofs',
'#mcw_tfc_aio:gutters',
'#mcw_tfc_aio:awnings',
'#mcw_tfc_aio:furniture',
'#mcw_tfc_aio:stripped_furniture'
]
SINGLE_GROUPS_TO_REGISTER.forEach(x => {
const [mod, item] = x.split(":");
const safeItem = item.split("/").join("_");
event.register(`tfg:tfg_${safeItem}`, x)
})
}
const registerMultiGroups = (event) => {
const MULTI_GROUPS_TO_REGISTER = [
{ group_name: 'loose_rocks', tags: [
'#tfc:igneous_intrusive_rock',
'#tfc:sedimentary_rock',
'#tfc:igneous_extrusive_rock',
'#tfc:metamorphic_rock'
]},
{ group_name: 'bricks', tags: [
'#tfg:stone_brick',
'#tfc:wet_mud_bricks',
'#tfc:dry_mud_bricks',
'tfc:alabaster_brick',
'tfc:ceramic/unfired_brick',
'tfc:ceramic/unfired_fire_brick',
'tfc:ceramic/fire_brick',
'gtceu:coke_oven_brick'
]},
{ group_name: 'brick_blocks', tags: [
'#tfc:rock/bricks',
'#tfc:rock/mossy_bricks',
'#tfc:rock/cracked_bricks',
'#tfc:rock/chiseled_bricks',
'tfc:fire_bricks',
'tfcbetterbf:insulated_fire_bricks',
'gtceu:coke_oven_bricks'
]},
{ group_name: 'concretes', tags: [
'#forge:concretes',
'#forge:concrete_powders'
]},
{ group_name: 'fluid_pipes', tags: [
'#forge:tiny_fluid_pipes',
'#forge:small_fluid_pipes',
'#forge:normal_fluid_pipes',
'#forge:large_fluid_pipes',
'#forge:huge_fluid_pipes',
'#forge:quadruple_fluid_pipes',
'#forge:nonuple_fluid_pipes'
]},
{ group_name: 'item_pipes', tags: [
'#forge:small_item_pipes',
'#forge:normal_item_pipes',
'#forge:large_item_pipes',
'#forge:huge_item_pipes'
]},
{ group_name: 'restrictive_pipes', tags: [
'#forge:small_restrictive_pipes',
'#forge:normal_restrictive_pipes',
'#forge:large_restrictive_pipes',
'#forge:huge_restrictive_pipes'
]}
]
MULTI_GROUPS_TO_REGISTER.forEach(x => {
event.register(`tfg:tfg_${x.group_name}`, x.tags)
})
}
const registerWireGroups = (event) => {
const WIRE_TYPES = [
'#forge:single_wires/',
'#forge:double_wires/',
'#forge:quadruple_wires/',
'#forge:octal_wires/',
'#forge:hex_wires/',
'#forge:single_cables/',
'#forge:double_cables/',
'#forge:quadruple_cables/',
'#forge:octal_cables/',
'#forge:hex_cables/'
]
function makeWireArray(materials) {
const output = []
WIRE_TYPES.forEach(type => {
materials.forEach(mat => {
output.push(type + mat)
})
})
return output
}
event.register('tfg:tfg_ulv_wires', makeWireArray([
'lead', 'red_alloy'
]))
event.register('tfg:tfg_lv_wires', makeWireArray([
'manganese_phosphide', 'nickel', 'cobalt', 'tin'
]))
event.register('tfg:tfg_mv_wires', makeWireArray([
'copper', 'magnesium_diboride', 'cupronickel', 'annealed_copper', 'iron'
]))
event.register('tfg:tfg_hv_wires', makeWireArray([
'blue_alloy', 'kanthal', 'gold', 'mercury_barium_calcium_cuprate', 'electrum', 'silver'
]))
event.register('tfg:tfg_ev_wires', makeWireArray([
'black_steel', 'nichrome', 'aluminium', 'rtm_alloy', 'steel', 'uranium_triplatinum'
]))
event.register('tfg:tfg_iv_wires', makeWireArray([
'tungsten', 'tungsten_steel', 'samarium_iron_arsenic_oxide', 'platinum', 'graphene'
]))
event.register('tfg:tfg_luv_wires', makeWireArray([
'hssg', 'osmium', 'niobium_titanium', 'niobium_nitride', 'indium_tin_barium_titanium_cuprate'
]))
event.register('tfg:tfg_zpm_wires', makeWireArray([
'naquadah', 'vanadium_gallium', 'uranium_rhodium_dinaquadide', 'trinium'
]))
event.register('tfg:tfg_uv_wires', makeWireArray([
'naquadah_alloy', 'yttrium_barium_cuprate', 'enriched_naquadah_trinium_europium_duranide', 'tritanium'
]))
event.register('tfg:tfg_uhv_wires', makeWireArray([
'ruthenium_trinium_americium_neutronate', 'europium'
]))
}

6
kubejs/client_scripts/main_client_script.js
View File

@@ -1,3 +1,9 @@
ItemEvents.tooltip(evt => {
registerTooltips(evt);
})
EmiPlusPlusEvents.registerGroups(event => {
registerSingleGroups(event)
registerMultiGroups(event)
registerWireGroups(event)
})

8
kubejs/server_scripts/afc/tags.js
View File

@@ -23,6 +23,14 @@ const registerAFCItemTags = (event) => {
event.add('firmalife:stomping_barrels', `afc:wood/stomping_barrel/${woodType}`)
event.add('firmalife:barrel_presses', `afc:wood/barrel_press/${woodType}`)
event.add('tfc:sewing_tables', `afc:wood/sewing_table/${woodType}`)
event.add('tfc:scribing_tables', `afc:wood/scribing_table/${woodType}`)
event.add('tfc:jar_shelves', `afc:wood/jar_shelf/${woodType}`)
event.add('tfc:minecarts', `afc:wood/chest_minecart/${woodType}`)
event.add('minecraft:signs', `afc:wood/sign/${woodType}`)
global.TFC_EQUIPMENT_METALS.forEach(metalType => {
event.add('minecraft:hanging_signs', `afc:wood/hanging_sign/${metalType}/${woodType}`)
})
})
//Hardwood Tags

6
kubejs/server_scripts/gregtech/tags.js
View File

@@ -69,6 +69,12 @@ function registerGTCEUItemTags(event) {
//greens
event.add('tfc:compost_greens', 'gtceu:bio_chaff');
event.add('tfc:compost_greens', 'gtceu:plant_ball');
// lamp tag for EMI++
global.MINECRAFT_DYE_NAMES.forEach(color => {
event.add('gtceu:lamps', `gtceu:${color}_lamp`)
event.add('gtceu:lamps', `gtceu:${color}_borderless_lamp`)
})
}
/** @param {TagEvent.Block} event */

107
kubejs/server_scripts/macaws_for_tfc/tags.js
View File

@@ -5,4 +5,111 @@ function registerMacawsForTFCItemTags(event) {
global.MINECRAFT_DYE_NAMES.forEach(color => {
event.remove(`mcw_tfc_aio:${color}_roofs`, `mcw_tfc_aio:roofs/${color}_roofs/${color}_roof_slab`);
})
// Fence Gates
global.TFC_WOOD_TYPES.forEach(wood => {
event.add('minecraft:fence_gates', `mcw_tfc_aio:fences/${wood}_fences/${wood}_highley_gate`)
event.add('minecraft:fence_gates', `mcw_tfc_aio:fences/${wood}_fences/${wood}_pyramid_gate`)
event.add('mcw_tfc_aio:bridges', `mcw_tfc_aio:bridges/${wood}_bridges/${wood}_bridge_pier`)
event.add('mcw_tfc_aio:bridges', `mcw_tfc_aio:bridges/${wood}_bridges/${wood}_log_bridge_middle`)
event.add('mcw_tfc_aio:bridges', `mcw_tfc_aio:bridges/${wood}_bridges/${wood}_log_bridge_stair`)
event.add('mcw_tfc_aio:bridges', `mcw_tfc_aio:bridges/${wood}_bridges/${wood}_rail_bridge`)
event.add('mcw_tfc_aio:bridges', `mcw_tfc_aio:bridges/${wood}_bridges/rope_${wood}_bridge`)
event.add('mcw_tfc_aio:bridges', `mcw_tfc_aio:bridges/${wood}_bridges/${wood}_rope_bridge_stair`)
})
// Bridges
event.add('mcw_tfc_aio:bridges', `mcw_tfc_aio:bridges/brick_bridges/brick_bridge_pier`)
event.add('mcw_tfc_aio:bridges', `mcw_tfc_aio:bridges/brick_bridges/brick_bridge`)
event.add('mcw_tfc_aio:bridges', `mcw_tfc_aio:bridges/brick_bridges/brick_bridge_stair`)
event.add('mcw_tfc_aio:bridges', `mcw_tfc_aio:bridges/bamboo_bridges/bamboo_bridge_pier`)
event.add('mcw_tfc_aio:bridges', `mcw_tfc_aio:bridges/bamboo_bridges/bamboo_bridge`)
event.add('mcw_tfc_aio:bridges', `mcw_tfc_aio:bridges/bamboo_bridges/bamboo_bridge_stair`)
event.add('mcw_tfc_aio:bridges', `mcw_tfc_aio:bridges/bamboo_bridges/dry_bamboo_bridge_pier`)
event.add('mcw_tfc_aio:bridges', `mcw_tfc_aio:bridges/bamboo_bridges/dry_bamboo_bridge`)
event.add('mcw_tfc_aio:bridges', `mcw_tfc_aio:bridges/bamboo_bridges/dry_bamboo_bridge_stair`)
// Roofs
const ROOF_TYPES = [
'_attic_roof',
'_lower_roof',
'_roof',
'_steep_roof',
'_top_roof',
'_upper_lower_roof',
'_upper_steep_roof'
]
global.TFC_WOOD_TYPES.forEach(wood => {
ROOF_TYPES.forEach(type => {
event.add('mcw_tfc_aio:roofs', `mcw_tfc_aio:roofs/${wood}_roofs/${wood}_planks${type}`)
event.add('mcw_tfc_aio:roofs', `mcw_tfc_aio:roofs/${wood}_roofs/${wood}${type}`)
})
})
global.MINECRAFT_DYE_NAMES.forEach(color => {
ROOF_TYPES.forEach(type => {
event.add('mcw_tfc_aio:roofs', `mcw_tfc_aio:roofs/${color}_roofs/${color}${type}`)
event.add('mcw_tfc_aio:roofs', `mcw_tfc_aio:roofs/${color}_concrete_roofs/${color}_concrete${type}`)
event.add('mcw_tfc_aio:roofs', `mcw_tfc_aio:roofs/${color}_terracotta_roofs/${color}_terracotta${type}`)
})
})
ROOF_TYPES.forEach(type => {
event.add('mcw_tfc_aio:roofs', `mcw_tfc_aio:roofs/brick_roofs/bricks${type}`)
event.add('mcw_tfc_aio:roofs', `mcw_tfc_aio:roofs/thatch_roofs/thatch${type}`)
event.add('mcw_tfc_aio:roofs', `mcw_tfc_aio:roofs/thatch2_roofs/thatch2${type}`)
})
// Gutters & Awnings
global.MINECRAFT_DYE_NAMES.forEach(color => {
event.add('mcw_tfc_aio:gutters', `mcw_tfc_aio:roofs/gutters/gutter_base_${color}`)
event.add('mcw_tfc_aio:gutters', `mcw_tfc_aio:roofs/gutters/gutter_middle_${color}`)
event.add('mcw_tfc_aio:awnings', `mcw_tfc_aio:roofs/awnings/${color}_striped_awning`)
})
event.add('mcw_tfc_aio:gutters', `mcw_tfc_aio:roofs/gutters/gutter_base`)
event.add('mcw_tfc_aio:gutters', `mcw_tfc_aio:roofs/gutters/gutter_middle`)
// Furniture
const FURNITURE_TYPES = [
'_wardrobe',
'_chair',
'_modern_wardrobe',
'_double_wardrobe',
'_bookshelf',
'_bookshelf_cupboard',
'_drawer',
'_double_drawer',
'_bookshelf_drawer',
'_lower_bookshelf_drawer',
'_large_drawer',
'_lower_triple_drawer',
'_triple_drawer',
'_desk',
'_covered_desk',
'_modern_desk',
'_table',
'_end_table',
'_coffee_table',
'_glass_table',
'_modern_chair',
'_striped_chair',
'_stool_chair',
'_counter',
'_drawer_counter',
'_double_drawer_counter',
'_cupboard_counter'
]
global.TFC_WOOD_TYPES.forEach(wood => {
FURNITURE_TYPES.forEach(type => {
event.add('mcw_tfc_aio:furniture', `mcw_tfc_aio:furniture/${wood}_furniture/${wood}${type}`)
event.add('mcw_tfc_aio:stripped_furniture', `mcw_tfc_aio:furniture/${wood}_furniture/stripped_${wood}${type}`)
})
})
}

1
kubejs/server_scripts/main_server_script.js
View File

@@ -55,6 +55,7 @@ ServerEvents.tags('item', event => {
registerSpeciesItemTags(event)
registerTACZItemTags(event)
registerTFCItemTags(event)
registerTFCScrapingKnivesItemTags(event)
registerTFCTextileItemTags(event)
registerTFGItemTags(event)
registerTFGNuclearItemTags(event)

90
kubejs/server_scripts/rnr/tags.js
View File

@@ -6,6 +6,96 @@ const registerRnrItemTags = (event) => {
event.removeAllTagsFrom(item)
event.add('c:hidden_from_recipe_viewers', item)
});
global.TFC_WOOD_TYPES.forEach(wood => {
event.add('rnr:shingles', `rnr:wood/shingle/${wood}`)
event.add('rnr:roof_blocks', `rnr:wood/shingles/${wood}`)
event.add('rnr:roof_blocks', `rnr:wood/shingles/${wood}_stairs`)
event.add('rnr:roof_blocks', `rnr:wood/shingles/${wood}_slab`)
})
global.AFC_WOOD_TYPES.forEach(wood => {
event.add('rnr:shingles', `rnr:wood/shingle/${wood}`)
event.add('rnr:roof_blocks', `rnr:wood/shingles/${wood}`)
event.add('rnr:roof_blocks', `rnr:wood/shingles/${wood}_stairs`)
event.add('rnr:roof_blocks', `rnr:wood/shingles/${wood}_slab`)
})
event.add('rnr:shingles', `rnr:unfired_terracotta_roof_tile`)
event.add('rnr:shingles', `rnr:terracotta_roof_tile`)
event.add('rnr:shingles', `rnr:unfired_roof_tile`)
event.add('rnr:shingles', `rnr:ceramic_roof_tile`)
event.add('rnr:roof_blocks', `rnr:roof_frame`)
event.add('rnr:roof_blocks', `rnr:roof_frame_stairs`)
event.add('rnr:roof_blocks', `rnr:roof_frame_slab`)
event.add('rnr:roof_blocks', `rnr:thatch_roof`)
event.add('rnr:roof_blocks', `rnr:thatch_roof_stairs`)
event.add('rnr:roof_blocks', `rnr:thatch_roof_slab`)
event.add('rnr:roof_blocks', `rnr:terracotta_roof`)
event.add('rnr:roof_blocks', `rnr:terracotta_roof_stairs`)
event.add('rnr:roof_blocks', `rnr:terracotta_roof_slab`)
event.add('rnr:roof_blocks', `rnr:ceramic_roof`)
event.add('rnr:roof_blocks', `rnr:ceramic_roof_stairs`)
event.add('rnr:roof_blocks', `rnr:ceramic_roof_slab`)
global.TFC_STONE_TYPES.forEach(stone => {
event.add('rnr:cobbled_roads', `rnr:rock/cobbled_road/${stone}`)
event.add('rnr:cobbled_roads', `rnr:rock/cobbled_road/${stone}_stairs`)
event.add('rnr:cobbled_roads', `rnr:rock/cobbled_road/${stone}_slab`)
event.add('rnr:sett_roads', `rnr:rock/sett_road/${stone}`)
event.add('rnr:sett_roads', `rnr:rock/sett_road/${stone}_stairs`)
event.add('rnr:sett_roads', `rnr:rock/sett_road/${stone}_slab`)
event.add('rnr:flagstone_roads', `rnr:rock/flagstones/${stone}`)
event.add('rnr:flagstone_roads', `rnr:rock/flagstones/${stone}_stairs`)
event.add('rnr:flagstone_roads', `rnr:rock/flagstones/${stone}_slab`)
event.add('rnr:gravel_roads', `rnr:rock/gravel_road/${stone}`)
event.add('rnr:gravel_roads', `rnr:rock/gravel_road/${stone}_stairs`)
event.add('rnr:gravel_roads', `rnr:rock/gravel_road/${stone}_slab`)
event.add('rnr:gravel_roads', `rnr:rock/over_height_gravel/${stone}`)
event.add('rnr:macadam_roads', `rnr:rock/macadam_road/${stone}`)
event.add('rnr:macadam_roads', `rnr:rock/macadam_road/${stone}_stairs`)
event.add('rnr:macadam_roads', `rnr:rock/macadam_road/${stone}_slab`)
})
global.SAND_COLORS.forEach(color => {
event.add('rnr:flagstone_roads', `rnr:${color}_sandstone_flagstones`)
event.add('rnr:flagstone_roads', `rnr:${color}_sandstone_flagstones_stairs`)
event.add('rnr:flagstone_roads', `rnr:${color}_sandstone_flagstones_slab`)
})
event.add('rnr:sett_roads', `rnr:brick_road`)
event.add('rnr:sett_roads', `rnr:brick_road_slab`)
event.add('rnr:sett_roads', `rnr:brick_road_stairs`)
event.add('rnr:concrete_roads', `rnr:concrete_road`)
event.add('rnr:concrete_roads', `rnr:concrete_road_control_joint`)
event.add('rnr:concrete_roads', `rnr:cracked_concrete_road`)
event.add('rnr:concrete_roads', `rnr:trodden_concrete_road`)
event.add('rnr:concrete_roads', `rnr:cracked_trodden_concrete_road`)
event.add('rnr:concrete_roads', `rnr:concrete_road_panel`)
event.add('rnr:concrete_roads', `rnr:concrete_road_sett`)
event.add('rnr:concrete_roads', `rnr:concrete_road_flagstones`)
event.add('rnr:concrete_roads', `rnr:concrete_road_stairs`)
event.add('rnr:concrete_roads', `rnr:cracked_concrete_road_stairs`)
event.add('rnr:concrete_roads', `rnr:trodden_concrete_road_stairs`)
event.add('rnr:concrete_roads', `rnr:cracked_trodden_concrete_road_stairs`)
event.add('rnr:concrete_roads', `rnr:concrete_road_panel_stairs`)
event.add('rnr:concrete_roads', `rnr:concrete_road_sett_stairs`)
event.add('rnr:concrete_roads', `rnr:concrete_road_flagstones_stairs`)
event.add('rnr:concrete_roads', `rnr:concrete_road_slab`)
event.add('rnr:concrete_roads', `rnr:cracked_concrete_road_slab`)
event.add('rnr:concrete_roads', `rnr:trodden_concrete_road_slab`)
event.add('rnr:concrete_roads', `rnr:cracked_trodden_concrete_road_slab`)
event.add('rnr:concrete_roads', `rnr:concrete_road_panel_slab`)
event.add('rnr:concrete_roads', `rnr:concrete_road_sett_slab`)
event.add('rnr:concrete_roads', `rnr:concrete_road_flagstones_slab`)
};
function registerRnrBlockTags(event) {

8
kubejs/server_scripts/tfc_scraping/tags.js Normal file
View File

@@ -0,0 +1,8 @@
// priority: 0
"use strict";
const registerTFCScrapingKnivesItemTags = (event) => {
global.TFC_EQUIPMENT_METALS.forEach(metal => {
event.add('tfcscraping:scraping_knife_blades', `tfcscraping:metal/scraping_knife_blade/${metal}`)
})
}

5
kubejs/server_scripts/tfchotornot/tags.js
View File

@@ -18,7 +18,10 @@ const registerHotOrNotItemTags = (event) => {
event.add('tfchotornot:hot_whitelist', magma)
})
global.TFC_METALS.forEach(metal => {
event.add('tfchotornot:tong_parts', `tfchotornot:tong_part/${metal}`)
})
event.add('firmalife:usable_on_oven', '#tfchotornot:insulating')
event.add('tfg:insulating_container', 'gtceu:ulv_super_tank')

4
kubejs/server_scripts/tfg/hv_rework/material.recipes.js
View File

@@ -101,7 +101,7 @@ function registerTFGHVMaterialRecipes(event) {
// Alumina
event.recipes.gtceu.chemical_reactor('tfg:aluminium_sulfate')
event.recipes.gtceu.large_chemical_reactor('tfg:aluminium_sulfate_lcr')
.itemInputs(Item.of('tfg:igneous_felsic_dust', 1))
.inputFluids(Fluid.of('gtceu:sulfuric_acid', 1000))
.itemOutputs(Item.of('tfg:aluminium_sulfate_dust', 1), Item.of('gtceu:potassium_sulfate_dust', 1), Item.of('gtceu:silicon_dioxide_dust'))
@@ -218,4 +218,4 @@ function registerTFGHVMaterialRecipes(event) {
.EUt(GTValues.VA[GTValues.MV])
// #endregion
}
}

14
kubejs/server_scripts/tfg/natural_blocks/tags.stones.js
View File

@@ -62,7 +62,8 @@ function registerTFGStoneItemTags(event) {
if (rock.cobble.mossy != null) {
event.add('tfg:interaction/mossy_cobble', rock.cobble.mossy.block);
event.add('forge:cobblestone/mossy', rock.cobble.block);
event.remove('forge:cobblestone/normal', rock.cobble.mossy.block);
event.add('forge:cobblestone/mossy', rock.cobble.mossy.block);
addToTfcTag(rock.cobble.mossy.block);
addToMaterialTag(material, rock.cobble.mossy.block);
@@ -99,8 +100,8 @@ function registerTFGStoneItemTags(event) {
if (rock.bricks.mossy != null) {
event.add('tfg:brick_index', rock.bricks.mossy.block);
event.add('tfg:interaction/mossy_brick', rock.bricks.mossy.block);
event.add('tfc:rock/bricks', rock.bricks.block);
event.add('tfc:rock/mossy_bricks', rock.bricks.block);
event.remove('tfc:rock/bricks', rock.bricks.mossy.block);
event.add('tfc:rock/mossy_bricks', rock.bricks.mossy.block);
addToTfcTag(rock.bricks.mossy.block);
addToMaterialTag(material, rock.bricks.mossy.block);
@@ -118,8 +119,8 @@ function registerTFGStoneItemTags(event) {
if (rock.bricks.cracked != null) {
event.add('tfg:brick_index', rock.bricks.cracked.block);
event.add('tfg:interaction/cracked_brick', rock.bricks.cracked.block);
event.add('tfc:rock/bricks', rock.bricks.block);
event.add('tfc:rock/cracked_bricks', rock.bricks.block);
event.remove('tfc:rock/bricks', rock.bricks.cracked.block);
event.add('tfc:rock/cracked_bricks', rock.bricks.cracked.block);
addToTfcTag(rock.bricks.cracked.block);
addToMaterialTag(material, rock.bricks.cracked.block);
@@ -138,6 +139,7 @@ function registerTFGStoneItemTags(event) {
if (rock.polished != null) {
event.add('tfg:brick_index', rock.polished.block);
event.add('tfg:interaction/smooth_brick', rock.polished.block);
event.remove('tfc:rock/bricks', rock.polished.block);
event.add('tfc:rock/smooth', rock.polished.block);
event.add('forge:smooth_stone', rock.polished.block);
addToTfcTag(rock.polished.block);
@@ -161,7 +163,7 @@ function registerTFGStoneItemTags(event) {
}
if (rock.chiseled != null) {
event.add('tfc:rock/bricks', rock.chiseled.block);
event.remove('tfc:rock/bricks', rock.chiseled.block);
event.add('tfc:rock/chiseled_bricks', rock.chiseled.block);
addToTfcTag(rock.chiseled.block);
addToMaterialTag(material, rock.chiseled.block);

2
kubejs/startup_scripts/tfg/materials/materials.alumina.js
View File

@@ -26,8 +26,6 @@ function registerTFGAluminaMaterials(event) {
.secondaryColor(0xf7f7f2)
.iconSet(GTMaterialIconSet.BRIGHT)
.components('2x sodium', '1x sulfur', '4x oxygen')
.flags(
GTMaterialFlags.DISABLE_DECOMPOSITION)
event.create('tfg:alumina')
.dust()

2
kubejs/startup_scripts/tfg/stone_types/blocks.rocks.js
View File

@@ -190,7 +190,7 @@ function registerTFGRockBlocks(event) {
.soundType(rock.sound ?? 'stone')
.textureAll(rock.bricks.texture ?? rock.bricks.block.replace(/:/g, ":block/"))
.mapColor(rock.mapColor)
.tagBoth('tfg:rock/aqueducts')
.tagBoth('tfc:rock/aqueducts')
if (rock.tfcTag != null) {
aqueduct.tagBoth(rock.tfcTag);