From 34bdca7465de60b3090339f59abd5b062cfcd895 Mon Sep 17 00:00:00 2001 From: StarskyXIII <71606873+StarskyXIII@users.noreply.github.com> Date: Fri, 15 Nov 2024 18:56:57 +0800 Subject: [PATCH 1/2] Add stonecutting recipe for Marble --- .../fixes_tweaks/unification/tags.js | 14 ++++++++------ kubejs/server_scripts/random_recipes.js | 14 +++++++++++++- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/kubejs/server_scripts/fixes_tweaks/unification/tags.js b/kubejs/server_scripts/fixes_tweaks/unification/tags.js index b6377ff05..ab5f5cbc0 100644 --- a/kubejs/server_scripts/fixes_tweaks/unification/tags.js +++ b/kubejs/server_scripts/fixes_tweaks/unification/tags.js @@ -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$/) @@ -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|chisel_marble|marble_tile|marble_small_tile|marble_windmill_a|marble_windmill_b|small_marble_bricks|square_marble_bricks))$/) unifyChisel(event); }) diff --git a/kubejs/server_scripts/random_recipes.js b/kubejs/server_scripts/random_recipes.js index 6b5c8e491..d8bf5b174 100644 --- a/kubejs/server_scripts/random_recipes.js +++ b/kubejs/server_scripts/random_recipes.js @@ -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'}) From 1dda76bf879cae5dd2c4d2e796e027fe37bc8ec9 Mon Sep 17 00:00:00 2001 From: StarskyXIII <71606873+StarskyXIII@users.noreply.github.com> Date: Fri, 15 Nov 2024 19:04:05 +0800 Subject: [PATCH 2/2] Fix tag typo --- kubejs/server_scripts/fixes_tweaks/unification/tags.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/fixes_tweaks/unification/tags.js b/kubejs/server_scripts/fixes_tweaks/unification/tags.js index ab5f5cbc0..13024264f 100644 --- a/kubejs/server_scripts/fixes_tweaks/unification/tags.js +++ b/kubejs/server_scripts/fixes_tweaks/unification/tags.js @@ -75,7 +75,7 @@ ServerEvents.tags('item', event => { event.add('forge:microminers', '/kubejs:stabilized_microminer_t/') // For stonecutting Marble - event.add('moni:marble', /^(gtceu:(marble|polished_marble|marble_bricks|cracked_marble_bricks|chisel_marble|marble_tile|marble_small_tile|marble_windmill_a|marble_windmill_b|small_marble_bricks|square_marble_bricks))$/) + 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); })