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

Merge branch 'dev' into feature/space

Browse source
This commit is contained in:
Pyritie 2025-05-05 16:08:00 +01:00
commit 38219fdb98
93 changed files with 3800 additions and 2564 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,7 @@ const registerTFCHeats = (event) => {
if (!tool.isEmpty()) event.itemHeat(tool, heatCapacity, tfcProperty.getForgingTemp(), tfcProperty.getWeldingTemp())
}
GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
forEachMaterial(material => {
let tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY)
if (tfcProperty != null) {
@ -278,19 +278,19 @@ const registerTFCFoodData = (event) => {
//#region registerTFCSupportData
//up, down, horizontal
const registerTFCSupportData = (event) => {
event.support('tfg:light_concrete_support', 4, 4, 8, 'light_concrete_support')
event.support('tfg:dark_concrete_support', 4, 4, 8, 'dark_concrete_support')
event.support('tfg:reinforced_light_concrete_support', 6, 6, 16, 'reinforced_light_concrete_support')
event.support('tfg:reinforced_dark_concrete_support', 6, 6, 16, 'reinforced_dark_concrete_support')
event.support('tfg:rebar_support', 4, 4, 8, 'rebar_support')
event.support('tfg:steel_support', 6, 6, 16, 'steel_support')
event.support('tfg:light_concrete_support_horizontal', 4, 4, 8, 'light_concrete_support')
event.support('tfg:dark_concrete_support_horizontal', 4, 4, 8, 'dark_concrete_support')
event.support('tfg:reinforced_light_concrete_support_horizontal', 6, 6, 16, 'reinforced_light_concrete_support')
event.support('tfg:reinforced_dark_concrete_support_horizontal', 6, 6, 16, 'reinforced_dark_concrete_support')
event.support('tfg:rebar_support_horizontal', 4, 4, 8, 'rebar_support')
event.support('tfg:steel_support_horizontal', 6, 6, 16, 'steel_support')
const other_stone = ['pyroxenite', 'migmatite', 'travertine']
const stone_types = global.TFC_STONE_TYPES.concat(other_stone)
stone_types.forEach(stone => {
event.support(`tfg:${stone}_support`, 2, 2, 4, `${stone}_support`)
event.support(`tfg:${stone}_support_horizontal`, 2, 2, 4, `${stone}_support`)
})
}
//#endregion

7
kubejs/server_scripts/tfc/recipes.machines.js
View file

@ -473,31 +473,36 @@ function registerTFCMachineRecipes(event) {
// Ceramic Recycling
event.recipes.gtceu.macerator('tfg:sherd_to_brick_dust')
.itemInputs('firmalife:pottery_sherd')
.itemOutputs('5x #forge:dusts/brick')
.itemOutputs('#forge:dusts/brick')
.category(GTRecipeCategories.MACERATOR_RECYCLING)
.duration(20)
.EUt(2)
event.recipes.gtceu.macerator('tfg:ceramic_molds')
.itemInputs('#tfc:fired_molds')
.itemOutputs('2x #forge:dusts/brick')
.category(GTRecipeCategories.MACERATOR_RECYCLING)
.duration(20)
.EUt(2)
event.recipes.gtceu.macerator('tfg:large_vessels')
.itemInputs('#tfc:fired_large_vessels')
.itemOutputs('5x #forge:dusts/brick')
.category(GTRecipeCategories.MACERATOR_RECYCLING)
.duration(20)
.EUt(2)
event.recipes.gtceu.macerator('tfg:casting_channel')
.itemInputs('tfcchannelcasting:channel')
.itemOutputs('1x #forge:dusts/brick')
.category(GTRecipeCategories.MACERATOR_RECYCLING)
.duration(20)
.EUt(2)
event.recipes.gtceu.macerator('tfg:mold_table')
.itemInputs('tfcchannelcasting:mold_table')
.itemOutputs('5x #forge:dusts/brick')
.category(GTRecipeCategories.MACERATOR_RECYCLING)
.duration(20)
.EUt(2)
}

2
kubejs/server_scripts/tfc/recipes.materials.js
View file

@ -2,7 +2,7 @@
function registerTFCMaterialsRecipes(event) {
GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
forEachMaterial(material => {
let tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY)
if (tfcProperty == null) {

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

@ -7,17 +7,26 @@
//#region ItemTags
const registerTFCItemTags = (event) => {
// Теги для соответствия инструментов TFC и GT
GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
if (material.hasProperty(PropertyKey.TOOL)) {
for (let [key, value] of Object.entries(global.GTCEU_TOOLTYPES_WHICH_HAS_TFC_DUPS)) {
var tool = ToolHelper.get(value, material)
if (!tool.isEmpty()) event.add(key, tool.getId())
event.add('tfc:swords', '#minecraft:swords')
event.add('tfc:pickaxes', '#minecraft:pickaxes')
event.add('tfc:axes', '#minecraft:axes')
event.add('tfc:shovels', '#minecraft:shovels')
event.add('tfc:hoes', '#minecraft:hoes')
event.add('tfc:hammers', '#forge:tools/hammers')
event.add('tfc:knives', '#forge:tools/knives')
event.add('tfc:saws', '#forge:tools/saws')
event.add('tfc:scythes', '#forge:tools/scythes')
event.add('tfc:usable_on_tool_rack', `#${key}`)
}
}
})
event.add('tfc:usable_on_tool_rack', '#mincraft:swords')
event.add('tfc:usable_on_tool_rack', '#minecraft:pickaxes')
event.add('tfc:usable_on_tool_rack', '#minecraft:axes')
event.add('tfc:usable_on_tool_rack', '#minecraft:shovels')
event.add('tfc:usable_on_tool_rack', '#minecraft:hoes')
event.add('tfc:usable_on_tool_rack', '#forge:tools/hammers')
event.add('tfc:usable_on_tool_rack', '#forge:tools/knives')
event.add('tfc:usable_on_tool_rack', '#forge:tools/saws')
event.add('tfc:usable_on_tool_rack', '#forge:tools/scythes')
event.add('tfc:usable_on_tool_rack', '#forge:tools/mining_hammers')
event.add('tfc:usable_on_tool_rack', '#forge:tools/spades')
@ -71,7 +80,9 @@ const registerTFCItemTags = (event) => {
// Для складывания
event.add('tfc:pileable_ingots', '#forge:ingots')
event.add('tfc:pileable_sheets', '#forge:plates')
event.add('tfc:pileable_double_ingots', 'gtceu:tin_alloy_double_ingot')
event.add('tfc:pileable_double_ingots', 'gtceu:red_alloy_double_ingot')
// Рыба
event.add('minecraft:fishes', 'tfc:food/calamari')
event.add('minecraft:fishes', 'tfc:food/bluegill')