diff --git a/config/craftpresence.json b/config/craftpresence.json index fd79781ba..ba149e6ee 100644 --- a/config/craftpresence.json +++ b/config/craftpresence.json @@ -150,7 +150,7 @@ "stripTranslationColors": false, "stripExtraGuiElements": false, "renderTooltips": true, - "configKeyCode": 333 + "configKeyCode": -1 }, "displaySettings": { "presenceData": { diff --git a/config/modernfix-mixins.properties b/config/modernfix-mixins.properties index d293693f4..68fc7f357 100644 --- a/config/modernfix-mixins.properties +++ b/config/modernfix-mixins.properties @@ -66,6 +66,7 @@ # mixin.perf.fast_registry_validation=true # (default) # mixin.perf.faster_item_rendering=false # (default) # mixin.perf.faster_texture_stitching=true # (default) +# mixin.perf.forge_registry_alloc=true # (default) # mixin.perf.forge_registry_lambda=true # (default) # mixin.perf.kubejs=true # (default) # mixin.perf.model_optimizations=true # (default) diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json index d7187d221..9122972ed 100644 --- a/config/xaerominimap_entities.json +++ b/config/xaerominimap_entities.json @@ -10,20 +10,20 @@ "name": "gui.xaero_entity_category_root", "protection": true, "settingOverrides": { - "displayHeight": 0.0, "displayed": true, + "displayHeight": 0.0, "heightBasedFade": true, "renderOrder": 0.0, "color": 13.0, "displayNameWhenIconFails": true, "entityNumber": 1000.0, "alwaysDisplayNametags": false, - "startFadingAt": 0.0, "dotSize": 2.0, + "startFadingAt": 0.0, "renderOverMinimapFrame": 1.0, "icons": 1.0, - "names": 0.0, "heightLimit": 20.0, + "names": 0.0, "iconScale": 1.0 }, "subCategories": [ diff --git a/icon.png b/icon.png new file mode 100644 index 000000000..7181ee2ba Binary files /dev/null and b/icon.png differ diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index c682d0aa2..719cd3ae2 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -10,8 +10,8 @@ ServerEvents.tags('item', event => { registerMinecraftItemTags(event) registerGTCEUItemTags(event) registerAE2ItemTags(event) - registerCreateItemTags(event) - registerAdAstraItemTags(event) + // registerCreateItemTags(event) + // registerAdAstraItemTags(event) registerMoreRedItemTags(event) registerSophisticatedBackpacksItemTags(event) }) @@ -68,11 +68,11 @@ ServerEvents.recipes(event => { registerSmallShipsRecipes(event) registerMinecraftRecipes(event) registerGTCEURecipes(event) - registerCreateRecipes(event) + // registerCreateRecipes(event) registerAE2Recipes(event) registerAE2WTLibRecipes(event) - registerComputerCraftRecipes(event) - registerAdAstraRecipes(event) + // registerComputerCraftRecipes(event) + // registerAdAstraRecipes(event) registerMoreRedRecipes(event) registerSophisticatedBackpacksRecipes(event) registerToolBeltRecipes(event) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 308a49e07..0eaf8e0fa 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -746,6 +746,24 @@ const registerTFCRecipes = (event) => { }) + global.TFC_WOOD_TYPES.forEach(wood => { + event.remove({ id: `tfc:crafting/wood/${wood}_axle` }) + event.remove({ id: `tfc:crafting/wood/${wood}_bladed_axle` }) + event.remove({ id: `tfc:crafting/wood/${wood}_encased_axle` }) + event.remove({ id: `tfc:crafting/wood/${wood}_clutch` }) + event.remove({ id: `tfc:crafting/wood/${wood}_gear_box` }) + event.remove({ id: `tfc:crafting/wood/${wood}_gear_box` }) + event.remove({ id: `tfc:crafting/wood/${wood}_water_wheel` }) + }) + + event.remove({ id: `tfc:crafting/trip_hammer` }) + event.remove({ id: `tfc:crafting/windmill_blade` }) + event.remove({ id: `tfc:barrel/dye/bleach_windmill_blades` }) + + global.MINECRAFT_DYE_NAMES.forEach(dye => { + event.remove({ id: `tfc:barrel/dye/${dye}_windmill_blade` }) + }) + //#region Вырезание предметов из CastIron // Слиток diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index c58a80160..15db7eea9 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -354,3 +354,22 @@ global.MINECRAFT_FORGE_DYES = [ '#forge:dyes/red', '#forge:dyes/black' ]; + +global.MINECRAFT_DYE_NAMES = [ + 'white', + 'orange', + 'magenta', + 'light_blue', + 'yellow', + 'lime', + 'pink', + 'gray', + 'light_gray', + 'cyan', + 'purple', + 'blue', + 'brown', + 'green', + 'red', + 'black' +]; diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index ae487e9e0..654b701db 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -1,5 +1,560 @@ // priority: 0 +/** + * Список хранит предметы, + * у которых должны быть удалены тэги и они должны быть скрыты в REI. + */ +global.TFC_DISABLED_ITEMS = [ + + // Blocks + 'tfc:metal/block/bismuth', + 'tfc:metal/block/bismuth_bronze', + 'tfc:metal/block/black_bronze', + 'tfc:metal/block/bronze', + 'tfc:metal/block/brass', + 'tfc:metal/block/copper', + 'tfc:metal/block/gold', + 'tfc:metal/block/nickel', + 'tfc:metal/block/rose_gold', + 'tfc:metal/block/silver', + 'tfc:metal/block/tin', + 'tfc:metal/block/zinc', + 'tfc:metal/block/sterling_silver', + 'tfc:metal/block/wrought_iron', + 'tfc:metal/block/cast_iron', + 'tfc:metal/block/steel', + 'tfc:metal/block/black_steel', + 'tfc:metal/block/blue_steel', + 'tfc:metal/block/red_steel', + + // Stairs + 'tfc:metal/block/bismuth_stairs', + 'tfc:metal/block/bismuth_bronze_stairs', + 'tfc:metal/block/black_bronze_stairs', + 'tfc:metal/block/bronze_stairs', + 'tfc:metal/block/brass_stairs', + 'tfc:metal/block/copper_stairs', + 'tfc:metal/block/gold_stairs', + 'tfc:metal/block/nickel_stairs', + 'tfc:metal/block/rose_gold_stairs', + 'tfc:metal/block/silver_stairs', + 'tfc:metal/block/tin_stairs', + 'tfc:metal/block/zinc_stairs', + 'tfc:metal/block/sterling_silver_stairs', + 'tfc:metal/block/wrought_iron_stairs', + 'tfc:metal/block/cast_iron_stairs', + 'tfc:metal/block/steel_stairs', + 'tfc:metal/block/black_steel_stairs', + 'tfc:metal/block/blue_steel_stairs', + 'tfc:metal/block/red_steel_stairs', + + // Slabs + 'tfc:metal/block/bismuth_slab', + 'tfc:metal/block/bismuth_bronze_slab', + 'tfc:metal/block/black_bronze_slab', + 'tfc:metal/block/bronze_slab', + 'tfc:metal/block/brass_slab', + 'tfc:metal/block/copper_slab', + 'tfc:metal/block/gold_slab', + 'tfc:metal/block/nickel_slab', + 'tfc:metal/block/rose_gold_slab', + 'tfc:metal/block/silver_slab', + 'tfc:metal/block/tin_slab', + 'tfc:metal/block/zinc_slab', + 'tfc:metal/block/sterling_silver_slab', + 'tfc:metal/block/wrought_iron_slab', + 'tfc:metal/block/cast_iron_slab', + 'tfc:metal/block/steel_slab', + 'tfc:metal/block/black_steel_slab', + 'tfc:metal/block/blue_steel_slab', + 'tfc:metal/block/red_steel_slab', + + // Ingots + "tfc:metal/ingot/bismuth", + "tfc:metal/ingot/bismuth_bronze", + "tfc:metal/ingot/black_bronze", + "tfc:metal/ingot/bronze", + "tfc:metal/ingot/rose_gold", + "tfc:metal/ingot/sterling_silver", + "tfc:metal/ingot/wrought_iron", + "tfc:metal/ingot/steel", + "tfc:metal/ingot/black_steel", + "tfc:metal/ingot/red_steel", + "tfc:metal/ingot/blue_steel", + "tfc:metal/ingot/brass", + "tfc:metal/ingot/copper", + "tfc:metal/ingot/gold", + "tfc:metal/ingot/nickel", + "tfc:metal/ingot/silver", + "tfc:metal/ingot/tin", + "tfc:metal/ingot/zinc", + "tfc:metal/ingot/cast_iron", + + // Double Ingots + "tfc:metal/double_ingot/cast_iron", + + // Sheets + "tfc:metal/sheet/bismuth", + "tfc:metal/sheet/bismuth_bronze", + "tfc:metal/sheet/black_bronze", + "tfc:metal/sheet/bronze", + "tfc:metal/sheet/rose_gold", + "tfc:metal/sheet/sterling_silver", + "tfc:metal/sheet/wrought_iron", + "tfc:metal/sheet/cast_iron", + "tfc:metal/sheet/steel", + "tfc:metal/sheet/black_steel", + "tfc:metal/sheet/red_steel", + "tfc:metal/sheet/blue_steel", + "tfc:metal/sheet/brass", + "tfc:metal/sheet/copper", + "tfc:metal/sheet/gold", + "tfc:metal/sheet/nickel", + "tfc:metal/sheet/silver", + "tfc:metal/sheet/tin", + "tfc:metal/sheet/zinc", + "tfc:metal/sheet/cast_iron", + + // Double Sheets + "tfc:metal/double_sheet/bismuth", + "tfc:metal/double_sheet/bismuth_bronze", + "tfc:metal/double_sheet/black_bronze", + "tfc:metal/double_sheet/bronze", + "tfc:metal/double_sheet/rose_gold", + "tfc:metal/double_sheet/sterling_silver", + "tfc:metal/double_sheet/wrought_iron", + "tfc:metal/double_sheet/cast_iron", + "tfc:metal/double_sheet/steel", + "tfc:metal/double_sheet/black_steel", + "tfc:metal/double_sheet/red_steel", + "tfc:metal/double_sheet/blue_steel", + "tfc:metal/double_sheet/brass", + "tfc:metal/double_sheet/copper", + "tfc:metal/double_sheet/gold", + "tfc:metal/double_sheet/nickel", + "tfc:metal/double_sheet/silver", + "tfc:metal/double_sheet/tin", + "tfc:metal/double_sheet/zinc", + "tfc:metal/double_sheet/cast_iron", + + // Rods + "tfc:metal/rod/bismuth", + "tfc:metal/rod/bismuth_bronze", + "tfc:metal/rod/black_bronze", + "tfc:metal/rod/bronze", + "tfc:metal/rod/rose_gold", + "tfc:metal/rod/sterling_silver", + "tfc:metal/rod/wrought_iron", + "tfc:metal/rod/cast_iron", + "tfc:metal/rod/steel", + "tfc:metal/rod/black_steel", + "tfc:metal/rod/red_steel", + "tfc:metal/rod/blue_steel", + "tfc:metal/rod/brass", + "tfc:metal/rod/copper", + "tfc:metal/rod/gold", + "tfc:metal/rod/nickel", + "tfc:metal/rod/silver", + "tfc:metal/rod/tin", + "tfc:metal/rod/zinc", + "tfc:metal/rod/cast_iron", + + // Tool Heads + // Copper + 'tfc:metal/pickaxe/copper', + 'tfc:metal/pickaxe_head/copper', + 'tfc:metal/axe/copper', + 'tfc:metal/axe_head/copper', + 'tfc:metal/shovel/copper', + 'tfc:metal/shovel_head/copper', + 'tfc:metal/hoe/copper', + 'tfc:metal/hoe_head/copper', + 'tfc:metal/hammer/copper', + 'tfc:metal/hammer_head/copper', + 'tfc:metal/saw/copper', + 'tfc:metal/saw_blade/copper', + 'tfc:metal/sword/copper', + 'tfc:metal/sword_blade/copper', + 'tfc:metal/knife/copper', + 'tfc:metal/knife_blade/copper', + 'tfc:metal/scythe/copper', + 'tfc:metal/scythe_blade/copper', + + // Bismuth Bronze + 'tfc:metal/pickaxe/bismuth_bronze', + 'tfc:metal/pickaxe_head/bismuth_bronze', + 'tfc:metal/axe/bismuth_bronze', + 'tfc:metal/axe_head/bismuth_bronze', + 'tfc:metal/shovel/bismuth_bronze', + 'tfc:metal/shovel_head/bismuth_bronze', + 'tfc:metal/hoe/bismuth_bronze', + 'tfc:metal/hoe_head/bismuth_bronze', + 'tfc:metal/hammer/bismuth_bronze', + 'tfc:metal/hammer_head/bismuth_bronze', + 'tfc:metal/saw/bismuth_bronze', + 'tfc:metal/saw_blade/bismuth_bronze', + 'tfc:metal/sword/bismuth_bronze', + 'tfc:metal/sword_blade/bismuth_bronze', + 'tfc:metal/knife/bismuth_bronze', + 'tfc:metal/knife_blade/bismuth_bronze', + 'tfc:metal/scythe/bismuth_bronze', + 'tfc:metal/scythe_blade/bismuth_bronze', + + // Bronze + 'tfc:metal/pickaxe/bronze', + 'tfc:metal/pickaxe_head/bronze', + 'tfc:metal/axe/bronze', + 'tfc:metal/axe_head/bronze', + 'tfc:metal/shovel/bronze', + 'tfc:metal/shovel_head/bronze', + 'tfc:metal/hoe/bronze', + 'tfc:metal/hoe_head/bronze', + 'tfc:metal/hammer/bronze', + 'tfc:metal/hammer_head/bronze', + 'tfc:metal/saw/bronze', + 'tfc:metal/saw_blade/bronze', + 'tfc:metal/sword/bronze', + 'tfc:metal/sword_blade/bronze', + 'tfc:metal/knife/bronze', + 'tfc:metal/knife_blade/bronze', + 'tfc:metal/scythe/bronze', + 'tfc:metal/scythe_blade/bronze', + + // Black Bronze + 'tfc:metal/pickaxe/black_bronze', + 'tfc:metal/pickaxe_head/black_bronze', + 'tfc:metal/axe/black_bronze', + 'tfc:metal/axe_head/black_bronze', + 'tfc:metal/shovel/black_bronze', + 'tfc:metal/shovel_head/black_bronze', + 'tfc:metal/hoe/black_bronze', + 'tfc:metal/hoe_head/black_bronze', + 'tfc:metal/hammer/black_bronze', + 'tfc:metal/hammer_head/black_bronze', + 'tfc:metal/saw/black_bronze', + 'tfc:metal/saw_blade/black_bronze', + 'tfc:metal/sword/black_bronze', + 'tfc:metal/sword_blade/black_bronze', + 'tfc:metal/knife/black_bronze', + 'tfc:metal/knife_blade/black_bronze', + 'tfc:metal/scythe/black_bronze', + 'tfc:metal/scythe_blade/black_bronze', + + // Wrought Iron + 'tfc:metal/pickaxe/wrought_iron', + 'tfc:metal/pickaxe_head/wrought_iron', + 'tfc:metal/axe/wrought_iron', + 'tfc:metal/axe_head/wrought_iron', + 'tfc:metal/shovel/wrought_iron', + 'tfc:metal/shovel_head/wrought_iron', + 'tfc:metal/hoe/wrought_iron', + 'tfc:metal/hoe_head/wrought_iron', + 'tfc:metal/hammer/wrought_iron', + 'tfc:metal/hammer_head/wrought_iron', + 'tfc:metal/saw/wrought_iron', + 'tfc:metal/saw_blade/wrought_iron', + 'tfc:metal/sword/wrought_iron', + 'tfc:metal/sword_blade/wrought_iron', + 'tfc:metal/knife/wrought_iron', + 'tfc:metal/knife_blade/wrought_iron', + 'tfc:metal/scythe/wrought_iron', + 'tfc:metal/scythe_blade/wrought_iron', + + // Steel + 'tfc:metal/pickaxe/steel', + 'tfc:metal/pickaxe_head/steel', + 'tfc:metal/axe/steel', + 'tfc:metal/axe_head/steel', + 'tfc:metal/shovel/steel', + 'tfc:metal/shovel_head/steel', + 'tfc:metal/hoe/steel', + 'tfc:metal/hoe_head/steel', + 'tfc:metal/hammer/steel', + 'tfc:metal/hammer_head/steel', + 'tfc:metal/saw/steel', + 'tfc:metal/saw_blade/steel', + 'tfc:metal/sword/steel', + 'tfc:metal/sword_blade/steel', + 'tfc:metal/knife/steel', + 'tfc:metal/knife_blade/steel', + 'tfc:metal/scythe/steel', + 'tfc:metal/scythe_blade/steel', + + // Black Steel + 'tfc:metal/pickaxe/black_steel', + 'tfc:metal/pickaxe_head/black_steel', + 'tfc:metal/axe/black_steel', + 'tfc:metal/axe_head/black_steel', + 'tfc:metal/shovel/black_steel', + 'tfc:metal/shovel_head/black_steel', + 'tfc:metal/hoe/black_steel', + 'tfc:metal/hoe_head/black_steel', + 'tfc:metal/hammer/black_steel', + 'tfc:metal/hammer_head/black_steel', + 'tfc:metal/saw/black_steel', + 'tfc:metal/saw_blade/black_steel', + 'tfc:metal/sword/black_steel', + 'tfc:metal/sword_blade/black_steel', + 'tfc:metal/knife/black_steel', + 'tfc:metal/knife_blade/black_steel', + 'tfc:metal/scythe/black_steel', + 'tfc:metal/scythe_blade/black_steel', + + // Red Steel + 'tfc:metal/pickaxe/red_steel', + 'tfc:metal/pickaxe_head/red_steel', + 'tfc:metal/axe/red_steel', + 'tfc:metal/axe_head/red_steel', + 'tfc:metal/shovel/red_steel', + 'tfc:metal/shovel_head/red_steel', + 'tfc:metal/hoe/red_steel', + 'tfc:metal/hoe_head/red_steel', + 'tfc:metal/hammer/red_steel', + 'tfc:metal/hammer_head/red_steel', + 'tfc:metal/saw/red_steel', + 'tfc:metal/saw_blade/red_steel', + 'tfc:metal/sword/red_steel', + 'tfc:metal/sword_blade/red_steel', + 'tfc:metal/knife/red_steel', + 'tfc:metal/knife_blade/red_steel', + 'tfc:metal/scythe/red_steel', + 'tfc:metal/scythe_blade/red_steel', + + // Blue Steel + 'tfc:metal/pickaxe/blue_steel', + 'tfc:metal/pickaxe_head/blue_steel', + 'tfc:metal/axe/blue_steel', + 'tfc:metal/axe_head/blue_steel', + 'tfc:metal/shovel/blue_steel', + 'tfc:metal/shovel_head/blue_steel', + 'tfc:metal/hoe/blue_steel', + 'tfc:metal/hoe_head/blue_steel', + 'tfc:metal/hammer/blue_steel', + 'tfc:metal/hammer_head/blue_steel', + 'tfc:metal/saw/blue_steel', + 'tfc:metal/saw_blade/blue_steel', + 'tfc:metal/sword/blue_steel', + 'tfc:metal/sword_blade/blue_steel', + 'tfc:metal/knife/blue_steel', + 'tfc:metal/knife_blade/blue_steel', + 'tfc:metal/scythe/blue_steel', + 'tfc:metal/scythe_blade/blue_steel', + + // Ores + 'tfc:ore/poor_native_copper', + 'tfc:ore/normal_native_copper', + 'tfc:ore/rich_native_copper', + 'tfc:ore/poor_native_gold', + 'tfc:ore/normal_native_gold', + 'tfc:ore/rich_native_gold', + 'tfc:ore/poor_hematite', + 'tfc:ore/normal_hematite', + 'tfc:ore/rich_hematite', + 'tfc:ore/rich_tetrahedrite', + 'tfc:ore/normal_tetrahedrite', + 'tfc:ore/poor_tetrahedrite', + 'tfc:ore/rich_sphalerite', + 'tfc:ore/normal_sphalerite', + 'tfc:ore/poor_sphalerite', + 'tfc:ore/rich_limonite', + 'tfc:ore/normal_limonite', + 'tfc:ore/poor_limonite', + 'tfc:ore/rich_magnetite', + 'tfc:ore/normal_magnetite', + 'tfc:ore/poor_magnetite', + 'tfc:ore/rich_malachite', + 'tfc:ore/normal_malachite', + 'tfc:ore/poor_malachite', + 'tfc:ore/rich_garnierite', + 'tfc:ore/normal_garnierite', + 'tfc:ore/poor_garnierite', + 'tfc:ore/rich_bismuthinite', + 'tfc:ore/normal_bismuthinite', + 'tfc:ore/poor_bismuthinite', + 'tfc:ore/rich_cassiterite', + 'tfc:ore/normal_cassiterite', + 'tfc:ore/poor_cassiterite', + 'tfc:ore/rich_native_silver', + 'tfc:ore/normal_native_silver', + 'tfc:ore/poor_native_silver', + + // Gems + 'tfc:gem/amethyst', + 'tfc:gem/diamond', + 'tfc:gem/lapis_lazuli', + 'tfc:gem/emerald', + 'tfc:gem/pyrite', + 'tfc:gem/opal', + 'tfc:gem/ruby', + 'tfc:gem/sapphire', + 'tfc:gem/topaz', + 'tfc:ore/amethyst', + 'tfc:ore/diamond', + 'tfc:ore/lapis_lazuli', + 'tfc:ore/emerald', + 'tfc:ore/pyrite', + 'tfc:ore/opal', + 'tfc:ore/ruby', + 'tfc:ore/sapphire', + 'tfc:ore/topaz', + + 'tfc:ore/graphite', + 'tfc:ore/sulfur', + 'tfc:ore/cinnabar', + 'tfc:ore/cryolite', + 'tfc:ore/saltpeter', + 'tfc:ore/borax', + 'tfc:ore/sylvite', + 'tfc:ore/bituminous_coal', + 'tfc:ore/lignite', + 'tfc:ore/halite', + + // Wood TFC Shit + "tfc:wood/axle/acacia", + "tfc:wood/bladed_axle/acacia", + "tfc:wood/encased_axle/acacia", + "tfc:wood/clutch/acacia", + "tfc:wood/gear_box/acacia", + "tfc:wood/axle/ash", + "tfc:wood/bladed_axle/ash", + "tfc:wood/encased_axle/ash", + "tfc:wood/clutch/ash", + "tfc:wood/gear_box/ash", + "tfc:wood/axle/aspen", + "tfc:wood/bladed_axle/aspen", + "tfc:wood/encased_axle/aspen", + "tfc:wood/clutch/aspen", + "tfc:wood/gear_box/aspen", + "tfc:wood/axle/birch", + "tfc:wood/bladed_axle/birch", + "tfc:wood/encased_axle/birch", + "tfc:wood/clutch/birch", + "tfc:wood/gear_box/birch", + "tfc:wood/axle/blackwood", + "tfc:wood/bladed_axle/blackwood", + "tfc:wood/encased_axle/blackwood", + "tfc:wood/clutch/blackwood", + "tfc:wood/gear_box/blackwood", + "tfc:wood/axle/chestnut", + "tfc:wood/bladed_axle/chestnut", + "tfc:wood/encased_axle/chestnut", + "tfc:wood/clutch/chestnut", + "tfc:wood/gear_box/chestnut", + "tfc:wood/axle/douglas_fir", + "tfc:wood/bladed_axle/douglas_fir", + "tfc:wood/encased_axle/douglas_fir", + "tfc:wood/clutch/douglas_fir", + "tfc:wood/gear_box/douglas_fir", + "tfc:wood/axle/hickory", + "tfc:wood/bladed_axle/hickory", + "tfc:wood/encased_axle/hickory", + "tfc:wood/clutch/hickory", + "tfc:wood/gear_box/hickory", + "tfc:wood/axle/kapok", + "tfc:wood/bladed_axle/kapok", + "tfc:wood/encased_axle/kapok", + "tfc:wood/clutch/kapok", + "tfc:wood/gear_box/kapok", + "tfc:wood/axle/magrove", + "tfc:wood/bladed_axle/magrove", + "tfc:wood/encased_axle/magrove", + "tfc:wood/clutch/magrove", + "tfc:wood/gear_box/magrove", + "tfc:wood/axle/maple", + "tfc:wood/bladed_axle/maple", + "tfc:wood/encased_axle/maple", + "tfc:wood/clutch/maple", + "tfc:wood/gear_box/maple", + "tfc:wood/axle/oak", + "tfc:wood/bladed_axle/oak", + "tfc:wood/encased_axle/oak", + "tfc:wood/clutch/oak", + "tfc:wood/gear_box/oak", + "tfc:wood/axle/palm", + "tfc:wood/bladed_axle/palm", + "tfc:wood/encased_axle/palm", + "tfc:wood/clutch/palm", + "tfc:wood/gear_box/palm", + "tfc:wood/axle/pine", + "tfc:wood/bladed_axle/pine", + "tfc:wood/encased_axle/pine", + "tfc:wood/clutch/pine", + "tfc:wood/gear_box/pine", + "tfc:wood/axle/rosewood", + "tfc:wood/bladed_axle/rosewood", + "tfc:wood/encased_axle/rosewood", + "tfc:wood/clutch/rosewood", + "tfc:wood/gear_box/rosewood", + "tfc:wood/axle/sequoia", + "tfc:wood/bladed_axle/sequoia", + "tfc:wood/encased_axle/sequoia", + "tfc:wood/clutch/sequoia", + "tfc:wood/gear_box/sequoia", + "tfc:wood/axle/spruce", + "tfc:wood/bladed_axle/spruce", + "tfc:wood/encased_axle/spruce", + "tfc:wood/clutch/spruce", + "tfc:wood/gear_box/spruce", + "tfc:wood/axle/sycamore", + "tfc:wood/bladed_axle/sycamore", + "tfc:wood/encased_axle/sycamore", + "tfc:wood/clutch/sycamore", + "tfc:wood/gear_box/sycamore", + "tfc:wood/axle/white_cedar", + "tfc:wood/bladed_axle/white_cedar", + "tfc:wood/encased_axle/white_cedar", + "tfc:wood/clutch/white_cedar", + "tfc:wood/gear_box/white_cedar", + "tfc:wood/axle/willow", + "tfc:wood/bladed_axle/willow", + "tfc:wood/encased_axle/willow", + "tfc:wood/clutch/willow", + "tfc:wood/gear_box/willow", + + // Water Wheels + 'tfc:wood/water_wheel/acacia', + 'tfc:wood/water_wheel/ash', + 'tfc:wood/water_wheel/aspen', + 'tfc:wood/water_wheel/birch', + 'tfc:wood/water_wheel/blackwood', + 'tfc:wood/water_wheel/chestnut', + 'tfc:wood/water_wheel/douglas_fir', + 'tfc:wood/water_wheel/hickory', + 'tfc:wood/water_wheel/kapok', + 'tfc:wood/water_wheel/mangrove', + 'tfc:wood/water_wheel/maple', + 'tfc:wood/water_wheel/oak', + 'tfc:wood/water_wheel/palm', + 'tfc:wood/water_wheel/pine', + 'tfc:wood/water_wheel/rosewood', + 'tfc:wood/water_wheel/sequoia', + 'tfc:wood/water_wheel/spruce', + 'tfc:wood/water_wheel/sycamore', + 'tfc:wood/water_wheel/white_cedar', + 'tfc:wood/water_wheel/willow', + + // Windmill Blades + "tfc:windmill_blade", + "tfc:orange_windmill_blade", + "tfc:magenta_windmill_blade", + "tfc:light_blue_windmill_blade", + "tfc:yellow_windmill_blade", + "tfc:lime_windmill_blade", + "tfc:pink_windmill_blade", + "tfc:gray_windmill_blade", + "tfc:light_gray_windmill_blade", + "tfc:cyan_windmill_blade", + "tfc:purple_windmill_blade", + "tfc:blue_windmill_blade", + "tfc:brown_windmill_blade", + "tfc:green_windmill_blade", + "tfc:red_windmill_blade", + "tfc:black_windmill_blade", + + // Other + "tfc:trip_hammer", +]; + /** * Хранит список всех имен типов камней в TFC. */ @@ -36,7 +591,7 @@ global.TFC_WOOD_TYPES = [ "douglas_fir", "hickory", "kapok", - "magrove", + "mangrove", "maple", "oak", // Есть в Minecraft "palm", @@ -797,416 +1352,6 @@ global.METAL_TO_SPECS = { } }; -/** - * Список хранит предметы, - * у которых должны быть удалены тэги и они должны быть скрыты в REI. - */ -global.TFC_DISABLED_ITEMS = [ - - // Blocks - 'tfc:metal/block/bismuth', - 'tfc:metal/block/bismuth_bronze', - 'tfc:metal/block/black_bronze', - 'tfc:metal/block/bronze', - 'tfc:metal/block/brass', - 'tfc:metal/block/copper', - 'tfc:metal/block/gold', - 'tfc:metal/block/nickel', - 'tfc:metal/block/rose_gold', - 'tfc:metal/block/silver', - 'tfc:metal/block/tin', - 'tfc:metal/block/zinc', - 'tfc:metal/block/sterling_silver', - 'tfc:metal/block/wrought_iron', - 'tfc:metal/block/cast_iron', - 'tfc:metal/block/steel', - 'tfc:metal/block/black_steel', - 'tfc:metal/block/blue_steel', - 'tfc:metal/block/red_steel', - - // Stairs - 'tfc:metal/block/bismuth_stairs', - 'tfc:metal/block/bismuth_bronze_stairs', - 'tfc:metal/block/black_bronze_stairs', - 'tfc:metal/block/bronze_stairs', - 'tfc:metal/block/brass_stairs', - 'tfc:metal/block/copper_stairs', - 'tfc:metal/block/gold_stairs', - 'tfc:metal/block/nickel_stairs', - 'tfc:metal/block/rose_gold_stairs', - 'tfc:metal/block/silver_stairs', - 'tfc:metal/block/tin_stairs', - 'tfc:metal/block/zinc_stairs', - 'tfc:metal/block/sterling_silver_stairs', - 'tfc:metal/block/wrought_iron_stairs', - 'tfc:metal/block/cast_iron_stairs', - 'tfc:metal/block/steel_stairs', - 'tfc:metal/block/black_steel_stairs', - 'tfc:metal/block/blue_steel_stairs', - 'tfc:metal/block/red_steel_stairs', - - // Slabs - 'tfc:metal/block/bismuth_slab', - 'tfc:metal/block/bismuth_bronze_slab', - 'tfc:metal/block/black_bronze_slab', - 'tfc:metal/block/bronze_slab', - 'tfc:metal/block/brass_slab', - 'tfc:metal/block/copper_slab', - 'tfc:metal/block/gold_slab', - 'tfc:metal/block/nickel_slab', - 'tfc:metal/block/rose_gold_slab', - 'tfc:metal/block/silver_slab', - 'tfc:metal/block/tin_slab', - 'tfc:metal/block/zinc_slab', - 'tfc:metal/block/sterling_silver_slab', - 'tfc:metal/block/wrought_iron_slab', - 'tfc:metal/block/cast_iron_slab', - 'tfc:metal/block/steel_slab', - 'tfc:metal/block/black_steel_slab', - 'tfc:metal/block/blue_steel_slab', - 'tfc:metal/block/red_steel_slab', - - // Ingots - "tfc:metal/ingot/bismuth", - "tfc:metal/ingot/bismuth_bronze", - "tfc:metal/ingot/black_bronze", - "tfc:metal/ingot/bronze", - "tfc:metal/ingot/rose_gold", - "tfc:metal/ingot/sterling_silver", - "tfc:metal/ingot/wrought_iron", - "tfc:metal/ingot/steel", - "tfc:metal/ingot/black_steel", - "tfc:metal/ingot/red_steel", - "tfc:metal/ingot/blue_steel", - "tfc:metal/ingot/brass", - "tfc:metal/ingot/copper", - "tfc:metal/ingot/gold", - "tfc:metal/ingot/nickel", - "tfc:metal/ingot/silver", - "tfc:metal/ingot/tin", - "tfc:metal/ingot/zinc", - "tfc:metal/ingot/cast_iron", - - // Double Ingots - "tfc:metal/double_ingot/cast_iron", - - // Sheets - "tfc:metal/sheet/bismuth", - "tfc:metal/sheet/bismuth_bronze", - "tfc:metal/sheet/black_bronze", - "tfc:metal/sheet/bronze", - "tfc:metal/sheet/rose_gold", - "tfc:metal/sheet/sterling_silver", - "tfc:metal/sheet/wrought_iron", - "tfc:metal/sheet/cast_iron", - "tfc:metal/sheet/steel", - "tfc:metal/sheet/black_steel", - "tfc:metal/sheet/red_steel", - "tfc:metal/sheet/blue_steel", - "tfc:metal/sheet/brass", - "tfc:metal/sheet/copper", - "tfc:metal/sheet/gold", - "tfc:metal/sheet/nickel", - "tfc:metal/sheet/silver", - "tfc:metal/sheet/tin", - "tfc:metal/sheet/zinc", - "tfc:metal/sheet/cast_iron", - - // Double Sheets - "tfc:metal/double_sheet/bismuth", - "tfc:metal/double_sheet/bismuth_bronze", - "tfc:metal/double_sheet/black_bronze", - "tfc:metal/double_sheet/bronze", - "tfc:metal/double_sheet/rose_gold", - "tfc:metal/double_sheet/sterling_silver", - "tfc:metal/double_sheet/wrought_iron", - "tfc:metal/double_sheet/cast_iron", - "tfc:metal/double_sheet/steel", - "tfc:metal/double_sheet/black_steel", - "tfc:metal/double_sheet/red_steel", - "tfc:metal/double_sheet/blue_steel", - "tfc:metal/double_sheet/brass", - "tfc:metal/double_sheet/copper", - "tfc:metal/double_sheet/gold", - "tfc:metal/double_sheet/nickel", - "tfc:metal/double_sheet/silver", - "tfc:metal/double_sheet/tin", - "tfc:metal/double_sheet/zinc", - "tfc:metal/double_sheet/cast_iron", - - // Rods - "tfc:metal/rod/bismuth", - "tfc:metal/rod/bismuth_bronze", - "tfc:metal/rod/black_bronze", - "tfc:metal/rod/bronze", - "tfc:metal/rod/rose_gold", - "tfc:metal/rod/sterling_silver", - "tfc:metal/rod/wrought_iron", - "tfc:metal/rod/cast_iron", - "tfc:metal/rod/steel", - "tfc:metal/rod/black_steel", - "tfc:metal/rod/red_steel", - "tfc:metal/rod/blue_steel", - "tfc:metal/rod/brass", - "tfc:metal/rod/copper", - "tfc:metal/rod/gold", - "tfc:metal/rod/nickel", - "tfc:metal/rod/silver", - "tfc:metal/rod/tin", - "tfc:metal/rod/zinc", - "tfc:metal/rod/cast_iron", - - // Tool Heads - // Copper - 'tfc:metal/pickaxe/copper', - 'tfc:metal/pickaxe_head/copper', - 'tfc:metal/axe/copper', - 'tfc:metal/axe_head/copper', - 'tfc:metal/shovel/copper', - 'tfc:metal/shovel_head/copper', - 'tfc:metal/hoe/copper', - 'tfc:metal/hoe_head/copper', - 'tfc:metal/hammer/copper', - 'tfc:metal/hammer_head/copper', - 'tfc:metal/saw/copper', - 'tfc:metal/saw_blade/copper', - 'tfc:metal/sword/copper', - 'tfc:metal/sword_blade/copper', - 'tfc:metal/knife/copper', - 'tfc:metal/knife_blade/copper', - 'tfc:metal/scythe/copper', - 'tfc:metal/scythe_blade/copper', - - // Bismuth Bronze - 'tfc:metal/pickaxe/bismuth_bronze', - 'tfc:metal/pickaxe_head/bismuth_bronze', - 'tfc:metal/axe/bismuth_bronze', - 'tfc:metal/axe_head/bismuth_bronze', - 'tfc:metal/shovel/bismuth_bronze', - 'tfc:metal/shovel_head/bismuth_bronze', - 'tfc:metal/hoe/bismuth_bronze', - 'tfc:metal/hoe_head/bismuth_bronze', - 'tfc:metal/hammer/bismuth_bronze', - 'tfc:metal/hammer_head/bismuth_bronze', - 'tfc:metal/saw/bismuth_bronze', - 'tfc:metal/saw_blade/bismuth_bronze', - 'tfc:metal/sword/bismuth_bronze', - 'tfc:metal/sword_blade/bismuth_bronze', - 'tfc:metal/knife/bismuth_bronze', - 'tfc:metal/knife_blade/bismuth_bronze', - 'tfc:metal/scythe/bismuth_bronze', - 'tfc:metal/scythe_blade/bismuth_bronze', - - // Bronze - 'tfc:metal/pickaxe/bronze', - 'tfc:metal/pickaxe_head/bronze', - 'tfc:metal/axe/bronze', - 'tfc:metal/axe_head/bronze', - 'tfc:metal/shovel/bronze', - 'tfc:metal/shovel_head/bronze', - 'tfc:metal/hoe/bronze', - 'tfc:metal/hoe_head/bronze', - 'tfc:metal/hammer/bronze', - 'tfc:metal/hammer_head/bronze', - 'tfc:metal/saw/bronze', - 'tfc:metal/saw_blade/bronze', - 'tfc:metal/sword/bronze', - 'tfc:metal/sword_blade/bronze', - 'tfc:metal/knife/bronze', - 'tfc:metal/knife_blade/bronze', - 'tfc:metal/scythe/bronze', - 'tfc:metal/scythe_blade/bronze', - - // Black Bronze - 'tfc:metal/pickaxe/black_bronze', - 'tfc:metal/pickaxe_head/black_bronze', - 'tfc:metal/axe/black_bronze', - 'tfc:metal/axe_head/black_bronze', - 'tfc:metal/shovel/black_bronze', - 'tfc:metal/shovel_head/black_bronze', - 'tfc:metal/hoe/black_bronze', - 'tfc:metal/hoe_head/black_bronze', - 'tfc:metal/hammer/black_bronze', - 'tfc:metal/hammer_head/black_bronze', - 'tfc:metal/saw/black_bronze', - 'tfc:metal/saw_blade/black_bronze', - 'tfc:metal/sword/black_bronze', - 'tfc:metal/sword_blade/black_bronze', - 'tfc:metal/knife/black_bronze', - 'tfc:metal/knife_blade/black_bronze', - 'tfc:metal/scythe/black_bronze', - 'tfc:metal/scythe_blade/black_bronze', - - // Wrought Iron - 'tfc:metal/pickaxe/wrought_iron', - 'tfc:metal/pickaxe_head/wrought_iron', - 'tfc:metal/axe/wrought_iron', - 'tfc:metal/axe_head/wrought_iron', - 'tfc:metal/shovel/wrought_iron', - 'tfc:metal/shovel_head/wrought_iron', - 'tfc:metal/hoe/wrought_iron', - 'tfc:metal/hoe_head/wrought_iron', - 'tfc:metal/hammer/wrought_iron', - 'tfc:metal/hammer_head/wrought_iron', - 'tfc:metal/saw/wrought_iron', - 'tfc:metal/saw_blade/wrought_iron', - 'tfc:metal/sword/wrought_iron', - 'tfc:metal/sword_blade/wrought_iron', - 'tfc:metal/knife/wrought_iron', - 'tfc:metal/knife_blade/wrought_iron', - 'tfc:metal/scythe/wrought_iron', - 'tfc:metal/scythe_blade/wrought_iron', - - // Steel - 'tfc:metal/pickaxe/steel', - 'tfc:metal/pickaxe_head/steel', - 'tfc:metal/axe/steel', - 'tfc:metal/axe_head/steel', - 'tfc:metal/shovel/steel', - 'tfc:metal/shovel_head/steel', - 'tfc:metal/hoe/steel', - 'tfc:metal/hoe_head/steel', - 'tfc:metal/hammer/steel', - 'tfc:metal/hammer_head/steel', - 'tfc:metal/saw/steel', - 'tfc:metal/saw_blade/steel', - 'tfc:metal/sword/steel', - 'tfc:metal/sword_blade/steel', - 'tfc:metal/knife/steel', - 'tfc:metal/knife_blade/steel', - 'tfc:metal/scythe/steel', - 'tfc:metal/scythe_blade/steel', - - // Black Steel - 'tfc:metal/pickaxe/black_steel', - 'tfc:metal/pickaxe_head/black_steel', - 'tfc:metal/axe/black_steel', - 'tfc:metal/axe_head/black_steel', - 'tfc:metal/shovel/black_steel', - 'tfc:metal/shovel_head/black_steel', - 'tfc:metal/hoe/black_steel', - 'tfc:metal/hoe_head/black_steel', - 'tfc:metal/hammer/black_steel', - 'tfc:metal/hammer_head/black_steel', - 'tfc:metal/saw/black_steel', - 'tfc:metal/saw_blade/black_steel', - 'tfc:metal/sword/black_steel', - 'tfc:metal/sword_blade/black_steel', - 'tfc:metal/knife/black_steel', - 'tfc:metal/knife_blade/black_steel', - 'tfc:metal/scythe/black_steel', - 'tfc:metal/scythe_blade/black_steel', - - // Red Steel - 'tfc:metal/pickaxe/red_steel', - 'tfc:metal/pickaxe_head/red_steel', - 'tfc:metal/axe/red_steel', - 'tfc:metal/axe_head/red_steel', - 'tfc:metal/shovel/red_steel', - 'tfc:metal/shovel_head/red_steel', - 'tfc:metal/hoe/red_steel', - 'tfc:metal/hoe_head/red_steel', - 'tfc:metal/hammer/red_steel', - 'tfc:metal/hammer_head/red_steel', - 'tfc:metal/saw/red_steel', - 'tfc:metal/saw_blade/red_steel', - 'tfc:metal/sword/red_steel', - 'tfc:metal/sword_blade/red_steel', - 'tfc:metal/knife/red_steel', - 'tfc:metal/knife_blade/red_steel', - 'tfc:metal/scythe/red_steel', - 'tfc:metal/scythe_blade/red_steel', - - // Blue Steel - 'tfc:metal/pickaxe/blue_steel', - 'tfc:metal/pickaxe_head/blue_steel', - 'tfc:metal/axe/blue_steel', - 'tfc:metal/axe_head/blue_steel', - 'tfc:metal/shovel/blue_steel', - 'tfc:metal/shovel_head/blue_steel', - 'tfc:metal/hoe/blue_steel', - 'tfc:metal/hoe_head/blue_steel', - 'tfc:metal/hammer/blue_steel', - 'tfc:metal/hammer_head/blue_steel', - 'tfc:metal/saw/blue_steel', - 'tfc:metal/saw_blade/blue_steel', - 'tfc:metal/sword/blue_steel', - 'tfc:metal/sword_blade/blue_steel', - 'tfc:metal/knife/blue_steel', - 'tfc:metal/knife_blade/blue_steel', - 'tfc:metal/scythe/blue_steel', - 'tfc:metal/scythe_blade/blue_steel', - - // Ores - 'tfc:ore/poor_native_copper', - 'tfc:ore/normal_native_copper', - 'tfc:ore/rich_native_copper', - 'tfc:ore/poor_native_gold', - 'tfc:ore/normal_native_gold', - 'tfc:ore/rich_native_gold', - 'tfc:ore/poor_hematite', - 'tfc:ore/normal_hematite', - 'tfc:ore/rich_hematite', - 'tfc:ore/rich_tetrahedrite', - 'tfc:ore/normal_tetrahedrite', - 'tfc:ore/poor_tetrahedrite', - 'tfc:ore/rich_sphalerite', - 'tfc:ore/normal_sphalerite', - 'tfc:ore/poor_sphalerite', - 'tfc:ore/rich_limonite', - 'tfc:ore/normal_limonite', - 'tfc:ore/poor_limonite', - 'tfc:ore/rich_magnetite', - 'tfc:ore/normal_magnetite', - 'tfc:ore/poor_magnetite', - 'tfc:ore/rich_malachite', - 'tfc:ore/normal_malachite', - 'tfc:ore/poor_malachite', - 'tfc:ore/rich_garnierite', - 'tfc:ore/normal_garnierite', - 'tfc:ore/poor_garnierite', - 'tfc:ore/rich_bismuthinite', - 'tfc:ore/normal_bismuthinite', - 'tfc:ore/poor_bismuthinite', - 'tfc:ore/rich_cassiterite', - 'tfc:ore/normal_cassiterite', - 'tfc:ore/poor_cassiterite', - 'tfc:ore/rich_native_silver', - 'tfc:ore/normal_native_silver', - 'tfc:ore/poor_native_silver', - - // Gems - 'tfc:gem/amethyst', - 'tfc:gem/diamond', - 'tfc:gem/lapis_lazuli', - 'tfc:gem/emerald', - 'tfc:gem/pyrite', - 'tfc:gem/opal', - 'tfc:gem/ruby', - 'tfc:gem/sapphire', - 'tfc:gem/topaz', - 'tfc:ore/amethyst', - 'tfc:ore/diamond', - 'tfc:ore/lapis_lazuli', - 'tfc:ore/emerald', - 'tfc:ore/pyrite', - 'tfc:ore/opal', - 'tfc:ore/ruby', - 'tfc:ore/sapphire', - 'tfc:ore/topaz', - - 'tfc:ore/graphite', - 'tfc:ore/sulfur', - 'tfc:ore/cinnabar', - 'tfc:ore/cryolite', - 'tfc:ore/saltpeter', - 'tfc:ore/borax', - 'tfc:ore/sylvite', - 'tfc:ore/bituminous_coal', - 'tfc:ore/lignite', - 'tfc:ore/halite', -]; - global.TFC_SIMPLE_MATERIALS = [ "gypsum", "cinnabar",