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

Merge branch 'dev' into feature/create-6

Browse source
This commit is contained in:
Pyritie 2025-05-27 19:52:43 +01:00
commit d7fb2981fc
17 changed files with 748 additions and 328 deletions
Download patch file Download diff file Expand all files Collapse all files

16
kubejs/server_scripts/tfg/recipes.miscellaneous.js
View file

@ -397,4 +397,20 @@ function registerTFGMiscellaneousRecipes(event) {
event.shapeless('1x minecraft:armor_stand', [
'tfg:armor_stand_arms'
]).id(`tfg:shapeless/armor_stand`)
event.recipes.tfc.sewing(
'1x tfg:piglin_disguise',
[
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 1, 1, 0, 0, 0, 1, 1, 0,
0, 1, 1, 1, 0, 1, 1, 1, 0,
0, 0, 1, 1, 0, 1, 1, 0, 0,
0, 0, 1, 1, 0, 1, 1, 0, 0
], [
1, 1, 1, 1, 1, 1, 1, 1,
1, 0, 1, 0, 0, 1, 0, 1,
1, -1, 0, 0, 0, 0, -1, 1,
1, -1, 0, 0, 0, 0, -1, 1
]
).id('tfg:sewing/piglin_disguise')
}

10
kubejs/server_scripts/tfg/tags.js
View file

@ -2,6 +2,12 @@ const registerTFGItemTags = (event) => {
registerTFGTrimTags(event)
//temporary hidden items
event.add('c:hidden_from_recipe_viewers', 'tfg:geyser_source_small')
event.add('c:hidden_from_recipe_viewers', 'tfg:geyser_source')
event.add('c:hidden_from_recipe_viewers', 'tfg:stromatolite_cluster_small')
event.add('c:hidden_from_recipe_viewers', 'tfg:stromatolite_cluster_medium')
//Decorative Vases
global.MINECRAFT_DYE_NAMES.forEach(color => {
event.add('c:hidden_from_recipe_viewers', `tfg:decorative_vase/generated/${color}`)
@ -15,7 +21,7 @@ const registerTFGItemTags = (event) => {
//Knapping
event.add('tfc:any_knapping', 'minecraft:flint')
//Tools
//Tools & Armor
event.add('forge:tools/fishing_nets', 'tfg:fishing_net/wood')
event.add('forge:tools/fishing_nets', 'tfg:fishing_net/brass')
event.add('forge:tools/fishing_nets', 'tfg:fishing_net/rose_gold')
@ -24,6 +30,8 @@ const registerTFGItemTags = (event) => {
event.add('forge:tools/fishing_nets', 'tfg:fishing_net/tin_alloy')
event.add('forge:tools/fishing_nets', 'tfg:fishing_net/cupronickel')
event.add('forge:tools/fishing_nets', 'tfg:fishing_net/magnalium')
event.add('minecraft:piglin_loved', 'tfg:piglin_disguise')
// #region Paper from wood

13
kubejs/server_scripts/vintage_improvements/recipes.js
View file

@ -197,7 +197,8 @@ function registerVintageImprovementsRecipes(event) {
{ material: GTMaterials.Gold, blows: STARTING_BLOWS },
{ material: GTMaterials.Bismuth, blows: STARTING_BLOWS },
{ material: GTMaterials.RoseGold, blows: STARTING_BLOWS },
{ material: GTMaterials.SterlingSilver, blows: STARTING_BLOWS }
{ material: GTMaterials.SterlingSilver, blows: STARTING_BLOWS },
{ material: GTMaterials.Tin, blows: STARTING_BLOWS }
]
let HAMMERING_ITEMS = [
@ -413,7 +414,7 @@ function registerVintageImprovementsRecipes(event) {
results: [ChemicalHelper.get(TFGTagPrefix.ingotDouble, material, 1)],
processingTime: material.getMass() * 6 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER
}).id(`tfg:vi/pressurizing/${material.getName()}_double_ingot`)
const plateItem = ChemicalHelper.get(TagPrefix.plate, material, 1);
event.custom({
@ -511,9 +512,9 @@ function registerVintageImprovementsRecipes(event) {
event.custom({
type: 'vintageimprovements:curving',
ingredients: [ input ],
ingredients: [input],
itemAsHead: r.inputs.item[1].content.ingredient.item,
results: [ output ],
results: [output],
processingTime: r.duration * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER
}).id(`tfg:vi/curving/${recipe.getId().split(':')[1]}`)
}
@ -604,10 +605,10 @@ function registerVintageImprovementsRecipes(event) {
event.custom({
type: 'vintageimprovements:vacuumizing',
ingredients: [{ fluid: 'tfg:vulcanized_latex', amount: 250 }],
results: [{ item: 'gtceu:raw_rubber_dust'}],
results: [{ item: 'gtceu:raw_rubber_dust' }],
processingTime: 120
}).id('tfg:vi/vacuumizing/vulcanized_latex_to_raw_rubber')
// #endregion
}