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

cleaned up a bunch of stonecutter recipes, fixed suevite macerating #3156

Browse Source
This commit is contained in:
Pyritie
2026-03-17 14:53:10 +00:00
parent 62b64d0054
commit 82e54b43f9
5 changed files with 67 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kubejs/server_scripts/ae2/recipes.js
View File

@@ -2329,8 +2329,14 @@ const registerAE2Recipes = (event) => {
E: 'ae2:silicon_press'
}).id('tfg:shaped/not_so_mysterious_cube')
event.recipes.gtceu.macerator('sky_stone')
.itemInputs('#tfg:stone_composition/suevite')
event.recipes.gtceu.macerator('tfg:sky_stone')
.itemInputs('#tfg:stone_types/suevite')
.itemOutputs('ae2:sky_dust')
.EUt(2)
.duration(100)
event.recipes.gtceu.macerator('tfg:sky_stone_slab')
.itemInputs('2x #tfg:stone_types/suevite')
.itemOutputs('ae2:sky_dust')
.EUt(2)
.duration(100)

2
kubejs/server_scripts/create/recipes.js
View File

@@ -50,7 +50,7 @@ const registerCreateRecipes = (event) => {
{ id: 'create:crafting/logistics/stock_ticker_clear'},
{ id: 'create:crafting/logistics/factory_gauge_clear'},
{ output: '#create:table_cloths'}, // Gotta do this to not purge the table cloth reset recipes
{ type: 'minecraft:stonecutting' }
//{ type: 'minecraft:stonecutting' }
], mod: 'create'
})
// Make Bound Cardboard craftable with all string

4
kubejs/server_scripts/tfg/natural_blocks/recipes.collapse.js
View File

@@ -34,7 +34,9 @@ function registerTFGCollapseRecipes(event) {
})
}
event.recipes.tfc.collapse(rock.cobble.block, `#forge:ores_in_ground/${rockId}`)
if (Ingredient.of(`#forge:ores_in_ground/${rockId}`).itemIds.toArray().length > 0) {
event.recipes.tfc.collapse(rock.cobble.block, `#forge:ores_in_ground/${rockId}`)
}
event.recipes.tfc.landslide(rock.cobble.block, rock.cobble.block);

69
kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js
View File

@@ -356,29 +356,27 @@ function registerTFGRockRecipes(event) {
}
// Pillars
if (rock.bricks != null && rock.pillar != null) {
event.shaped(`2x ${rock.pillar}`, [
'A',
'A'
], {
A: rock.bricks.block
})
.id(`tfg:shaped/${rockId}_pillar`);
event.stonecutting(rock.pillar, rock.bricks.block)
.id(`tfg:stonecutting/${rockId}_pillar`);
if (rock.pillar != null) {
if (rock.bricks != null) {
event.shaped(`2x ${rock.pillar}`, [
'A',
'A'
], {
A: rock.bricks.block
})
.id(`tfg:shaped/${rockId}_pillar`);
}
}
if (rock.bricks != null && rock.pillar2 != null) {
event.shaped(`2x ${rock.pillar2}`, [
'AA'
], {
A: rock.bricks.block
})
.id(`tfg:shaped/${rockId}_pillar2`);
event.stonecutting(rock.pillar2, rock.bricks.block)
.id(`tfg:stonecutting/${rockId}_pillar2`);
if (rock.pillar2 != null) {
if (rock.bricks != null) {
event.shaped(`2x ${rock.pillar2}`, [
'AA'
], {
A: rock.bricks.block
})
.id(`tfg:shaped/${rockId}_pillar2`);
}
}
// Chiseling
@@ -414,20 +412,21 @@ function registerTFGRockRecipes(event) {
// Stonecutting
if (rock.stonecutterTag != null) {
// The create tags are already filled out, so just add the polished/chiseled blocks to it
if (rock.stonecutterTag.startsWith('create')) {
if (rock.polished != null)
event.stonecutting(rock.polished.block, `#${rock.stonecutterTag}`);
if (rock.chiseled != null)
event.stonecutting(rock.chiseled.block, `#${rock.stonecutterTag}`);
}
else {
let tag_array = Ingredient.of(`#${rock.stonecutterTag}`).itemIds.toArray().map(String);
tag_array.forEach(item => {
event.stonecutting(item, Ingredient.of(`#${rock.stonecutterTag}`).subtract(item))
.id(`tfg:stonecutter/${linuxUnfucker(item)}`)
})
}
// Pull everything out of the tag
let tag_array = Ingredient.of(`#${rock.stonecutterTag}`).itemIds.toArray().map(String);
let tag_array_half = Ingredient.of(`#${rock.stonecutterTag}_half`).itemIds.toArray().map(String);
// Remove any duplicates
tag_array = tag_array.filter((item, index) => tag_array.indexOf(item) === index);
tag_array.forEach(item => {
event.stonecutting(item, Ingredient.of(`#${rock.stonecutterTag}`).subtract(item))
.id(`tfg:stonecutter/${linuxUnfucker(item)}`)
})
tag_array_half.forEach(item => {
event.stonecutting(`2x ${item}`, Ingredient.of(`#${rock.stonecutterTag}`).subtract(item))
.id(`tfg:stonecutter/${linuxUnfucker(item)}_half`)
event.stonecutting(item, Ingredient.of(`#${rock.stonecutterTag}_half`).subtract(item))
.id(`tfg:stonecutter/${linuxUnfucker(item)}_slab_to_slab`)
})
}
// Supports

38
kubejs/server_scripts/tfg/natural_blocks/tags.stones.js
View File

@@ -19,6 +19,21 @@ function registerTFGStoneItemTags(event) {
}
}
function addToStonecutterTag(tag, entry) {
if (tag != null) {
event.add(tag, entry.block);
if (entry.stair != null) {
event.add(tag, entry.stair);
}
if (entry.wall != null) {
event.add(tag, entry.wall);
}
if (entry.slab != null) {
event.add(`${tag}_half`, entry.slab);
}
}
}
const SHAPES = ['stair', 'slab', 'wall'];
for (let [rockId, rock] of Object.entries(global.BIG_ROCK_TABLE)) {
@@ -34,8 +49,8 @@ function registerTFGStoneItemTags(event) {
}
addToTfcTag(rock.raw.block);
addToMaterialTag(material, rock.raw.block);
if (rock.brick == null && rock.stonecutterTag != null) {
event.add(rock.stonecutterTag, rock.raw.block);
if (rock.brick == null) {
addToStonecutterTag(rock.stonecutterTag, rock.raw);
}
SHAPES.forEach(shape => {
@@ -89,9 +104,7 @@ function registerTFGStoneItemTags(event) {
event.add('tfc:rock/bricks', rock.bricks.block);
addToTfcTag(rock.bricks.block);
addToMaterialTag(material, rock.bricks.block);
if (rock.stonecutterTag != null) {
event.add(rock.stonecutterTag, rock.bricks.block);
}
addToStonecutterTag(rock.stonecutterTag, rock.bricks);
SHAPES.forEach(shape => {
if (rock.bricks[shape] != null) {
@@ -150,9 +163,7 @@ function registerTFGStoneItemTags(event) {
event.add('forge:smooth_stone', rock.polished.block);
addToTfcTag(rock.polished.block);
addToMaterialTag(material, rock.polished.block);
if (rock.stonecutterTag != null) {
event.add(rock.stonecutterTag, rock.polished.block);
}
addToStonecutterTag(rock.stonecutterTag, rock.polished);
SHAPES.forEach(shape => {
if (rock.polished[shape] != null) {
@@ -173,9 +184,7 @@ function registerTFGStoneItemTags(event) {
event.add('tfc:rock/chiseled_bricks', rock.chiseled.block);
addToTfcTag(rock.chiseled.block);
addToMaterialTag(material, rock.chiseled.block);
if (rock.stonecutterTag != null) {
event.add(rock.stonecutterTag, rock.chiseled.block);
}
addToStonecutterTag(rock.stonecutterTag, rock.chiseled);
}
if (rock.gravel != null) {
@@ -237,17 +246,12 @@ function registerTFGStoneItemTags(event) {
event.add('tfc:rock/chiseled_bricks', blockForms.block);
addToTfcTag(blockForms.block);
addToMaterialTag(material, blockForms.block);
if (rock.stonecutterTag != null) {
event.add(rock.stonecutterTag, blockForms.block);
}
addToStonecutterTag(rock.stonecutterTag, blockForms);
SHAPES.forEach(shape => {
if (blockForms[shape] != null) {
addToTfcTag(blockForms[shape]);
addToMaterialTag(material, blockForms[shape]);
if (rock.stonecutterTag != null) {
event.add(rock.stonecutterTag, blockForms[shape]);
}
}
})
})