Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add stonecutting recipe for Marble #1123

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions kubejs/server_scripts/fixes_tweaks/unification/tags.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ const unifyChisel = (event) => {
// regex here means
// `^` = beginning, `$` = end, `.+` = anything that isnt whitespace, any length

const IRON_BLOCKLIKES = /^chipped:(?!.+_raw_).+_iron_block$/;
const GOLD_BLOCKLIKES = /^chipped:(?!.+_raw_).+_gold_block$/;
// event.add('forge:glass/colorless', /^chipped:.+_glass$/) // most of the glass here only have fancy trims, but they are all not dyed
const IRON_BLOCKLIKES = /^chipped:(?!.+_raw_).+_iron_block$/;
const GOLD_BLOCKLIKES = /^chipped:(?!.+_raw_).+_gold_block$/;
// event.add('forge:glass/colorless', /^chipped:.+_glass$/) // most of the glass here only have fancy trims, but they are all not dyed
event.add('forge:cobblestone/normal', /^chipped:.+(?!_mossy)_cobblestone(_bricks)?$/)
event.add('forge:cobblestone/mossy', /^chipped:.+_mossy_cobblestone(_bricks)?$/)
event.add('forge:cobblestone/mossy', /^chipped:.+_mossy_cobblestone(_bricks)?$/)
event.add('forge:cobblestone', /^chipped:.+_cobblestone(_bricks)?$/)
event.add('forge:storage_blocks/glowstone', /^chipped:.+_glowstone$/)
event.add('forge:storage_blocks/redstone', /^chipped:.+_redstone_block$/)
Expand Down Expand Up @@ -68,12 +68,14 @@ ServerEvents.tags('item', event => {
// generic unification
event.add('forge:dusts', ['kubejs:pulsating_dust'])

// enderio!!!!
event.add('forge:heads', 'enderio:enderman_head')
// enderio!!!!
event.add('forge:heads', 'enderio:enderman_head')

event.add('forge:microminers', '/kubejs:microminer_t/')
event.add('forge:microminers', '/kubejs:stabilized_microminer_t/')

// For stonecutting Marble
event.add('moni:marble', /^(gtceu:(marble|polished_marble|marble_bricks|cracked_marble_bricks|chiseled_marble|marble_tile|marble_small_tile|marble_windmill_a|marble_windmill_b|small_marble_bricks|square_marble_bricks))$/)

unifyChisel(event);
})
Expand Down
14 changes: 13 additions & 1 deletion kubejs/server_scripts/random_recipes.js
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,19 @@ ServerEvents.recipes(event => {
event.stonecutting(output, input); // Make the recipe
});
});
});
});

// Stonecutting Marble
let MarbleTag = ['#moni:marble']; // What item tags to go through (change this so you have your tags)
MarbleTag.forEach(tag => {
let Marbles = Ingredient.of(tag).stacks; // Get all of the items with that tag
Marbles.forEach(input => {
Marbles.forEach(output => { // Loop through the items so all combination of input and output are met
if (input != output) // Ignore recipes where input and output are the same item
event.stonecutting(output, input); // Make the recipe
});
});
});

//LUV Components
event.remove({ id: 'gtceu:assembly_line/electric_motor_luv'})
Expand Down