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

some fixes

Browse Source
This commit is contained in:
Dmitry
2024-10-26 22:32:28 +07:00
parent e2e6cee43e
commit 3c8bf025df
7 changed files with 158 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

195
config/ftbquests/quests/chapters/primitive_age.snbt
View File

@@ -1732,8 +1732,9 @@
hide_dependency_lines: true
id: "3029097F88B8AABF"
size: 1.5d
subtitle: "Broke ore using Hammer (Not Mining Hammer)"
tasks: [{
id: "37D21B5266C73385"
id: "0F58D0E86DAC23CD"
item: "gtceu:crushed_graphite_ore"
type: "item"
}]
@@ -2229,12 +2230,12 @@
hide_dependency_lines: true
id: "73BF0075860E666B"
tasks: [{
id: "54334DA4AC22438E"
id: "0B0CF81DC4968709"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:poor_raw_chalcopyrite)item(gtceu:raw_chalcopyrite)item(gtceu:rich_raw_chalcopyrite)item(tfc:ore/small_tetrahedrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:raw_tetrahedrite)item(gtceu:rich_raw_tetrahedrite)item(tfc:ore/small_malachite)item(gtceu:poor_raw_malachite)item(gtceu:raw_malachite)item(gtceu:rich_raw_malachite)item(tfc:ore/small_native_copper)item(gtceu:poor_raw_copper)item(minecraft:raw_copper)item(gtceu:rich_raw_copper))"
"ftbfiltersystem:filter": "or(item(gtceu:tiny_copper_dust)item(gtceu:tiny_chalcopyrite_dust)item(gtceu:tiny_tetrahedrite_dust)item(gtceu:tiny_malachite_dust)item(minecraft:raw_copper)item(gtceu:raw_chalcopyrite)item(gtceu:raw_tetrahedrite)item(gtceu:raw_malachite)item(gtceu:rich_raw_copper)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:rich_raw_malachite)item(gtceu:poor_raw_copper)item(gtceu:poor_raw_chalcopyrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_malachite)item(tfc:ore/small_native_copper)item(tfc:ore/small_malachite)item(tfc:ore/small_tetrahedrite))"
}
}
title: "Any Copper Ore"
@@ -2259,32 +2260,29 @@
id: "2DEEDED2F21E60B9"
tasks: [
{
id: "024533C5E4B89787"
id: "61FBFAD12DD6486F"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
display: {
Name: "{\"text\":\"any tin ore\"}"
}
"ftbfiltersystem:filter": "or(item(tfc:ore/small_cassiterite)item(gtceu:raw_tin)item(gtceu:raw_cassiterite)item(gtceu:raw_cassiterite_sand)item(gtceu:poor_raw_tin)item(gtceu:poor_raw_cassiterite)item(gtceu:poor_raw_cassiterite_sand)item(gtceu:rich_raw_tin)item(gtceu:rich_raw_cassiterite)item(gtceu:rich_raw_cassiterite_sand))"
}
}
title: "Any Tin Ore"
type: "item"
}
{
id: "26C207A03F30FB27"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:poor_raw_chalcopyrite)item(gtceu:raw_chalcopyrite)item(gtceu:rich_raw_chalcopyrite)item(tfc:ore/small_tetrahedrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:raw_tetrahedrite)item(gtceu:rich_raw_tetrahedrite)item(tfc:ore/small_malachite)item(gtceu:poor_raw_malachite)item(gtceu:raw_malachite)item(gtceu:rich_raw_malachite)item(tfc:ore/small_native_copper)item(gtceu:poor_raw_copper)item(minecraft:raw_copper)item(gtceu:rich_raw_copper))"
"ftbfiltersystem:filter": "or(item(gtceu:tiny_copper_dust)item(gtceu:tiny_chalcopyrite_dust)item(gtceu:tiny_tetrahedrite_dust)item(gtceu:tiny_malachite_dust)item(minecraft:raw_copper)item(gtceu:raw_chalcopyrite)item(gtceu:raw_tetrahedrite)item(gtceu:raw_malachite)item(gtceu:rich_raw_copper)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:rich_raw_malachite)item(gtceu:poor_raw_copper)item(gtceu:poor_raw_chalcopyrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_malachite)item(tfc:ore/small_native_copper)item(tfc:ore/small_malachite)item(tfc:ore/small_tetrahedrite))"
}
}
title: "Any Copper Ore"
type: "item"
}
{
id: "4A4A9E47E7251680"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfc:ore/small_cassiterite)item(gtceu:tiny_tin_dust)item(gtceu:tiny_cassiterite_sand_dust)item(gtceu:tiny_cassiterite_dust)item(gtceu:raw_tin)item(gtceu:raw_cassiterite)item(gtceu:raw_cassiterite_sand)item(gtceu:rich_raw_tin)item(gtceu:rich_raw_cassiterite)item(gtceu:rich_raw_cassiterite_sand)item(gtceu:poor_raw_tin)item(gtceu:poor_raw_cassiterite)item(gtceu:poor_raw_cassiterite_sand))"
}
}
title: "Any Tin Ore"
type: "item"
}
]
title: "Resources for ordinary bronze"
x: 18.5d
@@ -2295,12 +2293,12 @@
hide_dependency_lines: true
id: "566FA805413004CF"
tasks: [{
id: "7E987D9B30125F52"
id: "74026020BB7FD0C8"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:rich_raw_hematite)item(gtceu:raw_hematite)item(tfc:ore/small_hematite)item(gtceu:poor_raw_hematite)item(gtceu:rich_raw_yellow_limonite)item(tfc:ore/small_limonite)item(gtceu:poor_raw_yellow_limonite)item(gtceu:raw_yellow_limonite)item(tfc:ore/small_magnetite)item(gtceu:poor_raw_magnetite)item(gtceu:raw_magnetite)item(gtceu:rich_raw_magnetite)item(gtceu:poor_raw_iron)item(minecraft:raw_iron)item(gtceu:rich_raw_iron)item(gtceu:poor_raw_goethite)item(gtceu:raw_goethite)item(gtceu:rich_raw_goethite)item(gtceu:poor_raw_pyrite)item(gtceu:raw_pyrite)item(gtceu:rich_raw_pyrite)item(gtceu:crushed_yellow_limonite_ore))"
"ftbfiltersystem:filter": "or(item(minecraft:raw_iron)item(tfc:ore/small_hematite)item(tfc:ore/small_magnetite)item(tfc:ore/small_limonite)item(gtceu:tiny_iron_dust)item(gtceu:tiny_hematite_dust)item(gtceu:tiny_goethite_dust)item(gtceu:tiny_magnetite_dust)item(gtceu:tiny_pyrite_dust)item(gtceu:tiny_yellow_limonite_dust)item(gtceu:raw_hematite)item(gtceu:raw_goethite)item(gtceu:raw_pyrite)item(gtceu:raw_yellow_limonite)item(gtceu:poor_raw_iron)item(gtceu:poor_raw_hematite)item(gtceu:poor_raw_goethite)item(gtceu:poor_raw_magnetite)item(gtceu:poor_raw_pyrite)item(gtceu:poor_raw_yellow_limonite)item(gtceu:rich_raw_iron)item(gtceu:rich_raw_hematite)item(gtceu:rich_raw_goethite)item(gtceu:rich_raw_magnetite)item(gtceu:rich_raw_pyrite)item(gtceu:rich_raw_yellow_limonite))"
}
}
title: "Any Iron Ore"
@@ -2396,47 +2394,41 @@
subtitle: "Cheap and shiny"
tasks: [
{
id: "7EBB6EC50EE8CFA1"
id: "72D482BA2D14A873"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
display: {
Name: "{\"text\":\"any bismuth ore\"}"
}
"ftbfiltersystem:filter": "or(item(tfc:ore/small_bismuthinite)item(gtceu:raw_bismuth)item(gtceu:poor_raw_bismuth)item(gtceu:rich_raw_bismuth))"
}
}
title: "Any Bismuth Ore"
type: "item"
}
{
id: "51BEF595B2A3014C"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
display: {
Name: "{\"text\":\"any sphalerite ore\"}"
}
"ftbfiltersystem:filter": "or(item(tfc:ore/small_sphalerite)item(gtceu:raw_sphalerite)item(gtceu:poor_raw_sphalerite)item(gtceu:rich_raw_sphalerite))"
}
}
title: "Any Sphalerite Ore"
type: "item"
}
{
id: "74F88351793C165A"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:poor_raw_chalcopyrite)item(gtceu:raw_chalcopyrite)item(gtceu:rich_raw_chalcopyrite)item(tfc:ore/small_tetrahedrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:raw_tetrahedrite)item(gtceu:rich_raw_tetrahedrite)item(tfc:ore/small_malachite)item(gtceu:poor_raw_malachite)item(gtceu:raw_malachite)item(gtceu:rich_raw_malachite)item(tfc:ore/small_native_copper)item(gtceu:poor_raw_copper)item(minecraft:raw_copper)item(gtceu:rich_raw_copper))"
"ftbfiltersystem:filter": "or(item(gtceu:tiny_copper_dust)item(gtceu:tiny_chalcopyrite_dust)item(gtceu:tiny_tetrahedrite_dust)item(gtceu:tiny_malachite_dust)item(minecraft:raw_copper)item(gtceu:raw_chalcopyrite)item(gtceu:raw_tetrahedrite)item(gtceu:raw_malachite)item(gtceu:rich_raw_copper)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:rich_raw_malachite)item(gtceu:poor_raw_copper)item(gtceu:poor_raw_chalcopyrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_malachite)item(tfc:ore/small_native_copper)item(tfc:ore/small_malachite)item(tfc:ore/small_tetrahedrite))"
}
}
title: "Any Copper Ore"
type: "item"
}
{
id: "7EE7D70C8B855FD4"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfc:ore/small_sphalerite)item(gtceu:tiny_zinc_dust)item(gtceu:tiny_sphalerite_dust)item(gtceu:raw_sphalerite)item(gtceu:poor_raw_sphalerite)item(gtceu:rich_raw_sphalerite))"
}
}
title: "Any Zinc Ore"
type: "item"
}
{
id: "0828B00285E5DBD8"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:tiny_bismuth_dust)item(tfc:ore/small_bismuthinite)item(gtceu:raw_bismuth)item(gtceu:rich_raw_bismuth)item(gtceu:poor_raw_bismuth))"
}
}
title: "Any Bismuth Ore"
type: "item"
}
]
title: "Resources for Bismuth bronze"
x: 18.5d
@@ -2459,39 +2451,36 @@
subtitle: "Expensive and black"
tasks: [
{
id: "1294B28A98775920"
id: "45C62339992715C9"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
display: {
Name: "{\"text\":\"any silver ore\"}"
}
"ftbfiltersystem:filter": "or(item(tfc:ore/small_native_silver)item(gtceu:poor_raw_silver)item(gtceu:rich_raw_silver)item(gtceu:raw_silver))"
}
}
title: "Any Silver Ore"
type: "item"
}
{
id: "53F7A77859F53B3D"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:poor_raw_chalcopyrite)item(gtceu:raw_chalcopyrite)item(gtceu:rich_raw_chalcopyrite)item(tfc:ore/small_tetrahedrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:raw_tetrahedrite)item(gtceu:rich_raw_tetrahedrite)item(tfc:ore/small_malachite)item(gtceu:poor_raw_malachite)item(gtceu:raw_malachite)item(gtceu:rich_raw_malachite)item(tfc:ore/small_native_copper)item(gtceu:poor_raw_copper)item(minecraft:raw_copper)item(gtceu:rich_raw_copper))"
"ftbfiltersystem:filter": "or(item(gtceu:tiny_copper_dust)item(gtceu:tiny_chalcopyrite_dust)item(gtceu:tiny_tetrahedrite_dust)item(gtceu:tiny_malachite_dust)item(minecraft:raw_copper)item(gtceu:raw_chalcopyrite)item(gtceu:raw_tetrahedrite)item(gtceu:raw_malachite)item(gtceu:rich_raw_copper)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:rich_raw_malachite)item(gtceu:poor_raw_copper)item(gtceu:poor_raw_chalcopyrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_malachite)item(tfc:ore/small_native_copper)item(tfc:ore/small_malachite)item(tfc:ore/small_tetrahedrite))"
}
}
title: "Any Copper Ore"
type: "item"
}
{
id: "755505207091F3E2"
id: "5461C4FA5EAD78F0"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(minecraft:raw_gold)item(gtceu:rich_raw_gold)item(gtceu:poor_raw_gold)item(tfc:ore/small_native_gold))"
"ftbfiltersystem:filter": "or(item(tfc:ore/small_native_silver)item(gtceu:tiny_silver_dust)item(gtceu:raw_silver)item(gtceu:rich_raw_silver)item(gtceu:poor_raw_silver))"
}
}
title: "Any Silver Ore"
type: "item"
}
{
id: "0DE4CC2BCDE489C0"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(minecraft:raw_gold)item(tfc:ore/small_native_gold)item(gtceu:poor_raw_gold)item(gtceu:rich_raw_gold)item(gtceu:tiny_gold_dust))"
}
}
title: "Any Gold Ore"
@@ -3022,6 +3011,7 @@
dependencies: ["0EB682B44D83D12A"]
hide_dependency_lines: true
id: "253860AD4DF4224C"
subtitle: "Broke ore using Hammer (Not Mining Hammer)"
tasks: [{
id: "6E70D453F693036D"
item: "gtceu:crushed_sulfur_ore"
@@ -3250,15 +3240,12 @@
type: "item"
}
{
id: "305EFF0F0ECD2E16"
id: "45979C3F7588F352"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
display: {
Name: "{\"text\":\"Any Nickel Ore\"}"
}
"ftbfiltersystem:filter": "or(item(gtceu:raw_nickel)item(gtceu:raw_garnierite)item(gtceu:raw_pentlandite)item(gtceu:rich_raw_nickel)item(gtceu:rich_raw_garnierite)item(gtceu:rich_raw_pentlandite)item(gtceu:poor_raw_nickel)item(gtceu:poor_raw_garnierite)item(gtceu:poor_raw_pentlandite))"
"ftbfiltersystem:filter": "or(item(gtceu:tiny_nickel_dust)item(gtceu:tiny_garnierite_dust)item(gtceu:raw_nickel)item(gtceu:raw_garnierite)item(tfc:ore/small_garnierite)item(gtceu:poor_raw_nickel)item(gtceu:poor_raw_garnierite)item(gtceu:rich_raw_nickel)item(gtceu:rich_raw_garnierite))"
}
}
title: "Any Nickel Ore"
@@ -3576,24 +3563,24 @@
id: "483D7FE6554FDC96"
tasks: [
{
id: "184806817B6D9921"
id: "7ED98EFD0C27E0FD"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfc:ore/small_native_gold)item(gtceu:poor_raw_gold)item(minecraft:raw_gold)item(gtceu:rich_raw_gold))"
"ftbfiltersystem:filter": "or(item(minecraft:raw_gold)item(tfc:ore/small_native_gold)item(gtceu:poor_raw_gold)item(gtceu:rich_raw_gold)item(gtceu:tiny_gold_dust))"
}
}
title: "Any Gold Ore"
type: "item"
}
{
id: "3101B42F9E34CDA1"
id: "2A88B5EB303D2265"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfc:ore/small_tetrahedrite)item(tfc:ore/small_malachite)item(gtceu:poor_raw_malachite)item(gtceu:raw_malachite)item(gtceu:rich_raw_malachite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:raw_tetrahedrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_chalcopyrite)item(gtceu:raw_chalcopyrite)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_copper)item(minecraft:raw_copper)item(gtceu:poor_raw_copper)item(tfc:ore/small_native_copper))"
"ftbfiltersystem:filter": "or(item(gtceu:tiny_copper_dust)item(gtceu:tiny_chalcopyrite_dust)item(gtceu:tiny_tetrahedrite_dust)item(gtceu:tiny_malachite_dust)item(minecraft:raw_copper)item(gtceu:raw_chalcopyrite)item(gtceu:raw_tetrahedrite)item(gtceu:raw_malachite)item(gtceu:rich_raw_copper)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:rich_raw_malachite)item(gtceu:poor_raw_copper)item(gtceu:poor_raw_chalcopyrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_malachite)item(tfc:ore/small_native_copper)item(tfc:ore/small_malachite)item(tfc:ore/small_tetrahedrite))"
}
}
title: "Any Copper Ore"
@@ -3620,27 +3607,24 @@
id: "758B2176634789F6"
tasks: [
{
id: "763128F1BD1FEB9B"
id: "10F5386F960AE8C8"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
display: {
Name: "{\"text\":\"any sphalerite ore\"}"
}
"ftbfiltersystem:filter": "or(item(tfc:ore/small_sphalerite)item(gtceu:raw_sphalerite)item(gtceu:poor_raw_sphalerite)item(gtceu:rich_raw_sphalerite))"
"ftbfiltersystem:filter": "or(item(tfc:ore/small_sphalerite)item(gtceu:tiny_zinc_dust)item(gtceu:tiny_sphalerite_dust)item(gtceu:raw_sphalerite)item(gtceu:poor_raw_sphalerite)item(gtceu:rich_raw_sphalerite))"
}
}
title: "Any Sphalerite Ore"
title: "Any Zinc Ore"
type: "item"
}
{
id: "34F5CDD35DDE2295"
id: "1F79B37BB871845A"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfc:ore/small_tetrahedrite)item(tfc:ore/small_malachite)item(gtceu:poor_raw_malachite)item(gtceu:raw_malachite)item(gtceu:rich_raw_malachite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:raw_tetrahedrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_chalcopyrite)item(gtceu:raw_chalcopyrite)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_copper)item(minecraft:raw_copper)item(gtceu:poor_raw_copper)item(tfc:ore/small_native_copper))"
"ftbfiltersystem:filter": "or(item(gtceu:tiny_copper_dust)item(gtceu:tiny_chalcopyrite_dust)item(gtceu:tiny_tetrahedrite_dust)item(gtceu:tiny_malachite_dust)item(minecraft:raw_copper)item(gtceu:raw_chalcopyrite)item(gtceu:raw_tetrahedrite)item(gtceu:raw_malachite)item(gtceu:rich_raw_copper)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:rich_raw_malachite)item(gtceu:poor_raw_copper)item(gtceu:poor_raw_chalcopyrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_malachite)item(tfc:ore/small_native_copper)item(tfc:ore/small_malachite)item(tfc:ore/small_tetrahedrite))"
}
}
title: "Any Copper Ore"
@@ -3667,32 +3651,29 @@
id: "0E0C589495AA31E8"
tasks: [
{
id: "3E9AC72D1AF2CE1A"
id: "27FEFEA3A46F09FD"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
display: {
Name: "{\"text\":\"any silver ore\"}"
}
"ftbfiltersystem:filter": "or(item(tfc:ore/small_native_silver)item(gtceu:poor_raw_silver)item(gtceu:rich_raw_silver)item(gtceu:raw_silver))"
}
}
title: "Any Silver Ore"
type: "item"
}
{
id: "4E12D679975AEE9A"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfc:ore/small_tetrahedrite)item(tfc:ore/small_malachite)item(gtceu:poor_raw_malachite)item(gtceu:raw_malachite)item(gtceu:rich_raw_malachite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:raw_tetrahedrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_chalcopyrite)item(gtceu:raw_chalcopyrite)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_copper)item(minecraft:raw_copper)item(gtceu:poor_raw_copper)item(tfc:ore/small_native_copper))"
"ftbfiltersystem:filter": "or(item(gtceu:tiny_copper_dust)item(gtceu:tiny_chalcopyrite_dust)item(gtceu:tiny_tetrahedrite_dust)item(gtceu:tiny_malachite_dust)item(minecraft:raw_copper)item(gtceu:raw_chalcopyrite)item(gtceu:raw_tetrahedrite)item(gtceu:raw_malachite)item(gtceu:rich_raw_copper)item(gtceu:rich_raw_chalcopyrite)item(gtceu:rich_raw_tetrahedrite)item(gtceu:rich_raw_malachite)item(gtceu:poor_raw_copper)item(gtceu:poor_raw_chalcopyrite)item(gtceu:poor_raw_tetrahedrite)item(gtceu:poor_raw_malachite)item(tfc:ore/small_native_copper)item(tfc:ore/small_malachite)item(tfc:ore/small_tetrahedrite))"
}
}
title: "Any Copper Ore"
type: "item"
}
{
id: "6897CE0365F602F1"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfc:ore/small_native_silver)item(gtceu:tiny_silver_dust)item(gtceu:raw_silver)item(gtceu:rich_raw_silver)item(gtceu:poor_raw_silver))"
}
}
title: "Any Silver Ore"
type: "item"
}
]
title: "Materials for Sterling Silver"
x: 30.5d

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

@@ -34,7 +34,7 @@
"quests.387DEEADF4922AB3.t": "Ore generation in the TFG world",
"quests.387DEEADF4922AB3.st": "Much more fun than vanilla",
"quests.387DEEADF4922AB3.d1": "In TerraFirmaGreg ore is generated more interestingly than anywhere else. \n1. Each ore appears in its own rock. TFC adds many different rocks to the world, that is, you won’t find a regular vanilla stone anywhere, so ores, like in real life, are generated only in certain rocks. \n2. There are several types of ore veins, such as: cluster, sphere, pipe and a few rare others that we will not talk about. \n3. To make life easier for players, ore indicators appear on the surface, under which in most cases the ore vein itself is located. \nTFG contains a small Wiki for this in an Excel spreadsheet. In order to follow the link, complete the task, then pick up the reward and a button will appear in the chat when you click on it, which will transfer you to an Excel table with ore generation.",
"quests.387DEEADF4922AB3.d1": "In TerraFirmaGreg ore is generated more interestingly than anywhere else. \n1. Each ore appears in its own rock. TFC adds many different rocks to the world, that is, you won’t find a regular vanilla stone anywhere, so ores, like in real life, are generated only in certain rocks. \n2. There are several types of ore veins, such as: cluster, sphere, pipe and a few rare others that we will not talk about. \n3. To make life easier for players, ore indicators appear on the surface, under which in most cases the ore vein itself is located. \nTo determine which rock a particular ore will spawn in, just open the explore EMI tabs, on one of them you will find the distribution of ores by dimensions and rocks.",
"quests.63E6C5684E12828C.st": "You need to drink water in order not to die, try to find a river or lake with ordinary water!",
"quests.63E6C5684E12828C.d1": "Use the right mouse button to drink some water. \nCareful! If you drink salt water you will experience increased thirst and will most likely die.",

2
kubejs/assets/tfg/lang/ru_ru.json
View File

@@ -34,7 +34,7 @@
"quests.387DEEADF4922AB3.t": "Генерация руд в мире TFG",
"quests.387DEEADF4922AB3.st": "Куда веселей чем в ванилле",
"quests.387DEEADF4922AB3.d1": "В TerraFirmaGreg руду генерируются интересней чем где либо. \n1. Каждая руда появляется в своей породе. TFC добавляет в мир много разных пород, то есть обычный камень из ваниллы вы нигде не встретите, поэтому руды как и в реальной жизни генерируются только в определенных породах. \n2. Существуют несколько типов рудных жил, такие как: кластер, сфера, труба и несколько редких других, о которых говорить не будем. \n3. Для облегчения жизни игрокам, на поверхности появляются рудные индикаторы, под которыми в большинстве случаев располагается сама жила с рудой. \nTFG содержит небольшое Wiki для этого в таблице Excel. Для того, чтобы перейти по ссылке, выполните задание, после заберите награду и в чате отобразится кнопка по нажатию на которую вас перебросит на таблицу Excel с генерацией руды.",
"quests.387DEEADF4922AB3.d1": "В TerraFirmaGreg руду генерируются интересней чем где либо. \n1. Каждая руда появляется в своей породе. TFC добавляет в мир много разных пород, то есть обычный камень из ваниллы вы нигде не встретите, поэтому руды как и в реальной жизни генерируются только в определенных породах. \n2. Существуют несколько типов рудных жил, такие как: кластер, сфера, труба и несколько редких других, о которых говорить не будем. \n3. Для облегчения жизни игрокам, на поверхности появляются рудные индикаторы, под которыми в большинстве случаев располагается сама жила с рудой. \nЧтобы определить в какой породе спавнится та или иная руда, просто откройте исследуйте вкладки EMI, на одной из них вы найдете распространение руд по измерениям и породам.",
"quests.63E6C5684E12828C.st": "Вам нужно пить воду, чтобы не умереть, постарайтсь найти реку или озеро с обычной водой!",
"quests.63E6C5684E12828C.d1": "Используйте правую кнопку мыши, чтобы выпить немного воды. \nОсторожно! Если вы выпьете соленой воды у вас появится эффект усиленной жажды и скорее всего вы умрете.",

53
kubejs/server_scripts/tfc/recipes.js
View File

@@ -308,12 +308,14 @@ const registerTFCRecipes = (e) => {
const processRichRawOre = (tagPrefix, tfcProperty, material, outputMaterial) => {
const oreItem = ChemicalHelper.get(tagPrefix, material, 1)
if (oreItem.isEmpty()) return
e.recipes.tfc.heating(oreItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), calcAmountOfMetal(48, tfcProperty.getPercentOfMaterial())))
.id(`tfg:heating/rich_raw/${material.getName()}`)
if (oreItem.isEmpty()) return
if (tfcProperty != null && outputMaterial != null) {
e.recipes.tfc.heating(oreItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), calcAmountOfMetal(48, tfcProperty.getPercentOfMaterial())))
.id(`tfg:heating/rich_raw/${material.getName()}`)
}
const crushedItem = ChemicalHelper.get(TagPrefix.crushed, material, 1)
if (crushedItem.isEmpty()) return
@@ -327,9 +329,11 @@ const registerTFCRecipes = (e) => {
const oreItem = ChemicalHelper.get(tagPrefix, material, 1)
if (oreItem.isEmpty()) return
e.recipes.tfc.heating(oreItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), calcAmountOfMetal(36, tfcProperty.getPercentOfMaterial())))
.id(`tfg:heating/raw/${material.getName()}`)
if (tfcProperty != null && outputMaterial != null) {
e.recipes.tfc.heating(oreItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), calcAmountOfMetal(36, tfcProperty.getPercentOfMaterial())))
.id(`tfg:heating/raw/${material.getName()}`)
}
const crushedItem = ChemicalHelper.get(TagPrefix.crushed, material, 1)
if (crushedItem.isEmpty()) return
@@ -343,10 +347,12 @@ const registerTFCRecipes = (e) => {
const processPoorRawOre = (tagPrefix, tfcProperty, material, outputMaterial) => {
const oreItem = ChemicalHelper.get(tagPrefix, material, 1)
if (oreItem.isEmpty()) return
e.recipes.tfc.heating(oreItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), calcAmountOfMetal(24, tfcProperty.getPercentOfMaterial())))
.id(`tfg:heating/poor_raw/${material.getName()}`)
if (tfcProperty != null && outputMaterial != null) {
e.recipes.tfc.heating(oreItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), calcAmountOfMetal(24, tfcProperty.getPercentOfMaterial())))
.id(`tfg:heating/poor_raw/${material.getName()}`)
}
const crushedItem = ChemicalHelper.get(TagPrefix.crushed, material, 1)
if (crushedItem.isEmpty()) return
@@ -1573,10 +1579,13 @@ const registerTFCRecipes = (e) => {
GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
const tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY)
const outputMaterial = (tfcProperty == null) ? material : (tfcProperty.getOutputMaterial() == null ? material : tfcProperty.getOutputMaterial())
processRichRawOre(TFGTagPrefix.richRawOre, tfcProperty, material, outputMaterial)
processNormalRawore(TagPrefix.rawOre, tfcProperty, material, outputMaterial)
processPoorRawOre(TFGTagPrefix.poorRawOre, tfcProperty, material, outputMaterial)
if (tfcProperty != null) {
const outputMaterial = (tfcProperty.getOutputMaterial() == null) ? material : tfcProperty.getOutputMaterial()
// 1. Префикс ассоциируемый с текущим предметом.
// 2. Проперти ТФК с нагревом металла и другими полезными проперти.
// 3. Материал из которого состоит объект.
@@ -1601,9 +1610,6 @@ const registerTFCRecipes = (e) => {
processCrushedOre(TagPrefix.crushed, tfcProperty, material, outputMaterial)
processCrushedPurifiedOre(TagPrefix.crushedPurified, tfcProperty, material, outputMaterial)
processCrushedRefinedOre(TagPrefix.crushedRefined, tfcProperty, material, outputMaterial)
processRichRawOre(TFGTagPrefix.richRawOre, tfcProperty, material, outputMaterial)
processNormalRawore(TagPrefix.rawOre, tfcProperty, material, outputMaterial)
processPoorRawOre(TFGTagPrefix.poorRawOre, tfcProperty, material, outputMaterial)
// 1. Тип инструмента
// 2. Префикс ассоциируемый с текущим предметом.
@@ -3395,7 +3401,7 @@ const registerTFCRecipes = (e) => {
.id('tfg:smelting/fireclay_brick')
// Выпаривание соли
e.recipes.tfc.pot([], Fluid.of('tfc:salt_water', 625), 300, 1000)
e.recipes.tfc.pot([], Fluid.of('tfc:salt_water', 1000), 300, 250)
.itemOutput('gtceu:small_salt_dust')
.id('tfg:tfc/pot/salt')
@@ -3634,6 +3640,16 @@ const registerTFCRecipes = (e) => {
//#endregion
//#region Каолинитовая глина
e.shapeless('tfc:kaolin_clay', [
'minecraft:clay_ball',
'gtceu:aluminium_dust',
['gtceu:fullers_earth_dust', 'gtceu:silicon_dust', 'gtceu:silicon_dioxide_dust'],
['minecraft:bone_meal', 'gtceu:calcium_dust'],
['tfg:shale_dust', 'tfg:claystone_dust', 'tfg:limestone_dust', 'tfg:conglomerate_dust', 'tfg:dolomite_dust', 'tfg:chert_dust', 'tfg:chalk_dust']
]).id('tfg:tfc/kaolinite_clay')
//#endregion
//#region Каолинитовая глина -> Порошок каолинита
e.recipes.createMilling('2x tfc:powder/kaolinite', 'tfc:kaolin_clay')
.id(`tfg:milling/tfc/kaolinite_powder`)
@@ -3644,6 +3660,7 @@ const registerTFCRecipes = (e) => {
.EUt(2).duration(40)
//#endregion
//Fire bricks
e.recipes.gtceu.compressor('fire_bricks')
.itemInputs()

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

@@ -313,7 +313,13 @@ const registerTFCBlockTags = (event) => {
event.add('tfc:glass_basin_blocks', 'tfc:white_kaolin_clay')
event.add('tfc:glass_pouring_table', 'tfc:white_kaolin_clay')
//#endregion
//#region Позволяем ТФК магме греть бойлер из Create
global.TFC_MAGMA_BLOCKS.forEach(el => {
event.add('create:passive_boiler_heaters', el)
})
//#endregion
//#region Удаление тегов и скрытие руд
const ALL_TFC_ORES = Ingredient.of(/tfc:ore\/[^*]+\/[^*]+/).itemIds

35
kubejs/startup_scripts/minecraft/constants.js
View File

@@ -535,23 +535,23 @@ global.MINECRAFT_DISABLED_ITEMS = [
//#endregion
//#region Шаблоны брони
'minecraft:wayfinder_armor_trim_smithing_template',
'minecraft:netherite_upgrade_smithing_template',
'minecraft:dune_armor_trim_smithing_template',
'minecraft:snout_armor_trim_smithing_template',
'minecraft:shaper_armor_trim_smithing_template',
'minecraft:coast_armor_trim_smithing_template',
'minecraft:vex_armor_trim_smithing_template',
'minecraft:host_armor_trim_smithing_template',
'minecraft:rib_armor_trim_smithing_template',
'minecraft:silence_armor_trim_smithing_template',
'minecraft:spire_armor_trim_smithing_template',
'minecraft:tide_armor_trim_smithing_template',
'minecraft:eye_armor_trim_smithing_template',
'minecraft:raiser_armor_trim_smithing_template',
'minecraft:wild_armor_trim_smithing_template',
'minecraft:sentry_armor_trim_smithing_template',
'minecraft:ward_armor_trim_smithing_template',
// 'minecraft:wayfinder_armor_trim_smithing_template',
// 'minecraft:netherite_upgrade_smithing_template',
// 'minecraft:dune_armor_trim_smithing_template',
// 'minecraft:snout_armor_trim_smithing_template',
// 'minecraft:shaper_armor_trim_smithing_template',
// 'minecraft:coast_armor_trim_smithing_template',
// 'minecraft:vex_armor_trim_smithing_template',
// 'minecraft:host_armor_trim_smithing_template',
// 'minecraft:rib_armor_trim_smithing_template',
// 'minecraft:silence_armor_trim_smithing_template',
// 'minecraft:spire_armor_trim_smithing_template',
// 'minecraft:tide_armor_trim_smithing_template',
// 'minecraft:eye_armor_trim_smithing_template',
// 'minecraft:raiser_armor_trim_smithing_template',
// 'minecraft:wild_armor_trim_smithing_template',
// 'minecraft:sentry_armor_trim_smithing_template',
// 'minecraft:ward_armor_trim_smithing_template',
//#endregion
//#region Свечи
@@ -748,7 +748,6 @@ global.MINECRAFT_DISABLED_ITEMS = [
'minecraft:shears',
'minecraft:lantern',
'minecraft:soul_lantern',
'minecraft:smithing_table',
'minecraft:smoker',
'minecraft:blast_furnace',
'minecraft:chiseled_bookshelf',

9
kubejs/startup_scripts/tfc/constants.js
View File

@@ -1247,3 +1247,12 @@ global.TFC_GREENHOUSE_BERRY_RECIPE_COMPONENTS = [
{ input: 'tfc:plant/cranberry_bush', fluid_amount: 6000, output: '3x tfc:food/cranberry', name: 'cranberry' },
];
global.TFC_MAGMA_BLOCKS = [
'tfc:rock/magma/granite',
'tfc:rock/magma/diorite',
'tfc:rock/magma/gabbro',
'tfc:rock/magma/rhyolite',
'tfc:rock/magma/basalt',
'tfc:rock/magma/andesite',
'tfc:rock/magma/dacite'
];