illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #182 from TerraFirmaGreg-Team/0.6.0

Browse source 
Обновление 0.6.0
This commit is contained in:
Dmitry 2024-01-14 18:38:55 +07:00 • committed by GitHub
commit 7f11d1bd7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 1704 additions and 2145 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -1,13 +1,17 @@
# Configs
config/jei/world/*
config/roughlyenoughitems/*
config/roughlyenoughitems/changelog.txt
config/roughlyenoughitems/hints.json
config/roughlyenoughitems/pinyin.properties
config/roughlyenoughitems/pinyin_double.properties
config/oculus.properties
config/smoothboot.json
config/fml.toml
config/forge-client.toml
config/chiselsandbits-client.toml
config/chiselsandbits-common.toml
config/xaerominimap_entities.json
# .minecraft
crash-reports/*

29
CHANGELOG.md
View file

@ -1,5 +1,34 @@
# Changelog
## [Unreleased]
### Изменения
- **ВАЖНОЕ ОБНОВЛЕНИЕ. В ИДЕАЛЕ СТОИТ ПЕРЕСОЗДАТЬ МИР И НАЧАТЬ ИГРАТЬ СНАЧАЛА. ЕСЛИ У ВАС КАКИЕ-ТО ОШИБКИ В СТАРЫХ МИРАХ, НЕ ПИШИТЕ МНЕ ПОЖАЛУЙСТА.**
- Добавлено множество рецептов для оголовий биты TFC (Допустим крафт и раскрафт через GTCEu машины).
- Добавлено множество рецептов для оголовий стамески TFC (Допустим крафт и раскрафт через GTCEu машины).
- Добавлено множество рецептов для оголовий кирки шахтера TFC (Допустим крафт и раскрафт через GTCEu машины).
- Добавлено множество рецептов для оголовий копья TFC (Допустим крафт и раскрафт через GTCEu машины).
- Перенастроена система металлов (снова и в последний раз), теперь cast_iron из TFC это ванильной железо. Да и вообщем мы изабвились от TFC слитков и другой херни.
- Добавлено множество рецептов раскрафта пылей, руд GTCEu в металл TFC.
- Добавлены новые 4 формы экструдера.
- Добавлены собственные двойные слитки.
- Исправлены рецепты оголовий из гемов в extruder.
- Исправлен баг, когда с руды в некоторых случаях выпадал предмет с пустым тегом.
- Исправлены рецепты дробления некоторых слитков в пустоту в машинах create.
- Исправлены рецепты с некоторыми пустыми инструментами.
- EMI заменен обратно на REI (вызывает дикие фризы при открытии меню квестов, не имеет возможности скрытий категорий и отображает неправильно некоторые исправленные рецепты). Поддержка JEI + EMI оставлена в коде, если вы замените REI на EMI + JEI скрытие предметов и другие некоторые функции продолжат работать.
- Расширены рецепты в Лазер Энгрейвере.
- Исправлен повышенный выход металла из бедной руды.
- Исправлена ситуация, когда нельзя было получить пыль графита на старте игры, теперь можно выкопать руду молотом и получить ее дробленный вариант, после, раздробить снова, промыть и раздробить, получив порошек.
- Добавлены двойные слитки для Оловянного сплава.
- Добавлен дроп, материала камня из руды.
- Исправлен баг, когда нельзя было расплавить предметы из оловянного сплава в тигле.
- Добавлены рецепты переработки пшеницы в солому + пшеничные зерна с шансом выхода.
- Исправлен конфликт рецептов земли и удобрения.
- В каолинитовые блоки теперь также как и в латунные можно отливать стекло.
- Исправлен рецепт кирпича для коксовой печи.
- Исправлены баги с инструментами (вроде бы), если у вас, что-то не работает, **ПОЖАЛУЙСТА СОЗДАЙТЕ НОВЫЙ МИР И ПРОТЕСТИРУЙТЕ В НОВОМ МИРЕ**.
- Возможно что-то еще, о чем забыл.
## [0.5.1] - 12.01.2024
### Изменения
- Исправлен квест на наковальни.

2
config/embeddium++.toml
View file

@ -37,7 +37,7 @@
#Toggles Minecraft Fonts shadows
#Depending of the case may increase performance
#Gives a flat style text
fontShadows = false
fontShadows = true
[embeddiumplus.performance.distanceCulling]

17
config/ftbquests/quests/chapters/primitive_age.snbt
View file

@ -2041,7 +2041,7 @@
ticks: 0L
}
}
id: "tfc:metal/double_ingot/copper"
id: "gtceu:copper_double_ingot"
}
type: "item"
}]
@ -2156,7 +2156,7 @@
ticks: 0L
}
}
id: "tfc:metal/double_ingot/wrought_iron"
id: "gtceu:wrought_iron_double_ingot"
}
type: "item"
}]
@ -2177,7 +2177,7 @@
ticks: 0L
}
}
id: "tfc:metal/double_ingot/steel"
id: "gtceu:steel_double_ingot"
}
type: "item"
}]
@ -2198,7 +2198,7 @@
ticks: 0L
}
}
id: "tfc:metal/double_ingot/black_steel"
id: "gtceu:black_steel_double_ingot"
}
type: "item"
}]
@ -2209,13 +2209,12 @@
dependencies: ["1FFE279F43B0BA45"]
id: "43C737BF10D3AC0E"
tasks: [{
count: 7L
id: "221753242C9F612A"
id: "06B99CF0B7120D13"
item: {
Count: 1b
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(tfc:metal/double_ingot/bismuth_bronze)item(tfc:metal/double_ingot/bronze)item(tfc:metal/double_ingot/black_bronze))"
"ftbfiltersystem:filter": "or(item(gtceu:bismuth_bronze_double_ingot)item(gtceu:bronze_double_ingot)item(gtceu:black_bronze_double_ingot))"
}
}
title: "Двойные слитки из любой бронзы"
@ -3395,7 +3394,7 @@
ticks: 0L
}
}
id: "tfc:metal/double_ingot/red_steel"
id: "gtceu:red_steel_double_ingot"
}
type: "item"
}]
@ -3416,7 +3415,7 @@
ticks: 0L
}
}
id: "tfc:metal/double_ingot/blue_steel"
id: "gtceu:blue_steel_double_ingot"
}
type: "item"
}]

170
config/roughlyenoughitems/config.json5 Normal file
View file

@ -0,0 +1,170 @@
{
"basics": {
"favorites": [],
"hiddenFavorites": [],
"displayHistory": [],
// Declares whether cheating mode is on.
"cheating": true,
"favoritesEnabled": true,
"keyBindings": {
"recipeKeybind": {
"keyCode": "key.keyboard.r",
"modifier": 0
},
"usageKeybind": {
"keyCode": "key.keyboard.u",
"modifier": 0
},
"hideKeybind": {
"keyCode": "key.keyboard.o",
"modifier": 2
},
"previousPageKeybind": {
"keyCode": "key.keyboard.unknown",
"modifier": 0
},
"nextPageKeybind": {
"keyCode": "key.keyboard.unknown",
"modifier": 0
},
"focusSearchFieldKeybind": {
"keyCode": "key.keyboard.unknown",
"modifier": 0
},
"copyRecipeIdentifierKeybind": {
"keyCode": "key.mouse.middle",
"modifier": 0
},
"favoriteKeybind": {
"keyCode": "key.keyboard.a",
"modifier": 0
},
"exportImageKeybind": {
"keyCode": "key.keyboard.f8",
"modifier": 0
},
"previousScreenKeybind": {
"keyCode": "key.keyboard.backspace",
"modifier": 0
}
},
// Declares whether REI is visible.
"overlayVisible": true,
"cheatingStyle": "GRAB",
"motion": {
"favoritesAnimation": true
}
},
"advanced": {
"filtering": {
"shouldFilterDisplays": true,
"filteringRules": [
"{id:\"roughlyenoughitems:manual\",rule:{}}",
"{id:\"roughlyenoughitems:basic\",rule:{}}",
"{id:\"roughlyenoughitems:hidden_from_recipe_viewers\",rule:{}}"
],
"filteringQuickCraftCategories": { },
"filteredStacks": []
},
"enableJeiCompatibilityLayer": true,
"tooltips": {
// Declares whether REI should append mod names to entries.
"appendModNames": true,
// Declares whether favorites tooltip should be displayed.
"displayFavoritesTooltip": false,
"displayIMEHints": true
},
"layout": {
// The ordering of the items on the entry panel.
"entryPanelOrdering": "REGISTRY_ASCENDING",
// Declares the maximum amount of recipes displayed in a page if possible.
"maxRecipesPerPage": 8,
// Declares the maximum amount of recipes displayed in a page if possible.
"maxRecipesPageHeight": 300,
// Declares whether entry rendering time should be debugged.
"debugRenderTimeRequired": false,
// Merges displays with equal contents under 1 display.
"mergeDisplayUnderOne": true,
"favoriteAddWidgetMode": "ALWAYS_VISIBLE"
},
"accessibility": {
"entrySize": 1.0,
// Declares the position of the entry panel.
"displayPanelLocation": "RIGHT",
// Declares how the scrollbar in composite screen should act.
"compositeScrollBarPermanent": false,
"toastDisplayedOnCopyIdentifier": true,
// Declares whether REI should use compact tabs for categories.
"useCompactTabs": true,
// Declares whether REI should use compact tab buttons for categories.
"useCompactTabButtons": false
},
"search": {
// Declares whether search time should be debugged.
"debugSearchTimeRequired": false,
// Declares whether REI should search async.
"asyncSearch": true,
// Declares how many entries should be grouped one async search.
"asyncSearchPartitionSize": 100,
"patchAsyncThreadCrash": true,
"tooltipSearch": "ALWAYS",
"tagSearch": "PREFIX",
"identifierSearch": "ALWAYS",
"modSearch": "PREFIX"
},
"commands": {
// Declares the command used to change gamemode.
"gamemodeCommand": "/gamemode {gamemode}",
// Declares the command used in servers to cheat items.
"giveCommand": "/give {player_name} {item_identifier}{nbt} {count}",
// Declares the command used to change weather.
"weatherCommand": "/weather {weather}",
// Declares the command used to change time.
"timeCommand": "/time set {time}"
},
"miscellaneous": {
// Declares whether arrows in containers should be clickable.
"clickableRecipeArrows": true,
"registerRecipesInAnotherThread": true,
"newFastEntryRendering": true,
"cachingFastEntryRendering": false,
"cachingDisplayLookup": true
}
},
"appearance": {
"recipeScreenType": "ORIGINAL",
// Declares the appearance of REI windows.
"theme": "DARK",
"layout": {
// Declares the position of the search field.
"searchFieldLocation": "BOTTOM_SIDE",
// Declares the position of the config button.
"configButtonLocation": "LOWER",
// Declares whether the craftable filter button is enabled.
"showCraftableOnlyButton": true
},
// Declares the appearance of recipe's border.
"recipeBorder": "DEFAULT",
// Declares whether entry panel is scrolled.
"scrollingEntryListWidget": false,
"horizontalEntriesBoundaries": 1.0,
"verticalEntriesBoundaries": 1.0,
"horizontalEntriesBoundariesColumns": 50,
"verticalEntriesBoundariesRows": 1000,
"favoritesHorizontalEntriesBoundaries": 1.0,
"favoritesHorizontalEntriesBoundariesColumns": 50,
"syntaxHighlightingMode": "COLORFUL",
"isFocusModeZoomed": false
},
"functionality": {
"inputMethod": null,
// Declares whether REI should remove the recipe book.
"disableRecipeBook": false,
// Declares whether mob effects should be on the left side instead of the right side.
"leftSideMobEffects": false,
// Declares whether subsets is enabled.
"isSubsetsEnabled": false,
"allowInventoryHighlighting": true,
"itemCheatingMode": "REI_LIKE"
}
}

191
config/xaerominimap_entities.json
View file

@ -1,191 +0,0 @@
{
"hardInclude": "anything",
"includeList": [],
"includeListInSuperCategory": true,
"excludeMode": "ONLY",
"excludeList": [
"minecraft:glow_item_frame",
"minecraft:item_frame"
],
"name": "gui.xaero_entity_category_root",
"protection": true,
"settingOverrides": {
"displayHeight": 0.0,
"displayed": true,
"heightBasedFade": true,
"renderOrder": 0.0,
"color": 13.0,
"displayNameWhenIconFails": true,
"entityNumber": 1000.0,
"alwaysDisplayNametags": false,
"startFadingAt": 0.0,
"dotSize": 2.0,
"renderOverMinimapFrame": 1.0,
"icons": 1.0,
"names": 0.0,
"heightLimit": 20.0,
"iconScale": 1.0
},
"subCategories": [
{
"hardInclude": "living",
"includeList": [],
"includeListInSuperCategory": true,
"excludeMode": "ONLY",
"excludeList": [
"minecraft:armor_stand"
],
"name": "gui.xaero_entity_category_living",
"protection": true,
"settingOverrides": {
"renderOrder": 2.0,
"color": 14.0
},
"subCategories": [
{
"hardInclude": "players",
"includeList": [],
"includeListInSuperCategory": true,
"excludeMode": "ONLY",
"excludeList": [],
"name": "gui.xaero_entity_category_players",
"protection": true,
"settingOverrides": {
"renderOrder": 6.0,
"heightLimit": 2050.0,
"color": 15.0
},
"subCategories": [
{
"hardInclude": "nothing",
"includeList": [],
"includeListInSuperCategory": true,
"excludeMode": "ONLY",
"excludeList": [],
"name": "gui.xaero_entity_category_friend",
"protection": true,
"settingOverrides": {},
"subCategories": []
},
{
"hardInclude": "tracked",
"includeList": [],
"includeListInSuperCategory": true,
"excludeMode": "ONLY",
"excludeList": [],
"name": "gui.xaero_entity_category_tracked",
"protection": true,
"settingOverrides": {
"icons": 2.0
},
"subCategories": []
},
{
"hardInclude": "same-team",
"includeList": [],
"includeListInSuperCategory": true,
"excludeMode": "ONLY",
"excludeList": [],
"name": "gui.xaero_entity_category_same_team",
"protection": true,
"settingOverrides": {},
"subCategories": []
},
{
"hardInclude": "anything",
"includeList": [],
"includeListInSuperCategory": true,
"excludeMode": "ONLY",
"excludeList": [],
"name": "gui.xaero_entity_category_other_teams",
"protection": true,
"settingOverrides": {
"renderOrder": 7.0
},
"subCategories": []
}
]
},
{
"hardInclude": "hostile",
"includeList": [],
"includeListInSuperCategory": true,
"excludeMode": "ONLY",
"excludeList": [],
"name": "gui.xaero_entity_category_hostile",
"protection": true,
"settingOverrides": {
"renderOrder": 3.0
},
"subCategories": [
{
"hardInclude": "tamed",
"includeList": [],
"includeListInSuperCategory": true,
"excludeMode": "ONLY",
"excludeList": [],
"name": "gui.xaero_entity_category_hostile_tamed",
"protection": true,
"settingOverrides": {
"renderOrder": 5.0
},
"subCategories": []
}
]
},
{
"hardInclude": "anything",
"includeList": [],
"includeListInSuperCategory": true,
"excludeMode": "ONLY",
"excludeList": [],
"name": "gui.xaero_entity_category_friendly",
"protection": true,
"settingOverrides": {},
"subCategories": [
{
"hardInclude": "tamed",
"includeList": [],
"includeListInSuperCategory": true,
"excludeMode": "ONLY",
"excludeList": [],
"name": "gui.xaero_entity_category_friendly_tamed",
"protection": true,
"settingOverrides": {
"renderOrder": 4.0
},
"subCategories": []
}
]
}
]
},
{
"hardInclude": "items",
"includeList": [],
"includeListInSuperCategory": true,
"excludeMode": "ONLY",
"excludeList": [],
"name": "gui.xaero_entity_category_items",
"protection": true,
"settingOverrides": {
"renderOrder": 1.0,
"color": 12.0
},
"subCategories": []
},
{
"hardInclude": "anything",
"includeList": [],
"includeListInSuperCategory": true,
"excludeMode": "ONLY",
"excludeList": [],
"name": "gui.xaero_entity_category_other_entities",
"protection": true,
"settingOverrides": {
"color": 5.0
},
"subCategories": []
}
]
}

73
kubejs/client_scripts/main_client_script.js
View file

@ -1,6 +1,40 @@
// priority: 1
JEIEvents.hideItems(event => {
if (Platform.isLoaded('jei')) {
JEIEvents.hideItems(event => {
hideItems(event)
})
JEIEvents.hideFluids(event => {
hideFluids(event)
})
JEIEvents.removeCategories(event => {
removeCategories(event) // Не работает с EMI + JEI
})
} else if (Platform.isLoaded('rei')) {
REIEvents.hide('items', event => {
hideItems(event)
})
REIEvents.hide('fluids', event => {
hideFluids(event)
})
REIEvents.removeCategories(event => {
removeCategories(event)
})
REIEvents.groupEntries(event => {
groupItems(event)
})
}
const hideItems = (event) => {
hideMinecraftStuff(event)
hideTFCStuff(event)
hideFirmaLifeStuff(event)
@ -14,32 +48,23 @@ JEIEvents.hideItems(event => {
hideCreateAdditionsStuff(event)
hideChiselAndBitsStuff(event)
hideFTBQuestsStuff(event)
})
}
// REIEvents.groupEntries(event => {
// groupGTCEUStuff(event)
// groupTFCStuff(event)
// })
JEIEvents.removeCategories(event => {
// НЕ РАБОТАЕТ СУКА, РАЗРАБ НАСРАЛ!
// registerMinecraftCategories(event)
// registerGTCEUCategories(event)
// registerMoreRedCategories(event)
// 'jumbofurnace:jumbo_furnace_upgrade,
// event.remove('minecraft:campfire_cooking')
// event.remove('jumbofurnace:jumbo_smelting')
// console.log(event.getCategoryIds())
// event.getCategoryIds()
})
JEIEvents.hideFluids(event => {
const hideFluids = (event) => {
hideTFCFluids(event)
hideFirmaLifeFluids(event)
hideCreateFluids(event)
hideCreateAdditionsFluids(event)
})
}
const removeCategories = (event) => {
registerMinecraftCategories(event)
registerGTCEUCategories(event)
registerMoreRedCategories(event)
}
const groupItems = (event) => {
groupGTCEUStuff(event)
groupTFCStuff(event)
}

10
kubejs/client_scripts/mods/tfc.js
View file

@ -42,4 +42,14 @@ const hideTFCFluids = (event) => {
event.hide('tfc:metal/black_steel')
event.hide('tfc:metal/red_steel')
event.hide('tfc:metal/blue_steel')
event.hide('tfc:metal/cast_iron')
event.hide('tfc:metal/pig_iron')
event.hide('tfc:metal/high_carbon_steel')
event.hide('tfc:metal/high_carbon_black_steel')
event.hide('tfc:metal/high_carbon_red_steel')
event.hide('tfc:metal/high_carbon_blue_steel')
event.hide('tfc:metal/weak_steel')
event.hide('tfc:metal/weak_red_steel')
event.hide('tfc:metal/weak_blue_steel')
event.hide('tfc:metal/unknown')
}

5
kubejs/server_scripts/firmaciv/recipes.js
View file

@ -3,10 +3,9 @@
const registerFirmaCivRecipes = (event) => {
event.remove({ id: '/firmaciv:quern/' })
event.remove({ id: 'firmaciv:anvil/copper_bolt' })
event.recipes.tfc.heating('firmaciv:oarlock', 1535)
.resultFluid(Fluid.of('tfc:metal/cast_iron', 288))
.id(`tfg:firmaciv/heating/oarlock`)
.resultFluid(Fluid.of('gtceu:iron', 288))
.id(`firmaciv:heating/oarlock`)
}

38
kubejs/server_scripts/gregtech/loot.js
View file

@ -5,13 +5,37 @@ const registerGTCEULoots = (event) => {
global.TFC_STONE_TYPES.forEach(stoneType => {
GTRegistries.MATERIALS.forEach(material => {
if (material.hasProperty(PropertyKey.ORE)) {
event.addBlockLootModifier(`gtceu:${stoneType}_${material}_ore`)
.removeLoot(Ingredient.all)
.addWeightedLoot([
Item.of(`#forge:rich_raw_materials/${material}`).withChance(0.2),
Item.of(`#forge:raw_materials/${material}`).withChance(0.6),
Item.of(`#forge:poor_raw_materials/${material}`).withChance(0.2)
]);
let stoneTypeMaterial = GTMaterials.get(stoneType)
let stoneTypeDust = null
if (!stoneTypeMaterial != null) stoneTypeDust = ChemicalHelper.get(TagPrefix.dust, stoneTypeMaterial, 1)
let richRawOre = ChemicalHelper.get(TFGTagPrefix.richRawOre, material, 1)
let normalRawOre = ChemicalHelper.get(TagPrefix.rawOre, material, 1)
let poorRawOre = ChemicalHelper.get(TFGTagPrefix.poorRawOre, material, 1).withChance(0.2)
let blockName = `gtceu:${stoneType}_${material}_ore`
if (!richRawOre.isEmpty() && !normalRawOre.isEmpty() && !poorRawOre.isEmpty()) {
event.addBlockLootModifier(blockName)
.matchMainHand('#minecraft:pickaxes')
.removeLoot(Ingredient.all)
.addWeightedLoot([
richRawOre.withChance(0.2),
normalRawOre.withChance(0.6),
poorRawOre.withChance(0.2)
]);
}
if (!stoneTypeDust.isEmpty()) {
event.addBlockLootModifier(blockName)
.matchMainHand('#minecraft:pickaxes')
.addLoot(
LootEntry.of(stoneTypeDust).when((c) => c.randomChance(0.25))
)
}
}
})
})

62
kubejs/server_scripts/gregtech/recipes.js
View file

@ -1,7 +1,5 @@
// priority: 0
const registerGTCEURecipes = (event) => {
//#region Выход: Удобрение
@ -13,6 +11,7 @@ const registerGTCEURecipes = (event) => {
'2x #forge:dusts/wood',
'4x #forge:sand'
)
.circuit(1)
.inputFluids(Fluid.of('minecraft:water', 1000))
.itemOutputs('4x gtceu:fertilizer')
.duration(300)
@ -25,6 +24,7 @@ const registerGTCEURecipes = (event) => {
'2x #forge:dusts/wood',
'4x #forge:sand'
)
.circuit(1)
.inputFluids(Fluid.of('minecraft:water', 1000))
.itemOutputs('4x gtceu:fertilizer')
.duration(300)
@ -1110,7 +1110,7 @@ const registerGTCEURecipes = (event) => {
A: 'minecraft:clay_ball',
B: '#minecraft:sand',
C: 'gtceu:brick_wooden_form'
}).replaceIngredient("gtceu:brick_wooden_form", Item.empty).id('gtceu:shaped/compressed_coke_clay')
}).replaceIngredient('gtceu:brick_wooden_form', 'gtceu:brick_wooden_form').id('gtceu:shaped/compressed_coke_clay')
// Compressed Coke Clay -> Coke Oven Brick
event.recipes.tfc.heating('gtceu:compressed_coke_clay', 1399)
@ -1267,29 +1267,17 @@ const registerGTCEURecipes = (event) => {
//#region Рецепты инструментов
if (material.hasFlag($TFGMaterialFlags.HAS_TFC_TOOL)) {
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
global.GTCEU_ANVIL_TOOL_TYPES.forEach(toolType => {
let toolStack = $ToolHelper.get(toolType, material)
if (toolType == GTToolType.BUTCHERY_KNIFE) {
event.recipes.tfc.advanced_shaped_crafting(TFC.itemStackProvider.of(toolStack).copyForgingBonus(), [
'A',
'B'
], {
A: `gtceu:${material}_knife_butchery_head`,
B: '#forge:rods/wooden'
}, 0, 0).id(`gtceu:shaped/${toolType.name}_${material}`)
}
else {
event.recipes.tfc.advanced_shaped_crafting(TFC.itemStackProvider.of(toolStack).copyForgingBonus(), [
'A',
'B'
], {
A: `gtceu:${material}_${toolType.name}_head`,
B: '#forge:rods/wooden'
}, 0, 0).id(`gtceu:shaped/${toolType.name}_${material}`)
}
event.recipes.tfc.advanced_shaped_crafting(TFC.itemStackProvider.of(toolStack).copyForgingBonus(), [
'A',
'B'
], {
A: `gtceu:${material}_${toolType.name}_head`,
B: '#forge:rods/wooden'
}, 0, 0).id(`gtceu:shaped/${toolType.name}_${material}`)
})
}
@ -1410,16 +1398,26 @@ const registerGTCEURecipes = (event) => {
}
}
if (material.hasProperty(PropertyKey.INGOT)) {
event.recipes.createCrushing(Item.of(`#forge:dusts/${material}`), `#forge:ingots/${material}`)
.processingTime(150)
.id(`tfg:crushing/${material}_dust`)
}
else {
event.recipes.createMilling(Item.of(`#forge:dusts/${material}`), `#forge:gems/${material}`)
.processingTime(150)
.id(`tfg:milling/${material}_dust`)
let ingotStack = ChemicalHelper.get(TagPrefix.ingot, material, 1)
let gemStack = ChemicalHelper.get(TagPrefix.gem, material, 1)
let dustStack = ChemicalHelper.get(TagPrefix.dust, material, 1)
if (!dustStack.isEmpty()) {
if (!ingotStack.isEmpty()) {
event.recipes.createCrushing(dustStack, ingotStack)
.processingTime(250)
.id(`tfg:crushing/${material}_dust`)
}
if (!gemStack.isEmpty()) {
event.recipes.createMilling(dustStack, gemStack)
.processingTime(200)
.id(`tfg:milling/${material}_dust`)
}
}
});
//#endregion

1
kubejs/server_scripts/main_server_script.js
View file

@ -1,7 +1,6 @@
// priority: 1
const $MaterialFlags = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags')
const $TFGMaterialFlags = Java.loadClass('su.terrafirmagreg.core.compat.gtceu.TFGMaterialFlags')
const $ToolHelper = Java.loadClass('com.gregtechceu.gtceu.api.item.tool.ToolHelper')
/**

147
kubejs/server_scripts/tfc/data.js
View file

@ -8,9 +8,31 @@ const registerTFCDataForTFC = (event) => {
registerTFCFertilizers(event)
registerTFCKnappingTypes(event)
registerTFCItemSize(event)
registerTFCFoodData(event)
}
const registerTFCMetals = (event) => {
event.metal('gtceu:copper', 1080, 0.00857, '#forge:ingots/copper', '#forge:double_ingots/copper', '#forge:plates/copper', 1, 'tfc:copper')
event.metal('gtceu:bismuth_bronze', 985, 0.00857, '#forge:ingots/bismuth_bronze', '#forge:double_ingots/bismuth_bronze', '#forge:plates/bismuth_bronze', 2, 'tfc:bismuth_bronze')
event.metal('gtceu:bronze', 950, 0.00857, '#forge:ingots/bronze', '#forge:double_ingots/bronze', '#forge:plates/bronze', 2, 'tfc:bronze')
event.metal('gtceu:black_bronze', 1070, 0.00857, '#forge:ingots/black_bronze', '#forge:double_ingots/black_bronze', '#forge:plates/black_bronze', 2, 'tfc:black_bronze')
event.metal('gtceu:wrought_iron', 1535, 0.00857, '#forge:ingots/wrought_iron', '#forge:double_ingots/wrought_iron', '#forge:plates/wrought_iron', 3, 'tfc:wrought_iron')
event.metal('gtceu:steel', 1540, 0.00857, '#forge:ingots/steel', '#forge:double_ingots/steel', '#forge:plates/steel', 4, 'tfc:steel')
event.metal('gtceu:black_steel', 1485, 0.00857, '#forge:ingots/black_steel', '#forge:double_ingots/black_steel', '#forge:plates/black_steel', 5, 'tfc:black_steel')
event.metal('gtceu:blue_steel', 1540, 0.00857, '#forge:ingots/blue_steel', '#forge:double_ingots/blue_steel', '#forge:plates/blue_steel', 6, 'tfc:blue_steel')
event.metal('gtceu:red_steel', 1540, 0.00857, '#forge:ingots/red_steel', '#forge:double_ingots/red_steel', '#forge:plates/red_steel', 6, 'tfc:red_steel')
event.metal('gtceu:pig_iron', 1535, 0.00857, '#forge:ingots/pig_iron', null, null, 3, 'tfc:pig_iron')
event.metal('gtceu:high_carbon_steel', 1540, 0.00857, '#forge:ingots/high_carbon_steel', null, null, 3, 'tfc:high_carbon_steel')
event.metal('gtceu:high_carbon_black_steel', 1535, 0.00857, '#forge:ingots/high_carbon_black_steel', null, null, 4, 'tfc:high_carbon_black_steel')
event.metal('gtceu:high_carbon_red_steel', 1535, 0.00857, '#forge:ingots/high_carbon_red_steel', null, null, 5, 'tfc:high_carbon_red_steel')
event.metal('gtceu:high_carbon_blue_steel', 1535, 0.00857, '#forge:ingots/high_carbon_blue_steel', null, null, 5, 'tfc:high_carbon_blue_steel')
event.metal('gtceu:weak_steel', 1540, 0.00857, '#forge:ingots/weak_steel', null, null, 4, 'tfc:weak_steel')
event.metal('gtceu:weak_red_steel', 1540, 0.00857, '#forge:ingots/weak_red_steel', null, null, 5, 'tfc:weak_red_steel')
event.metal('gtceu:weak_blue_steel', 1540, 0.00857, '#forge:ingots/weak_blue_steel', null, null, 5, 'tfc:weak_blue_steel')
event.metal('gtceu:unknown', 400, 0.006, '#forge:ingots/unknown', null, null, 0, 'tfc:unknown')
event.metal('gtceu:iron', 1535, 0.00857, '#forge:ingots/iron', '#forge:double_ingots/iron', '#forge:plates/iron', 3, 'tfc:cast_iron')
event.metal('gtceu:tin', 230, 0.02143, '#forge:ingots/tin', '#forge:double_ingots/tin', '#forge:plates/tin', 1, 'tfc:tin')
event.metal('gtceu:bismuth', 270, 0.02143, '#forge:ingots/bismuth', '#forge:double_ingots/bismuth', '#forge:plates/bismuth', 1, 'tfc:bismuth')
event.metal('gtceu:zinc', 420, 0.01429, '#forge:ingots/zinc', '#forge:double_ingots/zinc', '#forge:plates/zinc', 1, 'tfc:zinc')
@ -18,77 +40,70 @@ const registerTFCMetals = (event) => {
event.metal('gtceu:rose_gold', 960, 0.00857, '#forge:ingots/rose_gold', '#forge:double_ingots/rose_gold', '#forge:plates/rose_gold', 1, 'tfc:rose_gold')
event.metal('gtceu:silver', 961, 0.00625, '#forge:ingots/silver', '#forge:double_ingots/silver', '#forge:plates/silver', 1, 'tfc:silver')
event.metal('gtceu:gold', 1060, 0.005, '#forge:ingots/gold', '#forge:double_ingots/gold', '#forge:plates/gold', 1, 'tfc:gold')
event.metal('gtceu:copper', 1080, 0.00857, '#forge:ingots/copper', '#forge:double_ingots/copper', '#forge:plates/copper', 1, 'tfc:copper')
event.metal('gtceu:nickel', 1453, 0.00625, '#forge:ingots/nickel', '#forge:double_ingots/nickel', '#forge:plates/nickel', 1, 'tfc:nickel')
event.metal('gtceu:brass', 930, 0.00857, '#forge:ingots/brass', '#forge:double_ingots/brass', '#forge:plates/brass', 2, 'tfc:brass')
event.metal('gtceu:bronze', 950, 0.00857, '#forge:ingots/bronze', '#forge:double_ingots/bronze', '#forge:plates/bronze', 2, 'tfc:bronze')
event.metal('gtceu:bismuth_bronze', 985, 0.00857, '#forge:ingots/bismuth_bronze', '#forge:double_ingots/bismuth_bronze', '#forge:plates/bismuth_bronze', 2, 'tfc:bismuth_bronze')
event.metal('gtceu:black_bronze', 1070, 0.00857, '#forge:ingots/black_bronze', '#forge:double_ingots/black_bronze', '#forge:plates/black_bronze', 2, 'tfc:black_bronze')
// event.metal('gtceu:iron', 1535, 0.00857, '#forge:ingots/iron', '#forge:double_ingots/iron', '#forge:plates/iron', 3, 'tfg:iron')
event.metal('gtceu:wrought_iron', 1535, 0.00857, '#forge:ingots/wrought_iron', '#forge:double_ingots/wrought_iron', '#forge:plates/wrought_iron', 3, 'tfc:wrought_iron')
event.metal('gtceu:steel', 1540, 0.00857, '#forge:ingots/steel', '#forge:double_ingots/steel', '#forge:plates/steel', 4, 'tfc:steel')
event.metal('gtceu:black_steel', 1485, 0.00857, '#forge:ingots/black_steel', '#forge:double_ingots/black_steel', '#forge:plates/black_steel', 5, 'tfc:black_steel')
event.metal('gtceu:blue_steel', 1540, 0.00857, '#forge:ingots/blue_steel', '#forge:double_ingots/blue_steel', '#forge:plates/blue_steel', 6, 'tfc:blue_steel')
event.metal('gtceu:red_steel', 1540, 0.00857, '#forge:ingots/red_steel', '#forge:double_ingots/red_steel', '#forge:plates/red_steel', 6, 'tfc:red_steel')
event.metal('gtceu:redstone', 460, 0.01729, null, null, null, 1, 'tfg:redstone')
event.metal('gtceu:red_alloy', 740, 0.01529, '#forge:ingots/red_alloy', null, '#forge:plates/red_alloy', 2, 'tfg:red_alloy')
event.metal('gtceu:tin_alloy', 1250, 0.00829, '#forge:ingots/tin_alloy', null, '#forge:plates/tin_alloy', 3, 'tfg:tin_alloy')
}
const registerTFCHeats = (event) => {
Object.entries(global.METAL_TO_SPECS).forEach(keyValuePair => {
let metal = keyValuePair[0]
let metalSpecs = keyValuePair[1]
function makeItemHeatByTagPrefix(tagPrefix, material, tfcProperty, heatCapacity) {
let item = ChemicalHelper.get(tagPrefix, material, 1)
if (!item.isEmpty()) event.itemHeat(item, heatCapacity, tfcProperty.getForgingTemp(), tfcProperty.getWeldingTemp())
}
if (metalSpecs.props.includes('dusts')) {
event.itemHeat(`gtceu:${metal}_tiny_dust`, 0.357, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_small_dust`, 0.714, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_dust`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
function makeItemHeatByToolType(toolType, material, tfcProperty, heatCapacity) {
let tool = $ToolHelper.get(toolType, material)
if (!tool.isEmpty()) event.itemHeat(tool, heatCapacity, tfcProperty.getForgingTemp(), tfcProperty.getWeldingTemp())
}
event.itemHeat(`gtceu:${metal}_rod`, 0.567, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_bolt`, 0.245, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_screw`, 0.567, metalSpecs.forging_temp, metalSpecs.welding_temp)
}
GTRegistries.MATERIALS.forEach(material => {
let tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY)
if (tfcProperty != null) {
makeItemHeatByTagPrefix(TagPrefix.dustTiny, material, tfcProperty, 0.357)
makeItemHeatByTagPrefix(TagPrefix.dustSmall, material, tfcProperty, 0.714)
makeItemHeatByTagPrefix(TagPrefix.dust, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TagPrefix.rod, material, tfcProperty, 0.567)
makeItemHeatByTagPrefix(TagPrefix.bolt, material, tfcProperty, 0.245)
makeItemHeatByTagPrefix(TagPrefix.screw, material, tfcProperty, 0.567)
makeItemHeatByTagPrefix(TagPrefix.nugget, material, tfcProperty, 0.124)
makeItemHeatByTagPrefix(TagPrefix.rawOre, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.richRawOre, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.poorRawOre, material, tfcProperty, 1.429)
if (metalSpecs.props.includes('nugget')) {
event.itemHeat(`gtceu:${metal}_nugget`, 0.124, metalSpecs.forging_temp, metalSpecs.welding_temp)
}
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadSword, material, tfcProperty, 2.875)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadShovel, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadScythe, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadPickaxe, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadSaw, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadKnife, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadHoe, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadHammer, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadAxe, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadFile, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadButcheryKnife, material, tfcProperty, 2.875)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadMiningHammer, material, tfcProperty, 2.875)
makeItemHeatByTagPrefix(TFGTagPrefix.toolHeadSpade, material, tfcProperty, 2.875)
if (metalSpecs.props.includes('ore_chunks')) {
event.itemHeat(`#forge:rich_raw_materials/${metal}`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`#forge:raw_materials/${metal}`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`#forge:poor_raw_materials/${metal}`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
}
if (metalSpecs.props.includes('tool')) {
event.itemHeat(`gtceu:${metal}_sword`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_sword_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_shovel`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_shovel_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_scythe`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_scythe_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_pickaxe`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_pickaxe_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_saw`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_saw_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_knife`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_knife_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_hoe`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_hoe_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_hammer`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_hammer_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_axe`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_axe_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_file`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_file_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_butchery_knife`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_knife_butchery_head`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
}
makeItemHeatByToolType(GTToolType.SWORD, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.PICKAXE, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.SHOVEL, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.AXE, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.HOE, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.SAW, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.HARD_HAMMER, material, tfcProperty, 2.875)
makeItemHeatByToolType(GTToolType.FILE, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.SCYTHE, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.KNIFE, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.BUTCHERY_KNIFE, material, tfcProperty, 2.875)
makeItemHeatByToolType(GTToolType.MINING_HAMMER, material, tfcProperty, 1.429)
makeItemHeatByToolType(GTToolType.SPADE, material, tfcProperty, 2.875)
}
})
// Ведро из синей стали
@ -131,4 +146,18 @@ const registerTFCKnappingTypes = (event) => {
const registerTFCItemSize = (event) => {
// TODO event.itemSize('minecraft:gold_ingot', 'huge', 'very_heavy')
}
const registerTFCFoodData = (event) => {
event.foodItem('minecraft:golden_apple', food => {
food.hunger(2)
food.fruit(2)
food.decayModifier(0.6)
})
event.foodItem('minecraft:enchanted_golden_apple', food => {
food.hunger(3)
food.fruit(2)
food.decayModifier(0.2)
})
}

2092
kubejs/server_scripts/tfc/recipes.js
View file

File diff suppressed because it is too large Load diff

115
kubejs/server_scripts/tfc/tags.js
View file

@ -204,47 +204,98 @@ const registerTFCBlockTags = (event) => {
event.add('tfc:glass_basin_blocks', 'gtceu:brass_block')
event.add('tfc:glass_pouring_table', 'gtceu:brass_block')
event.add('tfc:glass_basin_blocks', 'tfc:red_kaolin_clay')
event.add('tfc:glass_pouring_table', 'tfc:red_kaolin_clay')
event.add('tfc:glass_basin_blocks', 'tfc:pink_kaolin_clay')
event.add('tfc:glass_pouring_table', 'tfc:pink_kaolin_clay')
event.add('tfc:glass_basin_blocks', 'tfc:white_kaolin_clay')
event.add('tfc:glass_pouring_table', 'tfc:white_kaolin_clay')
}
const registerTFCFluidTags = (event) => {
event.add('tfc:usable_in_ingot_mold', "gtceu:bismuth")
event.add('tfc:usable_in_ingot_mold', "gtceu:bismuth_bronze")
event.add('tfc:usable_in_ingot_mold', "gtceu:black_bronze")
event.add('tfc:usable_in_ingot_mold', "gtceu:bronze")
event.add('tfc:usable_in_ingot_mold', "gtceu:brass")
event.add('tfc:usable_in_ingot_mold', "gtceu:copper")
event.add('tfc:usable_in_ingot_mold', "gtceu:gold")
event.add('tfc:usable_in_ingot_mold', "gtceu:nickel")
event.add('tfc:usable_in_ingot_mold', "gtceu:rose_gold")
event.add('tfc:usable_in_ingot_mold', "gtceu:silver")
event.add('tfc:usable_in_ingot_mold', "gtceu:tin")
event.add('tfc:usable_in_ingot_mold', "gtceu:zinc")
event.add('tfc:usable_in_ingot_mold', "gtceu:sterling_silver")
event.add('tfc:usable_in_ingot_mold', "gtceu:wrought_iron")
event.add('tfc:usable_in_ingot_mold', "gtceu:iron")
event.add('tfc:usable_in_ingot_mold', "gtceu:steel")
event.add('tfc:usable_in_ingot_mold', "gtceu:black_steel")
event.add('tfc:usable_in_ingot_mold', "gtceu:blue_steel")
event.add('tfc:usable_in_ingot_mold', "gtceu:red_steel")
// Удаление TFC металлов из возможных в форме слитка
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/bismuth')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/bismuth_bronze')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/bronze')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/black_bronze')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/brass')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/copper')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/gold')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/nickel')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/rose_gold')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/silver')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/tin')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/zinc')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/sterling_silver')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/wrought_iron')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/steel')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/black_steel')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/red_steel')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/blue_steel')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/cast_iron')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/pig_iron')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/high_carbon_steel')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/high_carbon_black_steel')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/high_carbon_red_steel')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/high_carbon_blue_steel')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/weak_steel')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/weak_red_steel')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/weak_blue_steel')
event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/unknown')
event.add('tfc:usable_in_ingot_mold', "gtceu:red_alloy")
event.add('tfc:usable_in_ingot_mold', "gtceu:tin_alloy")
// Добавление GTCEu металлов в форму слитков
event.add('tfc:usable_in_ingot_mold', 'gtceu:bismuth')
event.add('tfc:usable_in_ingot_mold', 'gtceu:bismuth_bronze')
event.add('tfc:usable_in_ingot_mold', 'gtceu:black_bronze')
event.add('tfc:usable_in_ingot_mold', 'gtceu:bronze')
event.add('tfc:usable_in_ingot_mold', 'gtceu:brass')
event.add('tfc:usable_in_ingot_mold', 'gtceu:copper')
event.add('tfc:usable_in_ingot_mold', 'gtceu:gold')
event.add('tfc:usable_in_ingot_mold', 'gtceu:nickel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:rose_gold')
event.add('tfc:usable_in_ingot_mold', 'gtceu:silver')
event.add('tfc:usable_in_ingot_mold', 'gtceu:tin')
event.add('tfc:usable_in_ingot_mold', 'gtceu:zinc')
event.add('tfc:usable_in_ingot_mold', 'gtceu:sterling_silver')
event.add('tfc:usable_in_ingot_mold', 'gtceu:wrought_iron')
event.add('tfc:usable_in_ingot_mold', 'gtceu:iron')
event.add('tfc:usable_in_ingot_mold', 'gtceu:steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:black_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:blue_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:red_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:pig_iron')
event.add('tfc:usable_in_ingot_mold', 'gtceu:high_carbon_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:high_carbon_black_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:high_carbon_red_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:high_carbon_blue_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:weak_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:weak_red_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:weak_blue_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:unknown')
event.add('tfc:usable_in_bell_mold', "gtceu:bronze")
event.add('tfc:usable_in_bell_mold', "gtceu:gold")
event.add('tfc:usable_in_bell_mold', "gtceu:brass")
event.add('tfc:usable_in_ingot_mold', 'gtceu:red_alloy')
event.add('tfc:usable_in_ingot_mold', 'gtceu:tin_alloy')
event.add('tfc:usable_in_tool_head_mold', "gtceu:copper")
event.add('tfc:usable_in_tool_head_mold', "gtceu:bismuth_bronze")
event.add('tfc:usable_in_tool_head_mold', "gtceu:black_bronze")
event.add('tfc:usable_in_tool_head_mold', "gtceu:bronze")
//
event.add('tfc:usable_in_bell_mold', 'gtceu:bronze')
event.add('tfc:usable_in_bell_mold', 'gtceu:gold')
event.add('tfc:usable_in_bell_mold', 'gtceu:brass')
event.add('tfc:usable_in_pot', "gtceu:latex")
//
event.add('tfc:usable_in_tool_head_mold', 'gtceu:copper')
event.add('tfc:usable_in_tool_head_mold', 'gtceu:bismuth_bronze')
event.add('tfc:usable_in_tool_head_mold', 'gtceu:black_bronze')
event.add('tfc:usable_in_tool_head_mold', 'gtceu:bronze')
event.add('tfc:usable_in_barrel', "gtceu:latex")
event.add('tfc:usable_in_wooden_bucket', "gtceu:latex")
//
event.add('tfc:usable_in_pot', 'gtceu:latex')
event.add('tfc:usable_in_barrel', 'gtceu:latex')
event.add('tfc:usable_in_wooden_bucket', 'gtceu:latex')
//
event.add('tfc:usable_in_barrel', 'gtceu:creosote')
event.add('tfc:usable_in_wooden_bucket', 'gtceu:creosote')
event.add('tfc:usable_in_red_steel_bucket', 'gtceu:creosote')

6
kubejs/server_scripts/water_flasks/recipes.js
View file

@ -4,17 +4,17 @@ const registerWaterFlasksRecipes = (event) => {
// Декрафт Unfinished Water Flask
event.recipes.tfc.heating('waterflasks:unfinished_iron_flask', 1535)
.resultFluid(Fluid.of('tfc:metal/cast_iron', 144))
.resultFluid(Fluid.of('gtceu:iron', 144))
.id(`waterflasks:heating/wrought_iron_unfinished_iron_flask`)
// Декрафт Broken Water Flask
event.recipes.tfc.heating('waterflasks:broken_iron_flask', 1535)
.resultFluid(Fluid.of('tfc:metal/cast_iron', 144))
.resultFluid(Fluid.of('gtceu:iron', 144))
.id(`waterflasks:heating/wrought_iron_broken_iron_flask`)
// Декрафт Water Flask
event.recipes.tfc.heating('waterflasks:iron_flask', 1535)
.resultFluid(Fluid.of('tfc:metal/cast_iron', 144))
.resultFluid(Fluid.of('gtceu:iron', 144))
.useDurability(true)
.id(`waterflasks:heating/wrought_iron_iron_flask`)

2
kubejs/startup_scripts/minecraft/constants.js
View file

@ -529,8 +529,6 @@ global.MINECRAFT_DISABLED_ITEMS = [
'minecraft:suspicious_gravel',
'minecraft:stonecutter',
'minecraft:gravel',
'minecraft:gold_ingot',
'minecraft:copper_ingot',
'minecraft:moss_block',
'minecraft:moss_carpet',
'minecraft:bamboo_raft',

881
kubejs/startup_scripts/tfc/constants.js
View file

@ -90,7 +90,25 @@ global.TFC_DISABLED_ITEMS = [
"tfc:metal/ingot/gold",
// Double Ingots
"tfc:metal/double_ingot/bismuth",
"tfc:metal/double_ingot/bismuth_bronze",
"tfc:metal/double_ingot/black_bronze",
"tfc:metal/double_ingot/bronze",
"tfc:metal/double_ingot/rose_gold",
"tfc:metal/double_ingot/sterling_silver",
"tfc:metal/double_ingot/wrought_iron",
"tfc:metal/double_ingot/steel",
"tfc:metal/double_ingot/black_steel",
"tfc:metal/double_ingot/red_steel",
"tfc:metal/double_ingot/blue_steel",
"tfc:metal/double_ingot/brass",
"tfc:metal/double_ingot/nickel",
"tfc:metal/double_ingot/silver",
"tfc:metal/double_ingot/tin",
"tfc:metal/double_ingot/zinc",
"tfc:metal/double_ingot/cast_iron",
"tfc:metal/double_ingot/copper",
"tfc:metal/double_ingot/gold",
// Sheets
"tfc:metal/sheet/bismuth",
@ -760,860 +778,6 @@ global.SAND_COLORS = [
'pink'
];
/**
* Указывает, что у этого металла есть: ingot.
*/
global.INGOT_GEN = 'ingot';
/**
* Указывает, что у этого металла есть: double_ingot.
*/
global.DOUBLE_INGOT_GEN = 'double_ingot';
/**
* Указывает, что у этого металла есть: nugget.
*/
global.NUGGET_GEN = 'nugget';
/**
* Указывает, что у этого металла есть: dust_tiny, dust_small, dust.
*/
global.DUST_GEN = 'dusts';
/**
* Указывает, что у этого металла есть куски руд, poor_raw, raw, rich_raw.
*/
global.ORE_CHUNKS_GEN = 'ore_chunks';
/**
* Указывает, что у этого металла есть: plated_block, block_stairs, block_slab.
*/
global.PART_GEN = 'part';
/**
* Указывает, что у этого металла есть: block.
*/
global.BLOCK_GEN = 'block';
/**
* Указывает, что у этого металла есть: rod.
*/
global.ROD_GEN = 'rod';
/**
* Указывает, что у этого металла есть: sheet.
*/
global.PLATE_GEN = 'plate';
/**
* Указывает, что у этого металла есть: double_sheet.
*/
global.DOUBLE_PLATE_GEN = 'double_plate';
/**
* Указывает, что у этого металла есть: anvil, bars, chain, trapdoor, lamp, unfinished_lamp.
*/
global.UTILITY_GEN = 'utility';
/**
* Указывает, что у этого металла есть: boots, greaves, chestplate, helmet, shield, unfinished_boots, unfinished_chestplate, unfinished_greaves, unfinished_helmet.
*/
global.ARMOR_GEN = 'armor';
/**
* Указывает, что у этого металла есть: инструменты и оголовья.
*/
global.TOOL_GEN = 'tool';
/**
* Указывает, что у этого металла есть: ведро.
*/
global.TFC_BUCKET_GEN = 'bucket';
/**
* Указывает, что у этого металла есть чистый кусок (тфк штука).
*/
global.TFC_SMALL_NATIVE_ORE_GEN = 'small_native_ore';
/**
* Указывает, что у этого металла есть кусок (тфк штука).
*/
global.TFC_SMALL_ORE_GEN = 'small_ore';
/**
* Указывает, что оголовья из этого металла можно раскрафтить из форм.
*/
global.CAN_BE_UNMOLDED = 'can_be_unmolded';
/**
* Указывает, на то что является ли текущий металл дублированием греговского.
*/
global.IS_GT_DUP = 'is_gt_dup';
global.METAL_TO_SPECS = {
// Основные металлы
copper: {
forging_temp: 648,
welding_temp: 864,
melt_temp: 1080,
output_fluid: "gtceu:copper",
tier: 1,
percent_of_material: 100,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
global.CAN_BE_UNMOLDED,
global.ORE_CHUNKS_GEN,
global.TFC_SMALL_NATIVE_ORE_GEN
]
},
bismuth_bronze: {
forging_temp: 591,
welding_temp: 788,
melt_temp: 985,
output_fluid: "gtceu:bismuth_bronze",
percent_of_material: 100,
tier: 2,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
global.IS_GT_DUP,
global.CAN_BE_UNMOLDED,
]
},
bronze: {
forging_temp: 570,
welding_temp: 760,
melt_temp: 950,
output_fluid: "gtceu:bronze",
percent_of_material: 100,
tier: 1,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
global.IS_GT_DUP,
global.CAN_BE_UNMOLDED,
]
},
black_bronze: {
forging_temp: 642,
welding_temp: 856,
melt_temp: 1070,
output_fluid: "gtceu:black_bronze",
percent_of_material: 100,
tier: 2,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
global.IS_GT_DUP,
global.CAN_BE_UNMOLDED,
]
},
wrought_iron: {
forging_temp: 921,
welding_temp: 1228,
melt_temp: 1535,
input_fluid: "gtceu:wrought_iron",
output_fluid: "tfc:metal/cast_iron",
percent_of_material: 100,
tier: 3,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
global.IS_GT_DUP,
]
},
// Обычное железо исправим руками (Cast и Iron)
steel: {
forging_temp: 924,
welding_temp: 1232,
melt_temp: 1540,
output_fluid: "gtceu:steel",
percent_of_material: 100,
tier: 4,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
global.IS_GT_DUP,
]
},
black_steel: {
forging_temp: 891,
welding_temp: 1188,
melt_temp: 1485,
output_fluid: "gtceu:black_steel",
percent_of_material: 100,
tier: 5,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
global.IS_GT_DUP,
]
},
red_steel: {
forging_temp: 924,
welding_temp: 1232,
melt_temp: 1540,
output_fluid: "gtceu:red_steel",
percent_of_material: 100,
tier: 6,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
global.TFC_BUCKET_GEN,
global.IS_GT_DUP,
]
},
blue_steel: {
forging_temp: 924,
welding_temp: 1232,
melt_temp: 1540,
output_fluid: "gtceu:blue_steel",
percent_of_material: 100,
tier: 6,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
global.TFC_BUCKET_GEN,
global.IS_GT_DUP,
]
},
// Проходные металлы
high_carbon_steel: {
forging_temp: 924,
melt_temp: 1540,
welding_temp: 1232,
output_fluid: "tfc:metal/high_carbon_steel",
tier: 3,
props: [global.INGOT_GEN],
},
high_carbon_black_steel: {
forging_temp: 924,
melt_temp: 1540,
welding_temp: 1232,
output_fluid: "tfc:metal/high_carbon_black_steel",
tier: 5,
props: [global.INGOT_GEN],
},
high_carbon_red_steel: {
forging_temp: 924,
melt_temp: 1540,
welding_temp: 1232,
output_fluid: "tfc:metal/high_carbon_red_steel",
tier: 5,
props: [global.INGOT_GEN],
},
high_carbon_blue_steel: {
forging_temp: 924,
melt_temp: 1540,
welding_temp: 1232,
output_fluid: "tfc:metal/high_carbon_blue_steel",
tier: 4,
props: [global.INGOT_GEN],
},
weak_steel: {
forging_temp: 924,
welding_temp: 1232,
melt_temp: 1540,
output_fluid: "tfc:metal/weak_steel",
tier: 4,
props: [global.INGOT_GEN],
},
weak_red_steel: {
forging_temp: 924,
welding_temp: 1232,
melt_temp: 1540,
output_fluid: "tfc:metal/weak_red_steel",
tier: 5,
props: [global.INGOT_GEN],
},
weak_blue_steel: {
forging_temp: 924,
welding_temp: 1232,
melt_temp: 1540,
output_fluid: "tfc:metal/weak_blue_steel",
tier: 5,
props: [global.INGOT_GEN],
},
gold: {
forging_temp: 636,
welding_temp: 848,
melt_temp: 1060,
output_fluid: "gtceu:gold",
tier: 1,
percent_of_material: 100,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.TFC_SMALL_NATIVE_ORE_GEN
]
},
bismuth: {
forging_temp: 162,
welding_temp: 216,
melt_temp: 270,
output_fluid: "gtceu:bismuth",
tier: 1,
percent_of_material: 100,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.IS_GT_DUP,
]
},
brass: {
forging_temp: 558,
welding_temp: 744,
melt_temp: 930,
output_fluid: "gtceu:brass",
percent_of_material: 100,
tier: 2,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.IS_GT_DUP,
]
},
nickel: {
forging_temp: 872,
welding_temp: 1162,
melt_temp: 1453,
output_fluid: "gtceu:nickel",
percent_of_material: 100,
tier: 1,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.IS_GT_DUP,
]
},
rose_gold: {
forging_temp: 576,
welding_temp: 768,
melt_temp: 960,
output_fluid: "gtceu:rose_gold",
percent_of_material: 100,
tier: 1,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.IS_GT_DUP,
]
},
silver: {
forging_temp: 577,
welding_temp: 769,
melt_temp: 961,
output_fluid: "gtceu:silver",
percent_of_material: 100,
tier: 1,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.TFC_SMALL_NATIVE_ORE_GEN,
global.IS_GT_DUP,
]
},
tin: {
forging_temp: 138,
welding_temp: 184,
melt_temp: 230,
output_fluid: "gtceu:tin",
percent_of_material: 100,
tier: 1,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.IS_GT_DUP,
]
},
zinc: {
forging_temp: 252,
welding_temp: 336,
melt_temp: 420,
output_fluid: "gtceu:zinc",
percent_of_material: 100,
tier: 1,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.IS_GT_DUP,
]
},
sterling_silver: {
forging_temp: 570,
welding_temp: 760,
melt_temp: 950,
output_fluid: "gtceu:sterling_silver",
percent_of_material: 100,
tier: 1,
props: [
global.INGOT_GEN,
global.DOUBLE_INGOT_GEN,
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.IS_GT_DUP,
]
},
pig_iron: {
forging_temp: 921,
welding_temp: 1228,
melt_temp: 1535,
output_fluid: "tfc:metal/pig_iron",
tier: 3,
props: [global.INGOT_GEN],
},
unknown: {
forging_temp: 240,
welding_temp: 320,
melt_temp: 400,
output_fluid: "tfc:metal/unknown",
tier: 1,
props: [global.INGOT_GEN],
},
bismuthinite: {
forging_temp: 162,
welding_temp: 216,
melt_temp: 270,
output_fluid: "gtceu:bismuth",
percent_of_material: 100,
tier: 1,
props: [global.TFC_SMALL_ORE_GEN],
},
cassiterite: {
forging_temp: 138,
welding_temp: 184,
melt_temp: 230,
output_fluid: "gtceu:tin",
percent_of_material: 200,
tier: 1,
props: [
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.TFC_SMALL_ORE_GEN
],
},
garnierite: {
forging_temp: 138,
welding_temp: 184,
melt_temp: 1453,
output_fluid: "gtceu:nickel",
percent_of_material: 90,
tier: 1,
props: [
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.TFC_SMALL_ORE_GEN
],
},
hematite: {
forging_temp: 921,
welding_temp: 1228,
melt_temp: 1535,
output_fluid: "tfc:metal/cast_iron",
percent_of_material: 90,
tier: 3,
props: [
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.TFC_SMALL_ORE_GEN
],
},
yellow_limonite: {
forging_temp: 921,
welding_temp: 1228,
melt_temp: 1535,
output_fluid: "tfc:metal/cast_iron",
percent_of_material: 90,
tier: 3,
props: [
global.DUST_GEN,
global.ORE_CHUNKS_GEN
],
},
limonite: {
forging_temp: 921,
welding_temp: 1228,
melt_temp: 1535,
output_fluid: "tfc:metal/cast_iron",
percent_of_material: 85,
tier: 3,
props: [global.TFC_SMALL_ORE_GEN],
},
magnetite: {
forging_temp: 138,
welding_temp: 184,
melt_temp: 1535,
output_fluid: "tfc:metal/cast_iron",
percent_of_material: 90,
tier: 3,
props: [
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.TFC_SMALL_ORE_GEN
],
},
malachite: {
forging_temp: 138,
welding_temp: 184,
melt_temp: 1080,
output_fluid: "gtceu:copper",
percent_of_material: 90,
tier: 1,
props: [
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.TFC_SMALL_ORE_GEN
],
},
pyrite: {
forging_temp: 921,
welding_temp: 1228,
melt_temp: 1535,
output_fluid: "tfc:metal/cast_iron",
percent_of_material: 90,
tier: 3,
props: [
global.DUST_GEN,
global.ORE_CHUNKS_GEN
],
},
sphalerite: {
forging_temp: 138,
welding_temp: 184,
melt_temp: 420,
output_fluid: "gtceu:zinc",
percent_of_material: 90,
tier: 1,
props: [
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.TFC_SMALL_ORE_GEN
],
},
tetrahedrite: {
forging_temp: 138,
welding_temp: 184,
melt_temp: 1080,
output_fluid: "gtceu:copper",
percent_of_material: 90,
tier: 1,
props: [
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.TFC_SMALL_ORE_GEN
],
},
chalcopyrite: {
forging_temp: 648,
welding_temp: 864,
melt_temp: 1080,
output_fluid: "gtceu:copper",
percent_of_material: 90,
tier: 1,
props: [
global.DUST_GEN,
global.ORE_CHUNKS_GEN
],
},
cassiterite_sand: {
forging_temp: 138,
welding_temp: 184,
melt_temp: 230,
output_fluid: "gtceu:tin",
percent_of_material: 150,
tier: 1,
props: [
global.DUST_GEN,
global.ORE_CHUNKS_GEN
],
},
goethite: {
forging_temp: 921,
welding_temp: 1228,
melt_temp: 1535,
output_fluid: "tfc:metal/cast_iron",
percent_of_material: 85,
tier: 3,
props: [
global.DUST_GEN,
global.ORE_CHUNKS_GEN
],
},
// GT материалы
redstone: {
forging_temp: 240,
welding_temp: 320,
melt_temp: 460,
output_fluid: "gtceu:redstone",
percent_of_material: 100,
tier: 1,
props: [
global.DUST_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.BLOCK_GEN,
global.ORE_CHUNKS_GEN
],
},
red_alloy: {
forging_temp: 570,
welding_temp: 650,
melt_temp: 740,
output_fluid: "gtceu:red_alloy",
percent_of_material: 100,
tier: 2,
props: [
global.NUGGET_GEN,
global.INGOT_GEN,
global.DUST_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN
],
},
tin_alloy: {
forging_temp: 1000,
welding_temp: 1100,
melt_temp: 1250,
output_fluid: "gtceu:tin_alloy",
percent_of_material: 100,
tier: 3,
props: [
global.NUGGET_GEN,
global.INGOT_GEN,
global.DUST_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN
],
}
};
global.TFC_SIMPLE_MATERIALS = [
"gypsum",
"cinnabar",
@ -1757,6 +921,15 @@ global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [
{ input: '#forge:dusts/borax', output: '4x tfc:powder/flux', name: 'flux_powder' }
];
global.TFC_QUERN_GRAIN_RECIPE_COMPONENTS = [
{ input: 'tfc:food/barley', output: 'tfc:food/barley_grain', name: 'barley_grain' },
{ input: 'tfc:food/maize', output: 'tfc:food/maize_grain', name: 'maize_grain' },
{ input: 'tfc:food/oat', output: 'tfc:food/oat_grain', name: 'oat_grain' },
{ input: 'tfc:food/rye', output: 'tfc:food/rye_grain', name: 'rye_grain' },
{ input: 'tfc:food/rice', output: 'tfc:food/rice_grain', name: 'rice_grain' },
{ input: 'tfc:food/wheat', output: 'tfc:food/wheat_grain', name: 'wheat_grain' },
];
global.TFC_QUERN_FLOUR_RECIPE_COMPONENTS = [
{ input: 'tfc:food/barley_grain', output: '2x tfc:food/barley_flour', name: 'barley_flour' },
{ input: 'tfc:food/maize_grain', output: '2x tfc:food/maize_flour', name: 'maize_flour' },

2
mods

@ -1 +1 @@
Subproject commit a3bb399413071ff198dff3381de0efaac660ef1b
Subproject commit 0e127d2439dfa862de65e2463a6398b496ec2bc3