From 39d016e258e4396f2f602f7ec332774af11fe7e0 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 21 Dec 2023 09:49:48 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D1=87=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B7=D0=B0=20=D1=81=D0=BE=D0=B1=D0=BE=D0=B9=20?= =?UTF-8?q?=D0=B8=20=D0=BA=D1=83=D0=B1=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/server_scripts/ae2/recipes.js | 152 +++++------------- kubejs/startup_scripts/gtceu/constants.js | 19 --- kubejs/startup_scripts/minecraft/constants.js | 88 ---------- kubejs/startup_scripts/tfc/constants.js | 19 --- 4 files changed, 36 insertions(+), 242 deletions(-) diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index db19fbaa5..442eb8d61 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -1495,26 +1495,6 @@ const registerAE2Recipes = (event) => { .duration(8) .EUt(480) - // GT Chemical Dyes - for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_GLASS_CABLES[i] + '_gtceu_dye') - .itemInputs('ae2:fluix_glass_cable') - .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 72)) - .itemOutputs(global.AE2_GLASS_CABLES[i]) - .duration(20) - .EUt(7) - }; - - // TFC Dyes - for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_GLASS_CABLES[i] + '_tfc_dye') - .itemInputs('ae2:fluix_glass_cable') - .inputFluids(Fluid.of(global.TFC_LIQUID_DYES[i], 250)) - .itemOutputs(global.AE2_GLASS_CABLES[i]) - .duration(20) - .EUt(7) - }; - // Covered Cable event.recipes.gtceu.chemical_bath('ae2:fluix_covered_cable') .itemInputs('#ae2:covered_cable') @@ -1522,26 +1502,6 @@ const registerAE2Recipes = (event) => { .itemOutputs('ae2:fluix_covered_cable') .duration(8) .EUt(480) - - // GT Chemical Dyes - for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_COVERED_CABLES[i] + '_gtceu_dye') - .itemInputs('ae2:fluix_covered_cable') - .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 72)) - .itemOutputs(global.AE2_COVERED_CABLES[i]) - .duration(20) - .EUt(7) - }; - - // TFC Dyes - for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_COVERED_CABLES[i] + '_tfc_dye') - .itemInputs('ae2:fluix_covered_cable') - .inputFluids(Fluid.of(global.TFC_LIQUID_DYES[i], 250)) - .itemOutputs(global.AE2_COVERED_CABLES[i]) - .duration(20) - .EUt(7) - }; // Dense Covered Cable event.recipes.gtceu.chemical_bath('ae2:fluix_covered_dense_cable') @@ -1550,26 +1510,6 @@ const registerAE2Recipes = (event) => { .itemOutputs('ae2:fluix_covered_dense_cable') .duration(8) .EUt(480) - - // GT Chemical Dyes - for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_COVERED_DENSE_CABLES[i] + '_gtceu_dye') - .itemInputs('ae2:fluix_covered_dense_cable') - .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 72)) - .itemOutputs(global.AE2_COVERED_DENSE_CABLES[i]) - .duration(20) - .EUt(7) - }; - - // TFC Dyes - for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_COVERED_DENSE_CABLES[i] + '_tfc_dye') - .itemInputs('ae2:fluix_covered_dense_cable') - .inputFluids(Fluid.of(global.TFC_LIQUID_DYES[i], 250)) - .itemOutputs(global.AE2_COVERED_DENSE_CABLES[i]) - .duration(20) - .EUt(7) - }; // Smart Cable event.recipes.gtceu.chemical_bath('ae2:fluix_smart_cable') @@ -1578,26 +1518,6 @@ const registerAE2Recipes = (event) => { .itemOutputs('ae2:fluix_smart_cable') .duration(8) .EUt(480) - - // GT Chemical Dyes - for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_SMART_CABLES[i] + '_gtceu_dye') - .itemInputs('ae2:fluix_smart_cable') - .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 72)) - .itemOutputs(global.AE2_SMART_CABLES[i]) - .duration(20) - .EUt(7) - }; - - // TFC Dyes - for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_SMART_CABLES[i] + '_tfc_dye') - .itemInputs('ae2:fluix_smart_cable') - .inputFluids(Fluid.of(global.TFC_LIQUID_DYES[i], 250)) - .itemOutputs(global.AE2_SMART_CABLES[i]) - .duration(20) - .EUt(7) - }; // Dense Smart Cable event.recipes.gtceu.chemical_bath('ae2:fluix_smart_dense_cable') @@ -1606,51 +1526,53 @@ const registerAE2Recipes = (event) => { .itemOutputs('ae2:fluix_smart_dense_cable') .duration(8) .EUt(480) - - // GT Chemical Dyes + + // Cable Colorization for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_SMART_DENSE_CABLES[i] + '_gtceu_dye') + event.recipes.gtceu.chemical_bath(global.AE2_GLASS_CABLES[i] + '_dye') + .itemInputs('ae2:fluix_glass_cable') + .inputFluids(Fluid.of(`gtceu:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 72)) + .itemOutputs(global.AE2_GLASS_CABLES[i]) + .duration(20) + .EUt(7) + + event.recipes.gtceu.chemical_bath(global.AE2_COVERED_CABLES[i] + '_dye') + .itemInputs('ae2:fluix_covered_cable') + .inputFluids(Fluid.of(`gtceu:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 72)) + .itemOutputs(global.AE2_COVERED_CABLES[i]) + .duration(20) + .EUt(7) + + event.recipes.gtceu.chemical_bath(global.AE2_COVERED_DENSE_CABLES[i] + '_dye') + .itemInputs('ae2:fluix_covered_dense_cable') + .inputFluids(Fluid.of(`gtceu:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 72)) + .itemOutputs(global.AE2_COVERED_DENSE_CABLES[i]) + .duration(20) + .EUt(7) + + event.recipes.gtceu.chemical_bath(global.AE2_SMART_CABLES[i] + '_dye') + .itemInputs('ae2:fluix_smart_cable') + .inputFluids(Fluid.of(`gtceu:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 72)) + .itemOutputs(global.AE2_SMART_CABLES[i]) + .duration(20) + .EUt(7) + + event.recipes.gtceu.chemical_bath(global.AE2_SMART_DENSE_CABLES[i] + '_dye') .itemInputs('ae2:fluix_smart_dense_cable') - .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 72)) + .inputFluids(Fluid.of(`gtceu:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 72)) .itemOutputs(global.AE2_SMART_DENSE_CABLES[i]) .duration(20) .EUt(7) - }; - // TFC Dyes - for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_SMART_DENSE_CABLES[i] + '_tfc_dye') - .itemInputs('ae2:fluix_smart_dense_cable') - .inputFluids(Fluid.of(global.TFC_LIQUID_DYES[i], 250)) - .itemOutputs(global.AE2_SMART_DENSE_CABLES[i]) - .duration(20) - .EUt(7) - }; - - // Paint Balls - - // GT Chemical Dyes - for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_PAINTBALLS[i] + '_gtceu_dye') + // Paint Balls + event.recipes.gtceu.chemical_bath(global.AE2_PAINTBALLS[i] + '_dye') .itemInputs('ae2:matter_ball') - .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 36)) + .inputFluids(Fluid.of(`gtceu:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 36)) .itemOutputs(global.AE2_PAINTBALLS[i]) .duration(20) .EUt(7) - }; - // TFC Dyes - for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_PAINTBALLS[i] + '_tfc_dye') - .itemInputs('ae2:matter_ball') - .inputFluids(Fluid.of(global.TFC_LIQUID_DYES[i], 125)) - .itemOutputs(global.AE2_PAINTBALLS[i]) - .duration(20) - .EUt(7) - }; - - // Lumen Paint Ball - for (var i = 0; i < 16; i++) { + // Lumen Paint Ball event.recipes.gtceu.chemical_bath(global.AE2_LUMEN_PAINTBALLS[i] + '_gtceu_dye') .itemInputs(global.AE2_PAINTBALLS[i]) .inputFluids(Fluid.of('gtceu:glowstone', 125)) @@ -1719,7 +1641,6 @@ const registerAE2Recipes = (event) => { .duration(8000) .EUt(116) - // Quartz Fiber event.recipes.gtceu.wiremill('ae2:quartz_fiber_certus') .itemInputs('#forge:rods/certus_quartz') @@ -1733,7 +1654,6 @@ const registerAE2Recipes = (event) => { .duration(200) .EUt(7) - // Quartz Glass event.recipes.gtceu.alloy_smelter('ae2:quartz_glass') .itemInputs('5x #forge:dusts/certus_quartz', '4x #forge:glass') diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 0cdfdf31a..c60158004 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -20,23 +20,4 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:rubber_log', 'gtceu:rubber_leaves', 'gtceu:rubber_planks' -]; - -global.GTCEU_LIQUID_DYE = [ - 'gtceu:white_dye', - 'gtceu:orange_dye', - 'gtceu:magenta_dye', - 'gtceu:light_blue_dye', - 'gtceu:yellow_dye', - 'gtceu:lime_dye', - 'gtceu:pink_dye', - 'gtceu:gray_dye', - 'gtceu:light_gray_dye', - 'gtceu:cyan_dye', - 'gtceu:purple_dye', - 'gtceu:blue_dye', - 'gtceu:brown_dye', - 'gtceu:green_dye', - 'gtceu:red_dye', - 'gtceu:black_dye', ]; \ No newline at end of file diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index d41db9902..06f760506 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -676,75 +676,6 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:end_rod', 'minecraft:brush', 'minecraft:bookshelf', - - - /* - // Other - "minecraft:bookshelf", - "minecraft:chiseled_bookshelf", - "minecraft:sand", - "minecraft:suspicious_sand", - "minecraft:red_sand", - "minecraft:chest", - "minecraft:trapped_chest", - - "minecraft:wheat", - "minecraft:composter", - "minecraft:barrel", - "minecraft:blast_furnace", - "minecraft:furnace", - "minecraft:furnace_minecart", - - "minecraft:anvil", - "minecraft:chipped_anvil", - "minecraft:damaged_anvil", - "minecraft:torch", - "minecraft:lantern", - "minecraft:soul_torch", - "minecraft:soul_lantern", - "minecraft:gold_ingot", - "minecraft:copper_ingot", - - // Seeds - "minecraft:wheat_seeds", - "minecraft:pumpkin_seeds", - "minecraft:melon_seeds", - "minecraft:torchflower_seeds", - "minecraft:beetroot_seeds", - - // Fish - "minecraft:cod", - "minecraft:salmon", - "minecraft:tropical_fish", - "minecraft:pufferfish", - "minecraft:cooked_cod", - "minecraft:cooked_salmon", - - // Ores - "minecraft:netherite_scrap", - "minecraft:netherite_ingot", - "minecraft:netherite_block", - "minecraft:smithing_table", - "minecraft:netherite_block", - "minecraft:coal_ore", - "minecraft:deepslate_coal_ore", - "minecraft:iron_ore", - "minecraft:deepslate_iron_ore", - "minecraft:copper_ore", - "minecraft:deepslate_copper_ore", - "minecraft:gold_ore", - "minecraft:deepslate_gold_ore", - "minecraft:redstone_ore", - "minecraft:deepslate_redstone_ore", - "minecraft:emerald_ore", - "minecraft:deepslate_emerald_ore", - "minecraft:lapis_ore", - "minecraft:deepslate_lapis_ore", - "minecraft:diamond_ore", - "minecraft:deepslate_diamond_ore", - "minecraft:nether_gold_ore", - "minecraft:nether_quartz_ore", - "minecraft:ancient_debris",*/ ]; global.VANILLA_WOOD_TYPES = [ @@ -774,25 +705,6 @@ global.VANILLA_STONE_TYPES = [ "tuff" ]; -global.MINECRAFT_FORGE_DYES = [ - '#forge:dyes/white', - '#forge:dyes/orange', - '#forge:dyes/magenta', - '#forge:dyes/light_blue', - '#forge:dyes/yellow', - '#forge:dyes/lime', - '#forge:dyes/pink', - '#forge:dyes/gray', - '#forge:dyes/light_gray', - '#forge:dyes/cyan', - '#forge:dyes/purple', - '#forge:dyes/blue', - '#forge:dyes/brown', - '#forge:dyes/green', - '#forge:dyes/red', - '#forge:dyes/black' -]; - global.MINECRAFT_DYE_NAMES = [ 'white', 'orange', diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index c2c2092fb..71c5950fa 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -1431,25 +1431,6 @@ global.TFC_ORE_MATERIALS = [ "tetrahedrite" ]; -global.TFC_LIQUID_DYES = [ - 'tfc:white_dye', - 'tfc:orange_dye', - 'tfc:magenta_dye', - 'tfc:light_blue_dye', - 'tfc:yellow_dye', - 'tfc:lime_dye', - 'tfc:pink_dye', - 'tfc:gray_dye', - 'tfc:light_gray_dye', - 'tfc:cyan_dye', - 'tfc:purple_dye', - 'tfc:blue_dye', - 'tfc:brown_dye', - 'tfc:green_dye', - 'tfc:red_dye', - 'tfc:black_dye', -]; - global.TFC_UNFIRED_MOLDS = [ "tfc:ceramic/unfired_ingot_mold", "tfc:ceramic/unfired_pickaxe_head_mold",