From 4af73459754eecccbe0ec25d03d7b2aee551cebd Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 9 Jan 2025 23:13:21 +0000 Subject: [PATCH 01/33] re-enable things for multiblocks dragon egg, end stone, netherrack, nether bricks Signed-off-by: Pyritie --- kubejs/startup_scripts/minecraft/constants.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 329cfd31d..9275ca1d7 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -83,7 +83,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:prismarine_shard', // Эндстоун - 'minecraft:end_stone', + //'minecraft:end_stone', 'minecraft:end_stone_bricks', 'minecraft:end_stone_brick_stairs', 'minecraft:end_stone_brick_slab', @@ -491,8 +491,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:burn_pottery_sherd', // Шаблоны брони - 'minecraft:wayfinder_armor_trim_smithing_template', - 'minecraft:netherite_upgrade_smithing_template', + /*'minecraft:wayfinder_armor_trim_smithing_template', 'minecraft:dune_armor_trim_smithing_template', 'minecraft:snout_armor_trim_smithing_template', 'minecraft:shaper_armor_trim_smithing_template', @@ -507,7 +506,8 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:raiser_armor_trim_smithing_template', 'minecraft:wild_armor_trim_smithing_template', 'minecraft:sentry_armor_trim_smithing_template', - 'minecraft:ward_armor_trim_smithing_template', + 'minecraft:ward_armor_trim_smithing_template',*/ + 'minecraft:netherite_upgrade_smithing_template', // Свечи 'minecraft:candle', @@ -700,7 +700,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:mushroom_stem', 'minecraft:brown_mushroom_block', 'minecraft:red_mushroom_block', - 'minecraft:dragon_egg', + //'minecraft:dragon_egg', 'minecraft:end_portal_frame', 'minecraft:mushroom_stew', 'minecraft:structure_void', @@ -766,8 +766,8 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:polished_blackstone_brick_stairs', 'minecraft:polished_blackstone_brick_slab', 'minecraft:polished_blackstone_brick_wall', - 'minecraft:netherrack', - 'minecraft:nether_bricks', + //'minecraft:netherrack', + //'minecraft:nether_bricks', 'minecraft:cracked_nether_bricks', 'minecraft:nether_brick_stairs', 'minecraft:nether_brick_slab', From 013c4f4fb5c0f3070d018cda7187f3fde79a5ada Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 9 Jan 2025 23:17:16 +0000 Subject: [PATCH 02/33] new lang strings for the terrariums Signed-off-by: Pyritie --- kubejs/assets/gtceu/lang/en_us.json | 7 ++++++- kubejs/assets/gtceu/lang/ru_ru.json | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 2aa6312fc..ffc710e1e 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -6,6 +6,11 @@ "block.gtceu.alternator": "Alternator", "gtceu.alternator": "Alternator", + + "block.gtceu.nether_dome": "Netherarium", + "gtceu.nether_dome": "Netherarium", + "block.gtceu.end_dome": "Enderarium", + "gtceu.end_dome": "Enderarium", "material.treated_wood": "Creosote-Treated Wood", "block.gtceu.treated_wood_planks": "Creosote-Treated Wood Planks", @@ -49,4 +54,4 @@ "block.gtceu.luv_kinetic_output_box": "Ludicrous Voltage Kinetic Output Box", "block.gtceu.zpm_kinetic_output_box": "ZPM Voltage Kinetic Output Box", "block.gtceu.uv_kinetic_output_box": "Ultimate Voltage Kinetic Output Box" -} +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/lang/ru_ru.json b/kubejs/assets/gtceu/lang/ru_ru.json index 0b2d775e3..b155c028d 100644 --- a/kubejs/assets/gtceu/lang/ru_ru.json +++ b/kubejs/assets/gtceu/lang/ru_ru.json @@ -6,6 +6,11 @@ "block.gtceu.alternator": "Генератор переменного тока", "gtceu.alternator": "Генератор переменного тока", + + "block.gtceu.nether_dome": "Террариум нижнего мира", + "gtceu.nether_dome": "Террариум нижнего мира", + "block.gtceu.end_dome": "Террариум края", + "gtceu.end_dome": "Террариум края", "material.treated_wood": "Обработанное креозотом дерево", "block.gtceu.treated_wood_planks": "Доски из обработанного креозотом дерева" From 543162157434eb31beed2592f936b5f79f3f150a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 9 Jan 2025 23:18:10 +0000 Subject: [PATCH 03/33] multiblock definitions Signed-off-by: Pyritie --- kubejs/startup_scripts/gtceu/machines.js | 163 ++++++++++++++++++- kubejs/startup_scripts/gtceu/recipe_types.js | 17 ++ 2 files changed, 179 insertions(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 0a415b613..f6afbb4c8 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -24,7 +24,7 @@ const registerGTCEuMachines = (event) => { ) .workableCasingRenderer('gtceu:block/casings/solid/machine_casing_solid_steel', 'gtceu:block/multiblock/implosion_compressor', false) - event.create('alternator', 'multiblock') + event.create('alternator', 'multiblock') .rotationState(RotationState.NON_Y_AXIS) .recipeType('alternator') .pattern(definition => FactoryBlockPattern.start() @@ -44,4 +44,165 @@ const registerGTCEuMachines = (event) => { "gtceu:block/casings/solid/machine_casing_solid_steel", "gtceu:block/multiblock/implosion_compressor", false ) + + event.create('nether_dome', 'multiblock') + .rotationState(RotationState.NON_Y_AXIS) + .recipeType('nether_dome') + .appearanceBlock(GTBlocks.CASING_PTFE_INERT) + .pattern(definition => FactoryBlockPattern.start() + .aisle(" CCCCC ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " F ") + .aisle("CBBBBBC", "Q#####Q", "Q#####Q", "Q#####Q", "QTTTTTQ", " QQQQQ ") + .aisle("CBBBBBC", "Q#####Q", "Q#####Q", "Q#####Q", "QTTTTTQ", " QQQQQ ") + .aisle("CBBBBBC", "F#####F", "F#####F", "F#####F", "FTTTTTF", "FQQQQQF") + .aisle("CBBBBBC", "Q#####Q", "Q#####Q", "Q#####Q", "QTTTTTQ", " QQQQQ ") + .aisle("CBBBBBC", "Q#####Q", "Q#####Q", "Q#####Q", "QTTTTTQ", " QQQQQ ") + .aisle(" CCXCC ", " QGOGQ ", " QOPOQ ", " QOPOQ ", " QGOGQ ", " ") + .where('X', Predicates.controller(Predicates.blocks(definition.get()))) + .where('B', Predicates.blocks('tfc:rock/magma/basalt').setMinGlobalLimited(6) + .or(Predicates.blocks('minecraft:netherrack').setMinGlobalLimited(10))) + .where('T', Predicates.blocks('minecraft:glowstone').setMinGlobalLimited(5) + .or(Predicates.blocks('minecraft:netherrack').setMinGlobalLimited(10))) + .where('O', Predicates.blocks('minecraft:obsidian')) + .where('F', Predicates.frames('black_steel')) + .where('Q', Predicates.blocks('ae2:quartz_glass')) + .where('G', Predicates.blocks('minecraft:gold_block') + .or(Predicates.blocks('tfc:rock/raw/basalt')) + .or(Predicates.blocks('tfc:rock/hardened/basalt')) + .or(Predicates.blocks('tfc:rock/bricks/basalt')) + .or(Predicates.blocks('tfc:rock/chiseled/basalt')) + .or(Predicates.blocks('minecraft:obsidian')) + .or(Predicates.blocks('minecraft:nether_bricks'))) + .where('P', Predicates.blocks('minecraft:purple_stained_glass_pane')) + .where('C', Predicates.blocks(GTBlocks.CASING_PTFE_INERT.get()).setMinGlobalLimited(10) + .or(Predicates.autoAbilities(definition.getRecipeTypes())) + .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1))) + .where('#', Predicates.air() + .or(Predicates.blocks('minecraft:netherrack')) + .or(Predicates.blocks('tfc:rock/magma/basalt')) + .or(Predicates.blocks('minecraft:glowstone')) + .or(Predicates.blocks('minecraft:nether_bricks'))) + .where(' ', Predicates.any()) + .build() + ) + .shapeInfo(controller => MultiblockShapeInfo.builder() + .aisle(" CeCeC ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " F ") + .aisle("CMMMNNC", "Q NQ", "Q Q", "Q Q", "QNTTNNQ", " QQQQQ ") + .aisle("iMMNNNf", "QR Q", "QR Q", "Q T Q", "QNTTTNQ", " QQQQQ ") + .aisle("CNMMMNC", "F NF", "F F", "F F", "FNNTNNF", "FQQQQQF") + .aisle("tNNNMNl", "Q NQ", "Q NQ", "Q Q", "QNNNNNQ", " QQQQQ ") + .aisle("CNNNNNC", "QN NNQ", "Q NQ", "Q NQ", "QNNNNNQ", " QQQQQ ") + .aisle(" mCXCC ", " QGOGQ ", " QOPOQ ", " QOPOQ ", " QGOGQ ", " ") + .where('X', controller, Direction.SOUTH) + .where('C', GTBlocks.CASING_PTFE_INERT.get()) + .where('N', Block.getBlock('minecraft:netherrack')) + .where('M', Block.getBlock('tfc:rock/magma/basalt')) + .where('T', Block.getBlock('minecraft:glowstone')) + .where('Q', Block.getBlock('ae2:quartz_glass')) + .where('F', Block.getBlock('gtceu:black_steel_frame')) + .where('G', Block.getBlock('minecraft:gold_block')) + .where('O', Block.getBlock('minecraft:obsidian')) + .where('P', Block.getBlock('minecraft:purple_stained_glass_pane')) + .where('R', Block.getBlock('minecraft:nether_bricks')) + .where(' ', Block.getBlock('minecraft:air')) + + .where('m', GTMachines.MAINTENANCE_HATCH, Direction.SOUTH) + .where('i', GTMachines.ITEM_IMPORT_BUS[GTValues.ULV], Direction.WEST) + .where('t', GTMachines.ITEM_EXPORT_BUS[GTValues.ULV], Direction.WEST) + .where('f', GTMachines.FLUID_IMPORT_HATCH[GTValues.MV], Direction.EAST) + .where('l', GTMachines.FLUID_EXPORT_HATCH[GTValues.MV], Direction.EAST) + .where('e', GTMachines.ENERGY_INPUT_HATCH[GTValues.MV], Direction.NORTH) + .build() + ) + .workableCasingRenderer( + "gtceu:block/casings/solid/machine_casing_inert_ptfe", + "gtceu:block/machines/gas_collector", false + ) + + event.create('end_dome', 'multiblock') + .rotationState(RotationState.NON_Y_AXIS) + .recipeType('end_dome') + .appearanceBlock(GTBlocks.CASING_TITANIUM_STABLE) + .pattern(definition => FactoryBlockPattern.start() + .aisle(" CCCCC ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " P ", " ") + .aisle("CBBBBBC", "QOOOOOQ", "QOOOOOQ", "QOOOOOQ", "QOOOOOQ", " QSSSQ ", " GGG ") + .aisle("CBBBBBC", "QOOOOOQ", "QOOOOOQ", "QOOOOOQ", "QOOOOOQ", " SNNNS ", " G G ") + .aisle("CBBBBBC", "FOOEOOF", "FOOOOOF", "FOOOOOF", "FOOOOOF", "PSNNNSP", " G G ") + .aisle("CBBBBBC", "QOOOOOQ", "QOOOOOQ", "QOOOOOQ", "QOOOOOQ", " SNNNS ", " G G ") + .aisle("CBBBBBC", "QOOOOOQ", "QOOOOOQ", "QOOOOOQ", "QOOOOOQ", " QSSSQ ", " GGG ") + .aisle(" CCXCC ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " P ", " ") + .where('X', Predicates.controller(Predicates.blocks(definition.get()))) + .where('B', Predicates.blocks('minecraft:end_stone').setMinGlobalLimited(20) + .or(Predicates.blocks('minecraft:black_concrete'))) + .where('O', Predicates.blocks('minecraft:obsidian').setMinGlobalLimited(8) + .or(Predicates.air())) + .where('F', Predicates.frames('titanium')) + .where('Q', Predicates.blocks('ae2:quartz_glass')) + .where('P', Predicates.blocks('gtceu:ender_pearl_block')) + .where('E', Predicates.blocks('minecraft:dragon_egg')) + .where('S', Predicates.blocks('minecraft:end_stone')) + .where('N', Predicates.blocks('minecraft:black_concrete')) + .where('G', Predicates.blocks('tfc:ore/small_malachite') + .or(Predicates.blocks('tfc:ore/small_native_copper')) + .or(Predicates.blocks('tfc:ore/small_native_gold')) + .or(Predicates.blocks('tfc:ore/small_hematite')) + .or(Predicates.blocks('tfc:ore/small_native_silver')) + .or(Predicates.blocks('tfc:ore/small_cassiterite')) + .or(Predicates.blocks('tfc:ore/small_bismuthinite')) + .or(Predicates.blocks('tfc:ore/small_garnierite')) + .or(Predicates.blocks('tfc:ore/small_malachite')) + .or(Predicates.blocks('tfc:ore/small_magnetite')) + .or(Predicates.blocks('tfc:ore/small_limonite')) + .or(Predicates.blocks('tfc:ore/small_sphalerite')) + .or(Predicates.blocks('tfc:ore/small_tetrahedrite'))) + .where('C', Predicates.blocks(GTBlocks.CASING_TITANIUM_STABLE.get()).setMinGlobalLimited(10) + .or(Predicates.autoAbilities(definition.getRecipeTypes())) + .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1))) + .where(' ', Predicates.any()) + .build() + ) + .shapeInfo(controller => MultiblockShapeInfo.builder() + .aisle(" CeCeC ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " P ", " ") + .aisle("CBBBBBC", "Q O Q", "Q O Q", "Q Q", "Q Q", " QSSSQ ", " 123 ") + .aisle("iBBBBBf", "QO OQ", "QO Q", "QO Q", "Q Q", " SNNNS ", " y 4 ") + .aisle("CBBBBBC", "F E F", "F F", "F F", "F F", "PSNNNSP", " z 5 ") + .aisle("tBBBBNl", "Q O Q", "Q O Q", "Q Q", "Q Q", " SNNNS ", " 0 6 ") + .aisle("CNBBNNC", "Q Q", "Q Q", "Q Q", "Q Q", " QSSSQ ", " 987 ") + .aisle(" mCXCC ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " P ", " ") + .where('X', controller, Direction.SOUTH) + .where('C', GTBlocks.CASING_TITANIUM_STABLE.get()) + .where('B', Block.getBlock('minecraft:end_stone')) + .where('N', Block.getBlock('minecraft:black_concrete')) + .where('O', Block.getBlock('minecraft:obsidian')) + .where('F', Block.getBlock('gtceu:titanium_frame')) + .where('Q', Block.getBlock('ae2:quartz_glass')) + .where(' ', Block.getBlock('minecraft:air')) + .where('S', Block.getBlock('minecraft:end_stone_bricks')) + .where('P', Block.getBlock('gtceu:ender_pearl_block')) + .where('E', Block.getBlock('minecraft:dragon_egg')) + + .where('1', Block.getBlock('tfc:ore/small_native_copper')) + .where('2', Block.getBlock('tfc:ore/small_native_gold')) + .where('3', Block.getBlock('tfc:ore/small_hematite')) + .where('4', Block.getBlock('tfc:ore/small_native_silver')) + .where('5', Block.getBlock('tfc:ore/small_cassiterite')) + .where('6', Block.getBlock('tfc:ore/small_bismuthinite')) + .where('7', Block.getBlock('tfc:ore/small_garnierite')) + .where('8', Block.getBlock('tfc:ore/small_malachite')) + .where('9', Block.getBlock('tfc:ore/small_magnetite')) + .where('0', Block.getBlock('tfc:ore/small_limonite')) + .where('z', Block.getBlock('tfc:ore/small_sphalerite')) + .where('y', Block.getBlock('tfc:ore/small_tetrahedrite')) + + .where('m', GTMachines.MAINTENANCE_HATCH, Direction.SOUTH) + .where('i', GTMachines.ITEM_IMPORT_BUS[GTValues.ULV], Direction.WEST) + .where('t', GTMachines.ITEM_EXPORT_BUS[GTValues.ULV], Direction.WEST) + .where('f', GTMachines.FLUID_IMPORT_HATCH[GTValues.MV], Direction.EAST) + .where('l', GTMachines.FLUID_EXPORT_HATCH[GTValues.MV], Direction.EAST) + .where('e', GTMachines.ENERGY_INPUT_HATCH[GTValues.HV], Direction.NORTH) + .build() + ) + .workableCasingRenderer( + "gtceu:block/casings/solid/machine_casing_stable_titanium", + "gtceu:block/machines/gas_collector", false + ) } \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index eb4144c95..7f6f60476 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -15,5 +15,22 @@ const registerGTCEuRecipeTypes = (event) => { .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.ARC) .setMaxTooltips(6) + + + event.create('nether_dome') + .category('nether_dome') + .setEUIO('in') + .setMaxIOSize(1, 1, 1, 1) + .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.FIRE) + + event.create('end_dome') + .category('end_dome') + .setEUIO('in') + .setMaxIOSize(1, 1, 1, 1) + .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.FIRE) } From 1707781a0a1bb8d641f35b31b607e724806ae0a2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 10 Jan 2025 23:15:19 +0000 Subject: [PATCH 04/33] updated multiblocks Signed-off-by: Pyritie --- kubejs/startup_scripts/gtceu/machines.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index f6afbb4c8..de2de707d 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -123,13 +123,13 @@ const registerGTCEuMachines = (event) => { .recipeType('end_dome') .appearanceBlock(GTBlocks.CASING_TITANIUM_STABLE) .pattern(definition => FactoryBlockPattern.start() - .aisle(" CCCCC ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " P ", " ") + .aisle(" CCCCC ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " F ", " ") .aisle("CBBBBBC", "QOOOOOQ", "QOOOOOQ", "QOOOOOQ", "QOOOOOQ", " QSSSQ ", " GGG ") .aisle("CBBBBBC", "QOOOOOQ", "QOOOOOQ", "QOOOOOQ", "QOOOOOQ", " SNNNS ", " G G ") - .aisle("CBBBBBC", "FOOEOOF", "FOOOOOF", "FOOOOOF", "FOOOOOF", "PSNNNSP", " G G ") + .aisle("CBBBBBC", "FOOEOOF", "FOOOOOF", "FOOOOOF", "FOOOOOF", "FSNNNSF", " G G ") .aisle("CBBBBBC", "QOOOOOQ", "QOOOOOQ", "QOOOOOQ", "QOOOOOQ", " SNNNS ", " G G ") .aisle("CBBBBBC", "QOOOOOQ", "QOOOOOQ", "QOOOOOQ", "QOOOOOQ", " QSSSQ ", " GGG ") - .aisle(" CCXCC ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " P ", " ") + .aisle(" CCXCC ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " F ", " ") .where('X', Predicates.controller(Predicates.blocks(definition.get()))) .where('B', Predicates.blocks('minecraft:end_stone').setMinGlobalLimited(20) .or(Predicates.blocks('minecraft:black_concrete'))) @@ -137,9 +137,8 @@ const registerGTCEuMachines = (event) => { .or(Predicates.air())) .where('F', Predicates.frames('titanium')) .where('Q', Predicates.blocks('ae2:quartz_glass')) - .where('P', Predicates.blocks('gtceu:ender_pearl_block')) .where('E', Predicates.blocks('minecraft:dragon_egg')) - .where('S', Predicates.blocks('minecraft:end_stone')) + .where('S', Predicates.blocks('tfg:artificial_end_portal_frame')) .where('N', Predicates.blocks('minecraft:black_concrete')) .where('G', Predicates.blocks('tfc:ore/small_malachite') .or(Predicates.blocks('tfc:ore/small_native_copper')) @@ -161,13 +160,13 @@ const registerGTCEuMachines = (event) => { .build() ) .shapeInfo(controller => MultiblockShapeInfo.builder() - .aisle(" CeCeC ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " P ", " ") + .aisle(" CeCeC ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " F ", " ") .aisle("CBBBBBC", "Q O Q", "Q O Q", "Q Q", "Q Q", " QSSSQ ", " 123 ") .aisle("iBBBBBf", "QO OQ", "QO Q", "QO Q", "Q Q", " SNNNS ", " y 4 ") - .aisle("CBBBBBC", "F E F", "F F", "F F", "F F", "PSNNNSP", " z 5 ") + .aisle("CBBBBBC", "F E F", "F F", "F F", "F F", "FSNNNSF", " z 5 ") .aisle("tBBBBNl", "Q O Q", "Q O Q", "Q Q", "Q Q", " SNNNS ", " 0 6 ") .aisle("CNBBNNC", "Q Q", "Q Q", "Q Q", "Q Q", " QSSSQ ", " 987 ") - .aisle(" mCXCC ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " P ", " ") + .aisle(" mCXCC ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " QQFQQ ", " F ", " ") .where('X', controller, Direction.SOUTH) .where('C', GTBlocks.CASING_TITANIUM_STABLE.get()) .where('B', Block.getBlock('minecraft:end_stone')) @@ -176,8 +175,7 @@ const registerGTCEuMachines = (event) => { .where('F', Block.getBlock('gtceu:titanium_frame')) .where('Q', Block.getBlock('ae2:quartz_glass')) .where(' ', Block.getBlock('minecraft:air')) - .where('S', Block.getBlock('minecraft:end_stone_bricks')) - .where('P', Block.getBlock('gtceu:ender_pearl_block')) + .where('S', Block.getBlock('tfg:artificial_end_portal_frame')) .where('E', Block.getBlock('minecraft:dragon_egg')) .where('1', Block.getBlock('tfc:ore/small_native_copper')) From 55492435cef9a4802379c7ca2fec63d5c21e49e3 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 10 Jan 2025 23:16:05 +0000 Subject: [PATCH 05/33] terrarium recipes Signed-off-by: Pyritie --- kubejs/server_scripts/tfg/terrariums.js | 233 ++++++++++++++++++++++++ 1 file changed, 233 insertions(+) create mode 100644 kubejs/server_scripts/tfg/terrariums.js diff --git a/kubejs/server_scripts/tfg/terrariums.js b/kubejs/server_scripts/tfg/terrariums.js new file mode 100644 index 000000000..e93c725b0 --- /dev/null +++ b/kubejs/server_scripts/tfg/terrariums.js @@ -0,0 +1,233 @@ +ServerEvents.recipes(event => { + + event.remove({ id: 'gtceu:gas_collector/nether_air' }) + event.remove({ id: 'minecraft:netherite_upgrade_smithing_template' }) + event.remove({ id: 'gtceu:gas_collector/ender_air' }) + event.remove({ id: 'gtceu:macerator/macerate_end_stone' }) + event.remove({ id: 'minecraft:ender_chest' }) + event.remove({ id: 'gtceu:assembler/ender_chest' }) + event.remove({ id: 'minecraft:end_crystal' }) + event.remove({ id: 'gtceu:assembler/end_crystal' }) + + // nether slurry + + event.recipes.gtceu.mixer('tfg:nether_slurry') + .itemInputs('gtceu:basalt_dust', 'minecraft:blaze_powder', 'minecraft:gold_nugget') + .inputFluids(Fluid.of('minecraft:lava', 1000)) + .outputFluids(Fluid.of('tfg:nether_slurry', 1000)) + .duration(200) + .EUt(512) + + event.recipes.gtceu.mixer('tfg:enriched_nether_slurry') + .itemInputs('minecraft:quartz', 'minecraft:redstone') + .inputFluids(Fluid.of('tfg:nether_slurry', 2000)) + .outputFluids(Fluid.of('tfg:enriched_nether_slurry', 2000)) + .duration(200) + .EUt(512) + + // nether air + + event.recipes.gtceu.nether_dome('tfg:slurry_to_air') + .inputFluids(Fluid.of('tfg:nether_slurry', 100)) + .outputFluids(Fluid.of('gtceu:nether_air', 32000)) + .duration(200) + .EUt(256) + + event.recipes.gtceu.nether_dome('tfg:enriched_slurry_to_air') + .inputFluids(Fluid.of('tfg:enriched_nether_slurry', 100)) + .outputFluids(Fluid.of('gtceu:nether_air', 128000)) + .duration(200) + .EUt(256) + + event.recipes.gtceu.nether_dome('tfg:quartz') + .itemInputs('gtceu:quartzite_gem') + .inputFluids(Fluid.of('tfg:nether_slurry', 25)) + .itemOutputs('minecraft:quartz') + .duration(200) + .EUt(512) + + // netherarium + + /*event.shaped('gtceu:nether_dome', [ + 'GCB', + 'DEH', + 'FAF' + ], { + A: 'minecraft:flint_and_steel', + B: 'minecraft:gold_nugget', + C: 'minecraft:blaze_rod', + D: 'minecraft:quartz', + E: 'gtceu:hv_gas_collector', + F: 'gtceu:dense_obsidian_plate', + G: 'minecraft:rotten_flesh', + H: 'minecraft:bone' + }).id('tfg:shaped/nether_dome')*/ + + event.shaped('gtceu:nether_dome', [ + 'ADA', + 'CEC', + 'FBF' + ], { + A: 'minecraft:quartz', + B: 'minecraft:gold_block', + C: 'minecraft:blaze_rod', + D: 'gtceu:hv_emitter', + E: 'gtceu:hv_gas_collector', + F: 'gtceu:dense_obsidian_plate' + }).id('tfg:shaped/nether_dome2') + + // netherrack + + event.recipes.gtceu.chemical_bath('tfg:netherrack') + .itemInputs('#forge:stone') + .inputFluids(Fluid.of('gtceu:blaze', 144)) + .itemOutputs('minecraft:netherrack') + .duration(200) + .EUt(512) + + event.recipes.gtceu.macerator('tfg:obsidian') + .itemInputs('minecraft:obsidian') + .itemOutputs('gtceu:obsidian_dust') + .duration(100) + .EUt(512) + + // nether bricks + + event.shaped('4x minecraft:nether_bricks', [ + 'ABA', + 'BAB', + 'ABA' + ], { + A: 'minecraft:nether_brick', + B: 'tfc:mortar' + }).id('tfg:shaped/nether_bricks') + + event.recipes.gtceu.assembler('tfg:nether_bricks') + .itemInputs('5x minecraft:nether_brick') + .itemOutputs('4x minecraft:nether_bricks') + .inputFluids(Fluid.of('gtceu:concrete', 72)) + .duration(50) + .EUt(2) + + // ender slurry + + event.recipes.gtceu.mixer('tfg:ender_slurry') + .itemInputs('gtceu:obsidian_dust', 'minecraft:end_stone') + .inputFluids(Fluid.of('gtceu:helium', 200), Fluid.of('gtceu:radon', 50)) + .outputFluids(Fluid.of('tfg:ender_slurry', 250)) + .duration(200) + .EUt(2048) + + event.recipes.gtceu.mixer('tfg:enriched_ender_slurry') + .itemInputs('minecraft:chorus_fruit', 'ae2:ender_dust') + .inputFluids(Fluid.of('tfg:ender_slurry', 500)) + .outputFluids(Fluid.of('tfg:enriched_ender_slurry', 500)) + .duration(200) + .EUt(2048) + + // ender air + + event.recipes.gtceu.end_dome('tfg:slurry_to_air') + .inputFluids(Fluid.of('tfg:ender_slurry', 25)) + .outputFluids(Fluid.of('gtceu:ender_air', 32000)) + .duration(200) + .EUt(1024) + + event.recipes.gtceu.end_dome('tfg:enriched_slurry_to_air') + .inputFluids(Fluid.of('tfg:enriched_ender_slurry', 25)) + .outputFluids(Fluid.of('gtceu:ender_air', 128000)) + .duration(200) + .EUt(1024) + + event.recipes.gtceu.end_dome('tfg:pearls') + .itemInputs('gtceu:quantum_eye') + .inputFluids(Fluid.of('tfg:ender_slurry', 10)) + .itemOutputs('2x minecraft:ender_pearl') + .duration(200) + .EUt(2048) + + // enderarium + + /*event.recipes.gtceu.assembler('tfg:end_dome') + .itemInputs('12x minecraft:ender_eye', 'minecraft:chorus_fruit', 'minecraft:end_crystal', '#minecraft:beds', 'gtceu:ev_gas_collector', 'tfc:metal/bars/wrought_iron', 'minecraft:bow', 'minecraft:end_stone', 'minecraft:obsidian') + .itemOutputs('gtceu:end_dome') + .duration(600) + .EUt(2048)*/ + + event.shaped('gtceu:end_dome', [ + 'DAD', + 'CEC', + 'FBF' + ], { + A: 'gtceu:ev_emitter', + B: 'minecraft:end_stone', + C: 'tfc:metal/bars/wrought_iron', + D: 'minecraft:end_crystal', + E: 'gtceu:ev_gas_collector', + F: 'gtceu:dense_obsidian_plate' + }).id('tfg:shaped/end_dome') + + // parts for the ender dome + + event.shaped('minecraft:end_crystal', [ + 'AAA', + 'ABA', + 'ACA' + ], { + A: 'gtceu:tempered_glass', + B: 'gtceu:quantum_eye', + C: '#forge:exquisite_gems' + }).id('tfg:shaped/end_crystal') + + // chorus fruit + + event.recipes.gtceu.large_chemical_reactor('tfg:chorus_fruit_uranium') + .itemInputs('#tfc:foods/fruits', 'gtceu:uranium_235_dust') + .itemOutputs('minecraft:chorus_fruit', 'gtceu:uranium_dust') + .duration(500) + .EUt(480) + + event.recipes.gtceu.large_chemical_reactor('tfg:chorus_fruit_plutonium') + .itemInputs('#tfc:foods/fruits', 'gtceu:plutonium_241_dust') + .itemOutputs('minecraft:chorus_fruit', 'gtceu:plutonium_dust') + .duration(200) + .EUt(480) + + event.recipes.gtceu.centrifuge('tfg:kovarex') + .itemInputs('40x gtceu:uranium_235_dust', '5x gtceu:uranium_dust') + .itemOutputs('41x gtceu:uranium_235_dust', '2x gtceu:uranium_dust') + .duration(1000) + .EUt(512) + + // end stone + + + event.recipes.gtceu.chemical_bath('tfg:end_stone') + .itemInputs('#forge:stone') + .inputFluids(Fluid.of('gtceu:argon', 100)) + .itemOutputs('minecraft:end_stone') + .duration(100) + .EUt(2048) + + // dragon egg + + event.recipes.gtceu.chemical_bath('tfg:dragon_egg') + .itemInputs('#forge:eggs') + .inputFluids(Fluid.of('gtceu:thorium', 1296)) + .itemOutputs('minecraft:dragon_egg') + .duration(2000) + .EUt(2048) + + // end portal frame + + event.shaped('tfg:artificial_end_portal_frame', [ + 'A', + 'B', + 'C' + ], { + A: 'minecraft:ender_eye', + B: 'minecraft:cyan_carpet', + C: 'minecraft:end_stone' + }).id('tfg:shaped/artificial_end_portal_frame') +}) + From 11c3737c5ece342754f98420021a45da3176d8de Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 10 Jan 2025 23:19:20 +0000 Subject: [PATCH 06/33] update main_server_script.js Signed-off-by: Pyritie --- kubejs/startup_scripts/main_server_script.js | 143 +++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 kubejs/startup_scripts/main_server_script.js diff --git a/kubejs/startup_scripts/main_server_script.js b/kubejs/startup_scripts/main_server_script.js new file mode 100644 index 000000000..5adb7f640 --- /dev/null +++ b/kubejs/startup_scripts/main_server_script.js @@ -0,0 +1,143 @@ +// priority: 1 + +/** + * Событие регистрации предмет-тэгов. + */ +ServerEvents.tags('item', event => { + registerAE2ItemTags(event) + registerAsticorCartsItemTags(event) + registerChiselAndBitsItemTags(event) + registerComputerCraftItemTags(event) + registerCreateItemTags(event) + registerCreateAdditionsItemTags(event) + registerExtendedAE2ItemTags(event) + registerFirmaCivItemTags(event) + registerFirmaLifeItemTags(event) + registerFramedBlocksItemTags(event) + registerFTBQuestsItemTags(event) + registerGTCEUItemTags(event) + registerMegaCellsItemTags(event) + registerMinecraftItemTags(event) + registerMoreRedItemTags(event) + registerHotOrNotItemTags(event) + registerRailWaysItemTags(event) + registerSophisticatedBackpacksItemTags(event) + registerTFCItemTags(event) +}) + +/** + * Событие регистрации блок-тэгов. + */ +ServerEvents.tags('block', event => { + registerAE2BlockTags(event) + registerAsticorCartsBlockTags(event) + registerChiselAndBitsBlockTags(event) + registerComputerCraftBlockTags(event) + registerCreateBlockTags(event) + registerCreateAdditionsBlockTags(event) + registerExtendedAE2BlockTags(event) + registerFirmaCivBlockTags(event) + registerFirmaLifeBlockTags(event) + registerFramedBlocksBlockTags(event) + registerFTBQuestsBlockTags(event) + registerGTCEUBlockTags(event) + registerMegaCellsBlockTags(event) + registerMinecraftBlockTags(event) + registerMoreRedBlockTags(event) + registerHotOrNotBlockTags(event) + registerRailWaysBlockTags(event) + registerSophisticatedBackpacksBlockTags(event) + registerTFCBlockTags(event) +}) + +/** + * Событие регистрации жидкость-тэгов. + */ +ServerEvents.tags('fluid', event => { + registerCreateFluidTags(event) + registerCreateAdditionsFluidTags(event) + registerFirmaLifeBlockTags(event) + registerTFCFluidTags(event) +}) + +/** + * Событие регистрации тегов структур. + */ +ServerEvents.tags('worldgen/placed_feature', event => { + registerFirmaLifePlacedFeatures(event) + registerTFCPlacedFeatures(event) +}) + +/** + * Событие регистрации датапаков (Здесь можно регистрировать теги, данные, рецепты, общий метод короче). + * Срабатывает до инициализации рецептов, но после тегов. + */ +ServerEvents.highPriorityData(event => { + registerComputerCraftData(event) +}) + +/** + * Событие регистрации датапаков для TFC (Здесь можно регистрировать теги, данные, рецепты, общий метод короче). + * Срабатывает до инициализации рецептов, но после тегов. + */ +TFCEvents.data(event => { + registerTFCDataForGTCEU(event) + registerTFCDataForTFC(event) + registerTFCDataForTreeTap(event) + registerTFCDataForWaterFlasks(event) +}) + +/** + * Событие регистрации лут-тейблов. + * Срабатывает до инициализации рецептов, но после датапаков и тегов. + */ +LootJS.modifiers((event) => { + registerGTCEULoots(event) +}); + +/** + * Событие регистрации рудных жил. + * Не представляю когда срабатывает, но явно после тегов и датапаков. + */ +GTCEuServerEvents.oreVeins(event => { + // event.removeAll() +}) + +/** + * Событие регистрации рецептов. + * Срабатывает после инициализации датапаков и тегов. + */ +ServerEvents.recipes(event => { + registerAE2Recipes(event) + registerAsticorCartsRecipes(event) + registerAE2InsertExportCardRecipes(event) + registerAE2NetworkAnalyzerRecipes(event) + registerAE2WTLibRecipes(event) + registerChiselAndBitsRecipes(event) + registerComputerCraftRecipes(event) + registerCreateRecipes(event) + registerCreateAdditionsRecipes(event) + registerCreateConnectedRecipes(event) + registerExtendedAE2Recipes(event) + registerExposureRecipes(event) + registerEtchedRecipes(event) + registerFirmaCivRecipes(event) + registerFirmaLifeRecipes(event) + registerFramedBlocksRecipes(event) + registerFTBQuestsRecipes(event) + registerGTCEURecipes(event) + registerHandGliderRecipes(event) + registerHotOrNotRecipes(event) + registerMegaCellsRecipes(event) + registerMERequesterRecipes(event) + registerMinecraftRecipes(event) + registerMoreRedRecipes(event) + registerRailWaysRecipes(event) + registerSophisticatedBackpacksRecipes(event) + registerTfceaRecipes(event) + registerTFCRecipes(event) + registerTFCGroomingStationRecipes(event) + registerToolBeltRecipes(event) + registerTreeTapRecipes(event) + registerWaterFlasksRecipes(event) +}) \ No newline at end of file From 4602044a59bb081d90e215cede7dfcedda54c448 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 10 Jan 2025 23:20:11 +0000 Subject: [PATCH 07/33] add new blocks + fluids Signed-off-by: Pyritie --- kubejs/startup_scripts/tfg/blocks.js | 11 +++++++++++ kubejs/startup_scripts/tfg/fluids.js | 28 ++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 kubejs/startup_scripts/tfg/blocks.js create mode 100644 kubejs/startup_scripts/tfg/fluids.js diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js new file mode 100644 index 000000000..e9fe4451b --- /dev/null +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -0,0 +1,11 @@ +const registerTFGBlocks = (event) => { + + event.create('tfg:artificial_end_portal_frame') + .stoneSoundType() + .tagBlock('minecraft:mineable/pickaxe') + .requiresTool(true) + .fullBlock(true) + .item(item => { + item.modelJson({ parent: 'minecraft:block/end_portal_frame' }) + }) +} \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/fluids.js b/kubejs/startup_scripts/tfg/fluids.js new file mode 100644 index 000000000..0e475ab81 --- /dev/null +++ b/kubejs/startup_scripts/tfg/fluids.js @@ -0,0 +1,28 @@ +const registerTFGFluids = (event) => { + + event.create('tfg:nether_slurry') + .thickTexture(0x6b281b) + .bucketColor(0x6b281b) + .temperature(1000) + .luminosity(7) + .noBlock() + + event.create('tfg:enriched_nether_slurry') + .thickTexture(0x99594d) + .bucketColor(0x99594d) + .temperature(1000) + .luminosity(7) + .noBlock() + + event.create('tfg:ender_slurry') + .thickTexture(0x1b5c51) + .bucketColor(0x1b5c51) + .luminosity(2) + .noBlock() + + event.create('tfg:enriched_ender_slurry') + .thickTexture(0x3a9178) + .bucketColor(0x3a9178) + .luminosity(2) + .noBlock() +} \ No newline at end of file From 538f6c89522ac580127bef26f74ad569f5bfce12 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 10 Jan 2025 23:20:57 +0000 Subject: [PATCH 08/33] add model for artificial end portal frame Signed-off-by: Pyritie --- .../block/artificial_end_portal_frame.json | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 kubejs/assets/tfg/models/block/artificial_end_portal_frame.json diff --git a/kubejs/assets/tfg/models/block/artificial_end_portal_frame.json b/kubejs/assets/tfg/models/block/artificial_end_portal_frame.json new file mode 100644 index 000000000..1b8e182a0 --- /dev/null +++ b/kubejs/assets/tfg/models/block/artificial_end_portal_frame.json @@ -0,0 +1,84 @@ +{ + "textures": { + "particle": "block/end_portal_frame_side", + "bottom": "block/end_stone", + "top": "block/end_portal_frame_top", + "side": "block/end_portal_frame_side", + "eye": "block/end_portal_frame_eye" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 0, + 3, + 16, + 16 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 0, + 3, + 16, + 16 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 0, + 3, + 16, + 16 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 0, + 3, + 16, + 16 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} \ No newline at end of file From a1d402eba69f952cef788b9abaa1011da1ccdba0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 10 Jan 2025 23:21:53 +0000 Subject: [PATCH 09/33] update minecraft/constants.js Signed-off-by: Pyritie --- kubejs/startup_scripts/minecraft/constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 9275ca1d7..2b1c7cf7c 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -666,7 +666,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:honey_bottle', 'minecraft:honeycomb_block', 'minecraft:honey_block', - 'minecraft:chorus_fruit', + //'minecraft:chorus_fruit', 'minecraft:popped_chorus_fruit', 'minecraft:purpur_pillar', 'minecraft:purpur_block', From 04407db64941f860f46296b7827f762ef420a41b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 10 Jan 2025 23:23:02 +0000 Subject: [PATCH 10/33] update gregtech/recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/gregtech/recipes.js | 136 +++++++++++++--------- 1 file changed, 80 insertions(+), 56 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 650a3c2dc..a53dda3d4 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1050,12 +1050,11 @@ const registerGTCEURecipes = (event) => { event.remove({ id: 'gtceu:extractor/extract_raw_rubber_dust' }) // Пыль звезды незера - // TODO: удалить после имплементации ада event.recipes.gtceu.chemical_reactor('tfg:gtceu/nether_star_dust') .itemInputs('2x #forge:dusts/iridium', '#forge:dusts/diamond') .circuit(10) .itemOutputs('gtceu:nether_star_dust') - .inputFluids(Fluid.of('gtceu:sulfur_dioxide', 6000), Fluid.of('gtceu:carbon_monoxide', 8000)) + .inputFluids(Fluid.of('gtceu:nether_air', 1000)) .duration(700) .EUt(2720) @@ -1277,16 +1276,82 @@ const registerGTCEURecipes = (event) => { .EUt(24) //#endregion - - // Add circuit to assembler recipe for redstone lamp. - // Avoids conflict with AE2 smart cables. - event.remove({ id: 'gtceu:assembler/redstone_lamp' }) - event.recipes.gtceu.assembler('redstone_lamp') - .itemInputs('4x #forge:dusts/redstone', '4x #forge:dusts/glowstone') - .itemOutputs('1x minecraft:redstone_lamp') - .circuit(1) - .duration(100) - .EUt(1) + + //#region remove LV casing exploit + + /*event.remove({ id: 'gtceu:assembler/casing_lv' }) + event.recipes.gtceu.assembler('tfg:assembler/casing_lv') + .itemInputs('4x gtceu:blue_steel_plate', '4x gtceu:red_steel_plate') + .itemOutputs('gtceu:lv_machine_casing') + .circuit(8) + .duration(50) + .EUt(16)*/ + + //#endregion + + //#region make colored steel a bit easier to compensate + + event.recipes.gtceu.arc_furnace('tfg:black_steel_dust_to_ingot') + .itemInputs('gtceu:black_steel_dust') + .itemOutputs('gtceu:black_steel_ingot') + .inputFluids(Fluid.of('gtceu:oxygen', 72)) + .duration(500) + .EUt(24) + + event.recipes.gtceu.arc_furnace('tfg:red_steel_dust_to_ingot') + .itemInputs('gtceu:red_steel_dust') + .itemOutputs('gtceu:red_steel_ingot') + .inputFluids(Fluid.of('gtceu:oxygen', 72)) + .duration(700) + .EUt(32) + + event.recipes.gtceu.arc_furnace('tfg:blue_steel_dust_to_ingot') + .itemInputs('gtceu:blue_steel_dust') + .itemOutputs('gtceu:blue_steel_ingot') + .inputFluids(Fluid.of('gtceu:oxygen', 72)) + .duration(700) + .EUt(32) + + //#endregion + + //#region add regular furnace recipes for other tfc alloys + + event.remove({id: 'gtceu:electric_blast_furnace/blast_bismuth_bronze' }) + event.remove({id: 'gtceu:electric_blast_furnace/blast_bismuth_bronze_gas' }) + event.remove({id: 'gtceu:electric_blast_furnace/blast_black_bronze' }) + event.remove({id: 'gtceu:electric_blast_furnace/blast_black_bronze_gas' }) + event.remove({id: 'gtceu:vacuum_freezer/cool_hot_black_bronze_ingot' }) + event.remove({id: 'gtceu:vacuum_freezer/black_bronze' }) + event.remove({id: 'gtceu:electric_blast_furnace/blast_sterling_silver' }) + event.remove({id: 'gtceu:electric_blast_furnace/blast_sterling_silver_gas' }) + event.remove({id: 'gtceu:electric_blast_furnace/blast_rose_gold' }) + event.remove({id: 'gtceu:electric_blast_furnace/blast_rose_gold_gas' }) + + event.recipes.gtceu.electric_furnace('tfg:bismuth_bronze_dust_to_ingot') + .itemInputs('gtceu:bismuth_bronze_dust') + .itemOutputs('gtceu:bismuth_bronze_ingot') + .duration(200) + .EUt(16) + + event.recipes.gtceu.electric_furnace('tfg:black_bronze_dust_to_ingot') + .itemInputs('gtceu:black_bronze_dust') + .itemOutputs('gtceu:black_bronze_ingot') + .duration(200) + .EUt(16) + + event.recipes.gtceu.electric_furnace('tfg:sterling_silver_dust_to_ingot') + .itemInputs('gtceu:sterling_silver_dust') + .itemOutputs('gtceu:sterling_silver_ingot') + .duration(300) + .EUt(20) + + event.recipes.gtceu.electric_furnace('tfg:rose_gold_dust_to_ingot') + .itemInputs('gtceu:rose_gold_dust') + .itemOutputs('gtceu:rose_gold_ingot') + .duration(300) + .EUt(20) + + //#endregion //#region Рецепты, которые итерируются по всем материалам @@ -1465,51 +1530,10 @@ const registerGTCEURecipes = (event) => { } }); + //#endregion - - // Fix LV recycling producing red/blue steel. - // Replace red steel outputs with 8x steel, delete blue steel outputs. - event.replaceOutput( - /gtceu:arc_furnace\/arc_lv_.*/, - '#forge:ingots/red_steel', - '8x #forge:ingots/steel') - - event.replaceOutput( - /gtceu:arc_furnace\/arc_lv_.*/, - '#forge:ingots/blue_steel', - '') - - event.replaceOutput( - /gtceu:macerator\/macerate_lv_.*/, - '#forge:dusts/red_steel', - '8x #forge:dusts/steel') - - event.replaceOutput( - /gtceu:macerator\/macerate_lv_.*/, - '#forge:dusts/blue_steel', - '') - - // Clear NBT on tanks with shapeless crafts. - const TANK_NAMES = [ - "lv_super", - "mv_super", - "hv_super", - "ev_super", - "iv_quantum", - "luv_quantum", - "zpm_quantum", - "uv_quantum", - "uhv_quantum", - ] - - TANK_NAMES.forEach(prefix => { - // Craft super tanks to remove their NBT data. - event.shapeless(`gtceu:${prefix}_tank`, [`gtceu:${prefix}_tank`]) - // Craft super chests to remove their NBT data. - event.shapeless(`gtceu:${prefix}_chest`, [`gtceu:${prefix}_chest`]) - }) - - //#region fix more duping + + //#region fix more duping // red alloy, because crucible always makes 4+1=5 From 10d69af86f8043f5ac8446bf5baf131200230d81 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 10 Jan 2025 23:23:26 +0000 Subject: [PATCH 11/33] update tooltips.js Signed-off-by: Pyritie --- kubejs/client_scripts/tooltips.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 323f0ead5..0ae8ec39b 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -1,4 +1,7 @@ ItemEvents.tooltip(event => { + event.addAdvanced(['tfc:red_kaolin_clay','tfc:pink_kaolin_clay','tfc:white_kaolin_clay','gtceu:brass_block'], (item, advanced, text) => { + text.add(1, [text.of('Used in glassblowing as a replacement for Brass Plated Blocks')]) + }) event.addAdvanced(['gtceu:lv_macerator','gtceu:mv_macerator', 'gtceu:hp_steam_macerator'], (item, advanced, text) => { text.add(1, [text.of('Only outputs the first slot shown in EMI/JEI until HV.')]) }) @@ -23,4 +26,12 @@ ItemEvents.tooltip(event => { event.addAdvanced(['firmalife:beehive'], (item, advanced, text) => { text.add(1, [text.of('Needs to be filled with empty frames and surrounded by flowers to attract bees.')]) }) + event.addAdvanced(['gtceu:nether_dome'], (item, advanced, text) => { + text.add(1, text.of('Artificial enviroment to simulate the Nether.')), + text.add(2, text.of(`The interior is customizable! Check the multiblock preview in JEI.`)) + }) + event.addAdvanced(['gtceu:end_dome'], (item, advanced, text) => { + text.add(1, text.of('Artificial enviroment to simulate the End.')), + text.add(2, text.of(`The interior is customizable! Check the multiblock preview in JEI.`)) + }) }) From fc8a824a531ab8aaa2952d7ea8cef77545bc5138 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 17:15:47 +0000 Subject: [PATCH 12/33] Update tfg_tips.json Signed-off-by: Pyritie --- .../patchouli_books/field_guide/en_us/categories/tfg_tips.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/categories/tfg_tips.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/categories/tfg_tips.json index d390c9ee9..eed90bbe8 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/categories/tfg_tips.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/categories/tfg_tips.json @@ -1,6 +1,6 @@ { "name": "TFG Info & Tips", - "description": "Differences in TerraFirmaGreg that are different from base TFC and GTCEu.$(br2)Stuck on something? Try looking in this book first or in the quests, and if you're still stumped, you can ask on our $(l:https://discord.com/invite/AEaCzCTUwQ)Discord$() or $(l:https://www.reddit.com/r/TerraFirmaGreg)Subreddit$()!", + "description": "Information about things in TerraFirmaGreg that are different from base TFC and GTCEu.", "icon": "gtceu:basic_electronic_circuit", "sortnum": 200 } From 15ffc51f1b7264679fc1136dd9b9a0db0ecce736 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 17:16:16 +0000 Subject: [PATCH 13/33] added tips files Signed-off-by: Pyritie --- .../en_us/entries/tfg_tips/faqs.json | 48 +++++++++++ .../entries/tfg_tips/infinite_resources.json | 55 +++++++++++++ .../en_us/entries/tfg_tips/lv_machines.json | 79 +++++++++++++++++++ 3 files changed, 182 insertions(+) create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/faqs.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/infinite_resources.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/lv_machines.json diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/faqs.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/faqs.json new file mode 100644 index 000000000..de92fcfc6 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/faqs.json @@ -0,0 +1,48 @@ +{ + "name": "Frequently Asked Questions", + "icon": "minecraft:spyglass", + "category": "tfc:tfg_tips", + "read_by_default": true, + "priority": true, + "pages": + [ + { + "type": "patchouli:text", + "title": "FAQs", + "text": "Stuck on something? Try looking through this book first and in the quests, but if you're still stumped, you can ask on our $(l:https://discord.com/invite/AEaCzCTUwQ)Discord$() or $(l:https://www.reddit.com/r/TerraFirmaGreg)Subreddit$()!" + }, + { + "type": "patchouli:text", + "text": "$(li)$(l:tfg_tips/faqs#boats)Why did my boat sink?$()$(li)$(l:tfg_tips/faqs#dried_fruit)How do I make yeast starter?$()$(li)$(l:tfg_tips/faqs#dried_fruit)How do I make pineapple fiber?$()$(li)$(l:tfg_tips/faqs#jam)How do I make jam?$()$(li)$(l:tfg_tips/faqs#resin)How do I make Sticky Resin?$()$(li)$(l:tfg_tips/faqs#chunks)How do I force-load a chunk or increase my limit?$()" + }, + { + "type": "patchouli:text", + "anchor": "boats", + "text": "$(italic)Why did my boat sink?$()$(br2)Build your boat on land, then push it or use a $(item)Lead$() to launch it. If it's already sunk, too bad, make another one." + }, + { + "type": "patchouli:text", + "anchor": "dried_fruit", + "text": "$(italic)How do I make yeast starter or pineapple fiber?$()$(br2)Make sure you dry the fruit first using a $(item)Drying Mat$(). Then follow the rest of the steps for $(l:firmalife/bread)bread$() or $(l:firmalife/berry_bushes)pineapple leather$()." + }, + { + "type": "patchouli:text", + "anchor": "jam", + "text": "$(italic)How do I make jam?$()$(br2)It's easiest with a $(l:firmalife/oven_appliances#vat)Vat$(). Follow the steps in that section, but you don't need to make a $(thing)Jarring Station$() or $(thing)Lids$() unless you want to automate it. Just right-click the Vat of $(thing)Fruity Fluid$() with an empty jar, then right-click it again to take it out, and it should be full of jam and sealed.$(br2)Make sure you $(bold)close the lid$() on the Vat with $(item)$(k:sneak)$() + $(item)$(k:use)$()!" + }, + { + "type": "patchouli:text", + "anchor": "chunks", + "text": "$(italic)How do I force-load a chunk?$()$(br2)Open your map with $(item)$(k:gui.xaero_open_map)$(), then right-click the chunk > $(thing)Claim Selected$(). Right-click a claimed chunk again > $(thing)Forceload Selected$().$(br2)To increase the number of forceloaded chunks, press $(item)$(k:gui.xaero_pac_key_open_menu)$(), then go to the player settings and increase the number of bonus chunk forceloads." + }, + { + "type": "patchouli:text", + "anchor": "resin", + "text": "$(italic)How do I make sticky resin?$()$(br2)First, grow some $(thing)Kapok$() trees and make some $(thing)Tree Taps$(). Place a tree tap on the main trunk of each kapok tree (more taps on a tree just splits the output). Right-click each tree tap with an empty $(thing)Wooden Bucket$(), then wait for the correct season (Feb-Oct, excluding July). When the bucket is full, $(item)$(k:use)$() it with an $(thing)empty hand$(). You can automate this with a $(l:mechanics/pumps)Mechanical Pump$() on the bucket, if you'd like." + }, + { + "type": "patchouli:text", + "text": "It's quickest to cook your latex in a $(l:firmalife/oven_appliances#vat)Vat$(). Combine your latex with $(item)Sulfur$() dust in the vat (put the GregTech one in a Quern to get the TFC one), add heat, and $(bold)close the lid$() on the Vat with $(item)$(k:sneak)$() + $(item)$(k:use)$().$(br2)You can automate this later with the $(thing)LV Centrifuge$()." + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/infinite_resources.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/infinite_resources.json new file mode 100644 index 000000000..b2824f969 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/infinite_resources.json @@ -0,0 +1,55 @@ +{ + "name": "Infinite Resources?!", + "icon": "minecraft:lava_bucket", + "category": "tfc:tfg_tips", + "read_by_default": true, + "pages": + [ + { + "type": "patchouli:text", + "text": "Most of the raw resources you'll need are non-renewable and will require you to mine for them, but a few of them are infinitely renewable once you get to $(thing)LV$() and $(thing)MV$().$(br2)A lot of these methods are pretty slow, however, so it's up to you whether it's worth setting these up or just digging up another ore vein." + }, + { + "type": "patchouli:spotlight", + "title": "Fluids", + "item": "create:hose_pulley", + "text": "$(thing)Water$(), $(thing)Sea Water$(), and $(thing)Lava$() are all renewable through a $(item)Hose Pulley$() and a single source block of fluid. You can pull out of the hose pulley with a $(l:mechanics/pumps)Mechanical Pump$()." + }, + { + "type": "patchouli:text", + "text": "$(item)Sea Water$() can be centrifuged for Water and $(thing)Salt$(), which can be electrolyzed into $(thing)Chlorine$() and $(thing)Sodium$().$(br2)$(item)Lava$() can be centrifuged into $(thing)Gold Nuggets$(), $(thing)Tantalite$(), $(thing)Sapphire$(), $(thing)Quicklime$(), and $(thing)Silicon Dioxide$().$(br2)Lava can also be used as $(item)infinite, free fuel$() for your steam boilers!" + }, + { + "type": "patchouli:spotlight", + "title": "Stone Dusts", + "item": { "tag": "tfg:stone_dusts" }, + "text": "The other source of infinite resources is through $(thing)Stone Dusts$(). You can obtain infinite raw rock through a $(item)Rock Crusher$(), and then macerate it into different dusts.$(br2)These stone dusts can then be centrifuged into different resources (though most require $(thing)MV$()). Most of them give Silicon Dioxide and Oxygen, so only other resources will be listed. " + }, + { + "type": "patchouli:text", + "title": "Sedimentary", + "text": "$(thing)Shale$(): Sodium, Metal Mixture$(br)$(thing)Claystone$(): Aluminium, Hematite$(br)$(thing)Limestone$(): Calcium, Metal Mixture$(br)$(thing)Conglomerate$(): Tricalcium Phosphate, Hematite$(br)$(thing)Dolomite$(): Magnesium, Calcium, Metal Mixture$(br)$(thing)Chert$(): Metal Mixture$(br)$(thing)Chalk$(): Calcium, Carbon, Metal Mixture" + }, + { + "type": "patchouli:text", + "title": "Metamorphic", + "text": "$(thing)Quartzite$(): Nothing$(br)$(thing)Slate$(): Metal Mixture$(br)$(thing)Phyllite$(): Calcium Chloride$(br)$(thing)Schist$(): Mica (Fluorine), Talc (Magnesium), Graphite, Metal Mixture$(br)$(thing)Gneiss$(): Biotite (Fluorine)$(br)$(thing)Marble$(): Magnesium, Calcite" + }, + { + "type": "patchouli:text", + "title": "Igneous Intrusive", + "text": "$(thing)Granite$(): Calcite, Flint$(br)$(thing)Gabbro$(): Titanium, Iron, Metal Mixture$(br)$(thing)Diorite$(): Clay, Aluminium, Sulfur, Sodium, Lithium" + }, + { + "type": "patchouli:text", + "title": "Igneous Extrusive", + "text": "$(thing)Rhyolite$(): Metal Mixture$(br)$(thing)Basalt$(): Olivine, Calcite, Flint, Dark Ashes$(br)$(thing)Andesite$(): Asbestos, Saltpeter$(br)$(thing)Dacite$(): Sodium, Calcium, Aluminium, Metal Mixture" + }, + { + "type": "patchouli:spotlight", + "title": "Dimensional Terrariums", + "item": "gtceu:nether_dome,gtceu:end_dome", + "text": "Later on, you'll be able to use the $(item)Netherarium$() and $(item)Enderarium$() to make $(thing)Redstone$(), $(thing)Nether Quartz$(), and $(thing)Ender Pearls$() renewable." + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/lv_machines.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/lv_machines.json new file mode 100644 index 000000000..20814fe0d --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/lv_machines.json @@ -0,0 +1,79 @@ +{ + "name": "Which LV machine first?", + "icon": "gtceu:lv_machine_hull", + "category": "tfc:tfg_tips", + "read_by_default": true, + "pages": + [ + { + "type": "patchouli:text", + "text": "So you've finally made a batch of colored steel and are ready to make your first step into $(thing)LV$(). The obvious first choice for an LV machine is a $(item)Steam Generator$(), but what about after that? There's so many options!$(br2)There's no simple answer to this, because it's subjective, but you should think of which part of progressing is the most painful and make the machine that helps the most with that.$(br)" + }, + { + "type": "patchouli:spotlight", + "item": "gtceu:lv_mixer", + "title": "Mixer", + "text": "The $(item)Mixer$() makes colored steel much cheaper.$(br2)The kinetic mixer requires both SU and EU (and has a high stress impact and needs to run at 64 RPM), but runs twice as fast as the pure electric one.$(br)Whether that's worth the bother is up to you!$(br2)It also has a recipe to make $(thing)Glowstone$().$(br)" + }, + { + "type": "patchouli:spotlight", + "item": "gtceu:lv_assembler", + "title": "Assembler", + "text": "The $(item)Assembler$() is a very expensive machine, but can make LV casings just out of 8 steel (though this will likely change in future versions) and cheaper electronic components like $(thing)Vacuum Tubes$() and $(thing)Resistors$()." + }, + { + "type": "patchouli:spotlight", + "item": "gtceu:lv_bender", + "title": "Bender", + "text": "The $(item)Bender$() can make 1:1 $(thing)Plates$() out of a single ingot. Finally, no more gambling with the Mechanical Press!$(br2)It can also make $(thing)Thin Sheets$() for things like a $(l:tfg_tips/infinite_resources)Hose Pulley$()." + }, + { + "type": "patchouli:spotlight", + "item": "gtceu:lv_wiremill", + "title": "Wiremill", + "text": "The $(item)Wiremill$() halves the cost of $(thing)Wire$(). Not much else to say here, except that there's no such thing as too many copper wires or tin cables." + }, + { + "type": "patchouli:spotlight", + "title": "Chem Reactor/Solidifer", + "item": "gtceu:lv_chemical_reactor,gtceu:lv_fluid_solidifier", + "text": "The $(item)Chemical Reactor$() makes much cheaper $(thing)Rubber$() which the $(item)Fluid Solidifier$() can turn into cheaper $(thing)Rubber Sheets$(), and can also make cheaper $(thing)Rotors$().$(br2)The $(item)Extractor$() is also useful paired up with the Fluid Solidifier, and is a big upgrade over the steam one because it can make metal fluids." + }, + { + "type": "patchouli:spotlight", + "title": "Centrifuge", + "item": "gtceu:lv_centrifuge", + "text": "The $(item)Centrifuge$() makes $(thing)Sticky Resin$() directly from Kapok logs, and much cheaper $(thing)Raw Rubber$() as well. No more latex!" + }, + { + "type": "patchouli:spotlight", + "title": "Polarizer", + "item": "gtceu:lv_polarizer", + "text": "The $(item)Polarizer$() makes $(thing)Magnetic Rods$() basically for free. If you're short on redstone, this is a good first machine, and it's dirt cheap too." + }, + { + "type": "patchouli:spotlight", + "title": "Miner", + "item": "gtceu:lv_miner", + "text": "Put the $(item)Miner$() (or multiple!) down over an ore vein, bring along a boiler, steam generator, water, and fuel, and then just chunk load it and walk away. No need to ever go mining again!" + }, + { + "type": "patchouli:spotlight", + "title": "Chemical Bath", + "item": "gtceu:lv_chemical_bath", + "text": "The $(item)Chemical Bath$() makes cheaper paper. That's about it. And once you have an $(thing)Assembler$() you won't need paper any more anyway.$(br2)It can also automate most of the steps to make $(thing)Leather$() if you're tired of barrels." + }, + { + "type": "patchouli:spotlight", + "title": "Arc Furnace", + "item": "gtceu:lv_arc_furnace", + "text": "It's not a good first machine, but the $(item)Arc Furnace$() can turn Cast Iron directly into $(thing)Wrought Iron$(), Sand into $(thing)Glass$(), and Copper into $(thing)Annealed Copper$(). All of its recipes need $(thing)Oxygen$() though, so it's useless without an $(item)Electrolyzer$() or $(item)Centrifuge$()." + }, + { + "type": "patchouli:spotlight", + "title": "Extruder", + "item": "gtceu:lv_extruder", + "text": "This is only here as a warning: do not make the $(item)Extruder$(). The only thing it can do is make tools and Thin Rubber Sheets (which the Bender can also do). All of the good extruder recipes are gated to $(thing)MV$() onwards." + } + ] +} \ No newline at end of file From 38b162fa3df111af8ef7172882f41218d6522a86 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 17:17:01 +0000 Subject: [PATCH 14/33] Update index.json Signed-off-by: Pyritie From 547e1dae9ad21c923f0e2a168595f653e3569da8 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 18:01:35 +0000 Subject: [PATCH 15/33] adjusted glowstone recipe Signed-off-by: Pyritie --- kubejs/server_scripts/minecraft/recipes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 921c3b673..0aa85775f 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -3262,8 +3262,8 @@ const registerMinecraftRecipes = (event) => { //#region Glowstone event.recipes.gtceu.mixer('gtceu:lv_glowstone') - .inputFluids(Fluid.of('gtceu:creosote', 1000), Fluid.of('gtceu:distilled_water', 1000)) - .itemInputs('gtceu:stone_dust', 'minecraft:redstone', 'gtceu:sulfur_dust', 'gtceu:sodium_dust') + .inputFluids(Fluid.of('gtceu:creosote', 1000)) + .itemInputs('gtceu:gold_dust', 'minecraft:redstone', 'gtceu:sulfur_dust', 'gtceu:coal_dust') .itemOutputs('minecraft:glowstone_dust') .circuit(32) .duration(1200) From c0efaf5340a45e3d302d0914745f99cc03b8f6f0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 18:05:47 +0000 Subject: [PATCH 16/33] missed nether_brick Signed-off-by: Pyritie --- kubejs/startup_scripts/minecraft/constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 2b1c7cf7c..ca7218bb3 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -815,7 +815,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:wither_skeleton_skull', 'minecraft:weeping_vines', 'minecraft:crimson_roots', - 'minecraft:nether_brick', + //'minecraft:nether_brick', 'minecraft:nether_wart', 'minecraft:twisting_vines', 'minecraft:warped_fungus', From 3d7c02ccf351767f5f00044749d5f0f060c648ec Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 18:22:19 +0000 Subject: [PATCH 17/33] Update main_startup_script.js Signed-off-by: Pyritie --- kubejs/startup_scripts/main_startup_script.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index b36fa8b48..3cf9d793a 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -12,8 +12,7 @@ StartupEvents.registry('item', event => { */ StartupEvents.registry('block', event => { registerGTCEuBlocks(event) - - + registerTFGBlocks(event) }) /** @@ -31,7 +30,9 @@ ItemEvents.modification(event => {}) /** * Событие регистрации жидкостей. */ -StartupEvents.registry('fluid', event => {}) +StartupEvents.registry('fluid', event => { + registerTFGFluids(event) +}) /** * Событие регистрации типов рецептов. @@ -52,4 +53,4 @@ GTCEuStartupEvents.registry('gtceu:machine', event => { */ // TFGStartupEvents.materialInfo(event => { // registerGTCEuMaterialInfo(event) -// }) \ No newline at end of file +// }) From 98b9452ade71989f84b1119bebbf447dd9642645 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 19:40:29 +0000 Subject: [PATCH 18/33] Update tags.js Signed-off-by: Pyritie --- kubejs/server_scripts/gregtech/tags.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index 23f04da80..6917a4e25 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -39,6 +39,8 @@ const registerGTCEUItemTags = (event) => { event.add('tfg:stone_dusts', 'gtceu:stone_dust') + event.remove('minecraft:planks', 'gtceu:treated_wood_planks') + //#endregion } From 289bcae162ed244c5315b7c363707f83ff820770 Mon Sep 17 00:00:00 2001 From: Sergey Semin Date: Sat, 11 Jan 2025 23:35:29 +0300 Subject: [PATCH 19/33] electric leather --- kubejs/server_scripts/tfc/recipes.js | 115 +++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 2cb401eb8..1b618ecbf 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -3074,6 +3074,121 @@ const registerTFCRecipes = (event) => { // А где? //#endregion + // Бумага + event.recipes.gtceu.cutter('tfg:unrefined_paper') + .itemInputs('tfc:unrefined_paper') + .itemOutputs('minecraft:paper') + .duration(100) + .EUt(16) + + // Limewater + event.recipes.gtceu.mixer('tfg:limewater_from_lime') + .itemInputs('tfc:powder/lime') + .inputFluids(Fluid.of('water', 500)) + .outputFluids(Fluid.of('tfc:limewater', 500)) + .duration(20) + .EUt(16) + + event.recipes.gtceu.mixer('tfg:limewater_from_flux') + .itemInputs('tfc:powder/flux') + .inputFluids(Fluid.of('water', 500)) + .outputFluids(Fluid.of('tfc:limewater', 500)) + .duration(20) + .EUt(16) + + // Tannin + event.recipes.gtceu.chemical_bath('tfg:tannin') + .itemInputs('#tfc:makes_tannin') + .inputFluids(Fluid.of('water', 1000)) + .outputFluids(Fluid.of('tfc:tannin', 1000)) + .duration(2400) + .EUt(16) + + // Soaked hides + event.recipes.gtceu.chemical_bath('tfg:small_soaked_hide') + .itemInputs('tfc:small_raw_hide') + .inputFluids(Fluid.of('tfc:limewater', 300)) + .itemOutputs('tfc:small_soaked_hide') + .duration(1600) + .EUt(16) + + event.recipes.gtceu.chemical_bath('tfg:medium_soaked_hide') + .itemInputs('tfc:medium_raw_hide') + .inputFluids(Fluid.of('tfc:limewater', 400)) + .itemOutputs('tfc:medium_soaked_hide') + .duration(2400) + .EUt(16) + + event.recipes.gtceu.chemical_bath('tfg:large_soaked_hide') + .itemInputs('tfc:large_raw_hide') + .inputFluids(Fluid.of('tfc:limewater', 500)) + .itemOutputs('tfc:large_soaked_hide') + .duration(3200) + .EUt(16) + + // Scraped Hides + event.recipes.gtceu.cutter('tfg:small_scraped_hide') + .itemInputs('tfc:small_soaked_hide') + .itemOutputs('tfc:small_scraped_hide') + .duration(100) + .EUt(16) + + event.recipes.gtceu.cutter('tfg:medium_scraped_hide') + .itemInputs('tfc:medium_soaked_hide') + .itemOutputs('tfc:medium_scraped_hide') + .duration(100) + .EUt(16) + + event.recipes.gtceu.cutter('tfg:large_scraped_hide') + .itemInputs('tfc:large_soaked_hide') + .itemOutputs('tfc:large_scraped_hide') + .duration(100) + .EUt(16) + + // Prepared hides + event.recipes.gtceu.chemical_bath('tfg:small_prepared_hide') + .itemInputs('tfc:small_soaked_hide') + .inputFluids(Fluid.of('water', 300)) + .itemOutputs('tfc:small_prepared_hide') + .duration(1600) + .EUt(16) + + event.recipes.gtceu.chemical_bath('tfg:medium_prepared_hide') + .itemInputs('tfc:medium_soaked_hide') + .inputFluids(Fluid.of('water', 400)) + .itemOutputs('tfc:medium_prepared_hide') + .duration(2400) + .EUt(16) + + event.recipes.gtceu.chemical_bath('tfg:large_prepared_hide') + .itemInputs('tfc:large_soaked_hide') + .inputFluids(Fluid.of('water', 500)) + .itemOutputs('tfc:large_prepared_hide') + .duration(3200) + .EUt(16) + + // Leather + event.recipes.gtceu.chemical_bath('tfg:small_leather') + .itemInputs('tfc:small_prepared_hide') + .inputFluids(Fluid.of('tfc:tannin', 300)) + .itemOutputs('minecraft:leather') + .duration(1600) + .EUt(16) + + event.recipes.gtceu.chemical_bath('tfg:medium_leather') + .itemInputs('tfc:medium_prepared_hide') + .inputFluids(Fluid.of('tfc:tannin', 400)) + .itemOutputs('2x minecraft:leather') + .duration(2400) + .EUt(16) + + event.recipes.gtceu.chemical_bath('tfg:large_leather') + .itemInputs('tfc:large_prepared_hide') + .inputFluids(Fluid.of('tfc:tannin', 500)) + .itemOutputs('3x minecraft:leather') + .duration(3200) + .EUt(16) + // Другое event.remove({ id: `tfc:crafting/trip_hammer` }) event.remove({ id: `tfc:anvil/steel_pump` }) From fc2c349be8fbd13e5922e5a63cdf44d63692a49d Mon Sep 17 00:00:00 2001 From: Sergey Semin Date: Sun, 12 Jan 2025 01:29:47 +0300 Subject: [PATCH 20/33] electric cheese, tomato sauce and cream --- kubejs/server_scripts/tfc/recipes.js | 134 ++++++++++++++++++++++++ kubejs/server_scripts/tfc/tags.js | 5 + kubejs/startup_scripts/tfc/constants.js | 7 ++ 3 files changed, 146 insertions(+) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 2cb401eb8..ea6a886bd 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -3044,6 +3044,140 @@ const registerTFCRecipes = (event) => { //#endregion + //#region СЫЫЫР 0_0 + + // Rennet + event.recipes.gtceu.fermenter('tfg:fermenter/vegetable_rennet') + .itemInputs('#tfg:ferments_to_rennet') + .itemOutputs('firmalife:rennet') + .duration(400) + .EUt(16) + + event.recipes.gtceu.fermenter('tfg:fermenter/biomass_rennet') + .inputFluids(Fluid.of('gtceu:fermented_biomass', 100)) + .itemOutputs('firmalife:rennet') + .duration(2400) + .EUt(16) + + // Curdled milk + event.recipes.gtceu.fermenter('tfg:fermenter/curdled_milk') + .inputFluids(Fluid.of('minecraft:milk', 1000)) + .itemInputs('firmalife:rennet') + .outputFluids(Fluid.of('tfc:curdled_milk')) + .duration(2400) + .EUt(16) + + event.recipes.gtceu.fermenter('tfg:fermenter/curdled_yak_milk') + .inputFluids(Fluid.of('firmalife:yak_milk', 1000)) + .itemInputs('firmalife:rennet') + .outputFluids(Fluid.of('firmalife:curdled_yak_milk')) + .duration(2400) + .EUt(16) + + event.recipes.gtceu.fermenter('tfg:fermenter/curdled_goat_milk') + .inputFluids(Fluid.of('firmalife:goat_milk', 1000)) + .itemInputs('firmalife:rennet') + .outputFluids(Fluid.of('firmalife:curdled_goat_milk')) + .duration(2400) + .EUt(16) + + //Curds + event.recipes.gtceu.fermenter('tfg:fermenter/milk_curd') + .inputFluids(Fluid.of('tfc:curdled_milk', 1000)) + .itemOutputs('firmalife:food/milk_curd') + .duration(1200) + .EUt(16) + + event.recipes.gtceu.fermenter('tfg:fermenter/yak_curd') + .inputFluids(Fluid.of('firmalife:curdled_yak_milk', 1000)) + .itemOutputs('firmalife:food/yak_curd') + .duration(1200) + .EUt(16) + + event.recipes.gtceu.fermenter('tfg:fermenter/goat_curd') + .inputFluids(Fluid.of('firmalife:curdled_goat_milk', 1000)) + .itemOutputs('firmalife:food/goat_curd') + .duration(1200) + .EUt(16) + + // Cheese wheels + event.recipes.gtceu.fermenter('tfg:fermenter/gouda_wheel') + .inputFluids(Fluid.of('tfc:salt_water', 750)) + .itemInputs('3x firmalife:food/milk_curd') + .itemOutputs('firmalife:gouda_wheel') + .duration(12000) + .EUt(24) + + event.recipes.gtceu.fermenter('tfg:fermenter/shosha_wheel') + .inputFluids(Fluid.of('tfc:salt_water', 750)) + .itemInputs('3x firmalife:food/yak_curd') + .itemOutputs('firmalife:shosha_wheel') + .duration(12000) + .EUt(24) + + event.recipes.gtceu.fermenter('tfg:fermenter/feta_wheel') + .inputFluids(Fluid.of('tfc:salt_water', 750)) + .itemInputs('3x firmalife:food/goat_curd') + .itemOutputs('firmalife:feta_wheel') + .duration(12000) + .EUt(24) + + // Cutting + event.recipes.gtceu.cutter('tfg:cutter/gouda') + .itemInputs('firmalife:gouda_wheel') + .itemOutputs('4x firmalife:food/gouda') + .duration(40) + .EUt(28) + + event.recipes.gtceu.cutter('tfg:cutter/shosha') + .itemInputs('firmalife:shosha_wheel') + .itemOutputs('4x firmalife:food/shosha') + .duration(40) + .EUt(28) + + event.recipes.gtceu.cutter('tfg:cutter/feta') + .itemInputs('firmalife:feta_wheel') + .itemOutputs('4x firmalife:food/feta') + .duration(40) + .EUt(28) + + event.recipes.gtceu.cutter('tfg:cutter/cheddar') + .itemInputs('firmalife:cheddar_wheel') + .itemOutputs('4x firmalife:food/cheddar') + .duration(40) + .EUt(28) + + event.recipes.gtceu.cutter('tfg:cutter/chevre') + .itemInputs('firmalife:chevre_wheel') + .itemOutputs('4x firmalife:food/chevre') + .duration(40) + .EUt(28) + + event.recipes.gtceu.cutter('tfg:cutter/rajya_metok') + .itemInputs('firmalife:rajya_metok_wheel') + .itemOutputs('4x firmalife:food/rajya_metok') + .duration(40) + .EUt(28) + + // Misc + global.TFC_MILKS.forEach(milk => { + event.recipes.gtceu.fermenter(`tfg:fermenter/cream_from_${milk.id.replace(':', '_')}`) + .inputFluids(Fluid.of(milk.id, 1000)) + .outputFluids(Fluid.of('firmalife:cream')) + .duration(1200) + .EUt(24) + }) + + event.recipes.gtceu.mixer('tfg:mixer/tomato_sauce') + .itemInputs('firmalife:food/tomato_sauce_mix') + .inputFluids(Fluid.of('minecraft:water', 200)) + .itemOutputs('firmalife:food/tomato_sauce') + .duration(200) + .EUt(24) + + + //endregion + //#region Оливки event.recipes.gtceu.macerator(`tfg:tfc/olive_paste`) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index a746d2c62..9b9f50d93 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -29,6 +29,11 @@ const registerTFCItemTags = (event) => { event.add('tfc:usable_on_tool_rack', '#forge:tools/chainsaws') event.add('tfc:usable_on_tool_rack', '#forge:tools/buzzsaws') event.add('tfc:usable_on_tool_rack', '#forge:tools/drills') + + // Ингредиенты для закваски + event.add('tfg:ferments_to_rennet', 'tfc:food/soybean') + event.add('tfg:ferments_to_rennet', 'firmalife:food/fig') + event.add('tfg:ferments_to_rennet', 'tfc:plant/ivy') // Для складывания event.add('tfc:pileable_ingots', '#forge:ingots') diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 973c20ab7..5b91aaa30 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -1060,6 +1060,13 @@ global.TFC_GREENHOUSE_BERRY_RECIPE_COMPONENTS = [ { input: 'tfc:plant/cranberry_bush', fluid_amount: 6000, output: '3x tfc:food/cranberry', name: 'cranberry' }, ]; +global.TFC_MILKS = [ + {id: 'minecraft:milk'}, + {id: 'firmalife:yak_milk'}, + {id: 'firmalife:goat_milk'}, + {id: 'firmalife:coconut_milk'}, +]; + global.calcAmountOfMetal = (defaultAmount, percents) => { const value = defaultAmount / (100 / percents) return (value % 2 == 0) ? value : Math.round(value) - 1 From 1db4a2c4be835bb1a8d70c751e82ad5b855dc683 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 23:34:26 +0000 Subject: [PATCH 21/33] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/create/recipes.js | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 25b7bb275..ee17629c9 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1189,11 +1189,24 @@ const registerCreateRecipes = (event) => { //#region Механизм точности event.recipes.gtceu.assembler('tfg:create/precision_mechanism') - .itemInputs('#forge:sheets/gold','3x create:cogwheel', '3x create:large_cogwheel', '3x #forge:nuggets/iron') - .itemOutputs('create:precision_mechanism') - .duration(2000) - .EUt(20) + .itemInputs('#forge:sheets/gold','3x create:cogwheel', '3x create:large_cogwheel', '3x #forge:nuggets/iron') + .itemOutputs('create:precision_mechanism') + .duration(2000) + .EUt(20) //#endregion + // #region electron tubes for later tiers + + event.shaped('create:electron_tube', [ + ' A ', + ' B ', + ' C ' + ], { + A: 'gtceu:glass_tube', + B: 'gtceu:nand_chip', + C: 'gtceu:wrought_iron_plate' + }).id('tfg:advanced_electron_tube') + + // #endregion } From 26321b7e4b37bf2a431da018b3bb6f16d43405d5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 23:50:40 +0000 Subject: [PATCH 22/33] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/create/recipes.js | 38 +++++++++++++++---------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index ee17629c9..1dc6a808d 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -809,12 +809,34 @@ const registerCreateRecipes = (event) => { 'DED' ], { A: 'gtceu:glass_tube', - B: 'gtceu:resistor', + B: '#gtceu:resistors', C: 'gtceu:resin_circuit_board', D: 'gtceu:red_alloy_single_wire', E: '#forge:plates/wrought_iron' }).id('tfg:create/shaped/electron_tube') + event.shaped('2x create:electron_tube', [ + ' A ', + 'BCB', + 'DED' + ], { + A: 'gtceu:glass_tube', + B: '#gtceu:resistors', + C: 'gtceu:plastic_circuit_board', + D: 'gtceu:red_alloy_single_wire', + E: '#forge:plates/wrought_iron' + }).id('tfg:create/shaped/electron_tube2') + + event.shaped('3x create:electron_tube', [ + ' A ', + ' B ', + ' C ' + ], { + A: 'gtceu:glass_tube', + B: 'gtceu:nand_chip', + C: '#forge:plates/wrought_iron' + }).id('tfg:create/shaped/electron_tube3') + // Тюбик с клеем event.shaped('create:super_glue', [ 'BA', @@ -1195,18 +1217,4 @@ const registerCreateRecipes = (event) => { .EUt(20) //#endregion - - // #region electron tubes for later tiers - - event.shaped('create:electron_tube', [ - ' A ', - ' B ', - ' C ' - ], { - A: 'gtceu:glass_tube', - B: 'gtceu:nand_chip', - C: 'gtceu:wrought_iron_plate' - }).id('tfg:advanced_electron_tube') - - // #endregion } From 6e477e14690d3ed2abc10da1d5ac5a2fe94f9b30 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 12 Jan 2025 00:49:34 +0000 Subject: [PATCH 23/33] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/gregtech/recipes.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index bf6547854..674170b2b 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1717,5 +1717,18 @@ const registerGTCEURecipes = (event) => { .itemOutputs('gtceu:quantum_processor_mainframe') .duration(800) .EUt(7680) - //#endregion + //#endregion + + // #region fix mixer recipes for colored steel + + event.replaceInput({id: 'gtceu:mixer/red_steel'}, 'gtceu:sterling_silver_dust', 'gtceu:rose_gold_dust') + event.replaceInput({id: 'gtceu:create_mixer/red_steel'}, 'gtceu:sterling_silver_dust', 'gtceu:rose_gold_dust') + event.replaceInput({id: 'gtceu:mixer/red_steel'}, 'gtceu:bismuth_bronze_dust', 'gtceu:brass_dust') + event.replaceInput({id: 'gtceu:create_mixer/red_steel'}, 'gtceu:bismuth_bronze_dust', 'gtceu:brass_dust') + event.replaceInput({id: 'gtceu:mixer/blue_steel'}, 'gtceu:rose_gold_dust', 'gtceu:sterling_silver_dust') + event.replaceInput({id: 'gtceu:create_mixer/blue_steel'}, 'gtceu:rose_gold_dust', 'gtceu:sterling_silver_dust') + event.replaceInput({id: 'gtceu:mixer/blue_steel'}, 'gtceu:brass_dust', 'gtceu:bismuth_bronze_dust') + event.replaceInput({id: 'gtceu:create_mixer/blue_steel'}, 'gtceu:brass_dust', 'gtceu:bismuth_bronze_dust') + + // #endregion } From 0492936227ce0c010d37dabe253ea9e6d5f77ac7 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 12 Jan 2025 00:52:00 +0000 Subject: [PATCH 24/33] Update en_us.json Signed-off-by: Pyritie --- kubejs/assets/gtceu/lang/en_us.json | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 2aa6312fc..2c27cd952 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -10,6 +10,7 @@ "material.treated_wood": "Creosote-Treated Wood", "block.gtceu.treated_wood_planks": "Creosote-Treated Wood Planks", + "gtceu.create_mixer": "Kinetic Mixer", "block.gtceu.lv_kinetic_mixer": "Basic Kinetic Mixer", "block.gtceu.mv_kinetic_mixer": "Advanced Kinetic Mixer", "block.gtceu.hv_kinetic_mixer": "Advanced Kinetic Mixer II", From 0212f19e50fcf2a1eb2421d579b47906be880164 Mon Sep 17 00:00:00 2001 From: Dmitry <52341158+Exzept1on@users.noreply.github.com> Date: Sun, 12 Jan 2025 11:57:06 +0700 Subject: [PATCH 25/33] Update CHANGELOG.md Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com> --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8f7ea01d..985501ac7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [0.7.16] - 12.01.2025 +## [0.7.16] - 13.01.2025 ### Changes - Removed links for excel spreadsheet ore gen (Pyritie). - Fix maintenance hatch recycling recipes too (fluffle). @@ -11,6 +11,11 @@ - Craft recipe for framed chest so it isn't cheaper then the alternatives (Juzrm). - RU_RU translation for tfc guide book (recently added pages) (8oyNextDoor). - Based gas multiblocks, more suffering! (Pyritie). +- Creosote treated planks fixes (Pyritie). +- Fixed mixer recipes for red/blue steel (Pyritie). +- Added another recipe for Create's electron tubes (Pyritie). +- Electric cheese, tomato sauce and cream (Saaghh). +- Leather producting using GTM machines. ## [0.7.15] - 08.01.2025 ### Changes From 0f1f7a2f6d155084ea9cec9d579f811dc9cdf65b Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 12 Jan 2025 11:58:27 +0700 Subject: [PATCH 26/33] what? --- kubejs/startup_scripts/main_server_script.js | 143 ------------------- 1 file changed, 143 deletions(-) delete mode 100644 kubejs/startup_scripts/main_server_script.js diff --git a/kubejs/startup_scripts/main_server_script.js b/kubejs/startup_scripts/main_server_script.js deleted file mode 100644 index 5adb7f640..000000000 --- a/kubejs/startup_scripts/main_server_script.js +++ /dev/null @@ -1,143 +0,0 @@ -// priority: 1 - -/** - * Событие регистрации предмет-тэгов. - */ -ServerEvents.tags('item', event => { - registerAE2ItemTags(event) - registerAsticorCartsItemTags(event) - registerChiselAndBitsItemTags(event) - registerComputerCraftItemTags(event) - registerCreateItemTags(event) - registerCreateAdditionsItemTags(event) - registerExtendedAE2ItemTags(event) - registerFirmaCivItemTags(event) - registerFirmaLifeItemTags(event) - registerFramedBlocksItemTags(event) - registerFTBQuestsItemTags(event) - registerGTCEUItemTags(event) - registerMegaCellsItemTags(event) - registerMinecraftItemTags(event) - registerMoreRedItemTags(event) - registerHotOrNotItemTags(event) - registerRailWaysItemTags(event) - registerSophisticatedBackpacksItemTags(event) - registerTFCItemTags(event) -}) - -/** - * Событие регистрации блок-тэгов. - */ -ServerEvents.tags('block', event => { - registerAE2BlockTags(event) - registerAsticorCartsBlockTags(event) - registerChiselAndBitsBlockTags(event) - registerComputerCraftBlockTags(event) - registerCreateBlockTags(event) - registerCreateAdditionsBlockTags(event) - registerExtendedAE2BlockTags(event) - registerFirmaCivBlockTags(event) - registerFirmaLifeBlockTags(event) - registerFramedBlocksBlockTags(event) - registerFTBQuestsBlockTags(event) - registerGTCEUBlockTags(event) - registerMegaCellsBlockTags(event) - registerMinecraftBlockTags(event) - registerMoreRedBlockTags(event) - registerHotOrNotBlockTags(event) - registerRailWaysBlockTags(event) - registerSophisticatedBackpacksBlockTags(event) - registerTFCBlockTags(event) -}) - -/** - * Событие регистрации жидкость-тэгов. - */ -ServerEvents.tags('fluid', event => { - registerCreateFluidTags(event) - registerCreateAdditionsFluidTags(event) - registerFirmaLifeBlockTags(event) - registerTFCFluidTags(event) -}) - -/** - * Событие регистрации тегов структур. - */ -ServerEvents.tags('worldgen/placed_feature', event => { - registerFirmaLifePlacedFeatures(event) - registerTFCPlacedFeatures(event) -}) - -/** - * Событие регистрации датапаков (Здесь можно регистрировать теги, данные, рецепты, общий метод короче). - * Срабатывает до инициализации рецептов, но после тегов. - */ -ServerEvents.highPriorityData(event => { - registerComputerCraftData(event) -}) - -/** - * Событие регистрации датапаков для TFC (Здесь можно регистрировать теги, данные, рецепты, общий метод короче). - * Срабатывает до инициализации рецептов, но после тегов. - */ -TFCEvents.data(event => { - registerTFCDataForGTCEU(event) - registerTFCDataForTFC(event) - registerTFCDataForTreeTap(event) - registerTFCDataForWaterFlasks(event) -}) - -/** - * Событие регистрации лут-тейблов. - * Срабатывает до инициализации рецептов, но после датапаков и тегов. - */ -LootJS.modifiers((event) => { - registerGTCEULoots(event) -}); - -/** - * Событие регистрации рудных жил. - * Не представляю когда срабатывает, но явно после тегов и датапаков. - */ -GTCEuServerEvents.oreVeins(event => { - // event.removeAll() -}) - -/** - * Событие регистрации рецептов. - * Срабатывает после инициализации датапаков и тегов. - */ -ServerEvents.recipes(event => { - registerAE2Recipes(event) - registerAsticorCartsRecipes(event) - registerAE2InsertExportCardRecipes(event) - registerAE2NetworkAnalyzerRecipes(event) - registerAE2WTLibRecipes(event) - registerChiselAndBitsRecipes(event) - registerComputerCraftRecipes(event) - registerCreateRecipes(event) - registerCreateAdditionsRecipes(event) - registerCreateConnectedRecipes(event) - registerExtendedAE2Recipes(event) - registerExposureRecipes(event) - registerEtchedRecipes(event) - registerFirmaCivRecipes(event) - registerFirmaLifeRecipes(event) - registerFramedBlocksRecipes(event) - registerFTBQuestsRecipes(event) - registerGTCEURecipes(event) - registerHandGliderRecipes(event) - registerHotOrNotRecipes(event) - registerMegaCellsRecipes(event) - registerMERequesterRecipes(event) - registerMinecraftRecipes(event) - registerMoreRedRecipes(event) - registerRailWaysRecipes(event) - registerSophisticatedBackpacksRecipes(event) - registerTfceaRecipes(event) - registerTFCRecipes(event) - registerTFCGroomingStationRecipes(event) - registerToolBeltRecipes(event) - registerTreeTapRecipes(event) - registerWaterFlasksRecipes(event) -}) \ No newline at end of file From bdb0e05bebdb6bf0dc477e831300096b5640afc9 Mon Sep 17 00:00:00 2001 From: Dmitry <52341158+Exzept1on@users.noreply.github.com> Date: Sun, 12 Jan 2025 12:37:34 +0700 Subject: [PATCH 27/33] Update pakku.json Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com> --- pakku.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pakku.json b/pakku.json index ef5602af5..ea22ac9a0 100644 --- a/pakku.json +++ b/pakku.json @@ -1,6 +1,6 @@ { "name": "TerraFirmaGreg-Modern", - "version": "0.7.15", + "version": "0.7.16", "description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.20.x.", "author": "Exception, Xikaro", "overrides": [ @@ -188,4 +188,4 @@ "side": "CLIENT" } } -} \ No newline at end of file +} From 2a89fa630aca82caefa9ab846b6362302be18f27 Mon Sep 17 00:00:00 2001 From: Xikaro <55663835+Xikaro@users.noreply.github.com> Date: Sun, 12 Jan 2025 10:41:04 +0500 Subject: [PATCH 28/33] Update build.yml Signed-off-by: Xikaro <55663835+Xikaro@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aecc5873a..a7b61bf4b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -441,7 +441,7 @@ jobs: - name: 🚀 Create release id: release - uses: softprops/action-gh-release@v2.1.0 + uses: softprops/action-gh-release@v2.1.1 with: name: ${{ needs.info.outputs.project_version }} tag_name: ${{ needs.info.outputs.project_version }} @@ -484,4 +484,4 @@ jobs: ```markdown ${{ steps.truncated.outputs.text }} - ...``` - ** [Read more...](${{ needs.release-github.outputs.url }}) ** \ No newline at end of file + ** [Read more...](${{ needs.release-github.outputs.url }}) ** From af5a0638e5b7a004d28d2ac7d92c90d7ac9d6d09 Mon Sep 17 00:00:00 2001 From: Xikaro <55663835+Xikaro@users.noreply.github.com> Date: Sun, 12 Jan 2025 10:41:50 +0500 Subject: [PATCH 29/33] Update build.yml Signed-off-by: Xikaro <55663835+Xikaro@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a7b61bf4b..6a4e0e05a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -441,7 +441,7 @@ jobs: - name: 🚀 Create release id: release - uses: softprops/action-gh-release@v2.1.1 + uses: softprops/action-gh-release@v2.2.1 with: name: ${{ needs.info.outputs.project_version }} tag_name: ${{ needs.info.outputs.project_version }} From fface8041c662ded9a4a43106517fb699cd729ce Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sun, 12 Jan 2025 10:56:34 +0500 Subject: [PATCH 30/33] workflows --- .github/workflows/build.yml | 164 ++++++++++++++++++------------------ CHANGELOG.md | 2 +- 2 files changed, 82 insertions(+), 84 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a4e0e05a..468bc64fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,9 +9,6 @@ concurrency: group: ${{ github.workflow }} cancel-in-progress: true -permissions: - pull-requests: none - env: RELEASE_TYPE: "release" MINECRAFT_VERSION: "1.20.1" @@ -326,86 +323,6 @@ jobs: path: .pakku/multimc-overrides/${{ needs.info.outputs.project_full_name }}-multimc.zip if-no-files-found: error - release-curseforge: - name: 🚀 Release to CurseForge - needs: [info, build-modpack, build-server] - runs-on: ubuntu-latest - outputs: - id: ${{ steps.release.outputs.id }} - - steps: - - name: 🔒 Check if CURSEFORGE_TOKEN exist - shell: bash - run: | - if [ "${{ secrets.CURSEFORGE_TOKEN }}" == '' ]; then - echo '::error::No value found for secret key `CURSEFORGE_TOKEN`. See https://docs.github.com/en/actions/security-guides/encrypted-secrets#creating-encrypted-secrets-for-a-repository' && exit 1 - fi - - - name: 📦 Download artifact curseforge - uses: actions/download-artifact@v4.1.8 - with: - name: ${{ needs.info.outputs.project_full_name }}-curseforge - - - name: 📦 Download artifact server - uses: actions/download-artifact@v4.1.8 - with: - name: ${{ needs.info.outputs.project_full_name }}-serverpack - - - name: 🚀 Upload Curseforge - id: release - uses: Xikaro/upload-curseforge-modpack-action@1.1.1 - with: - api-token: ${{ secrets.CURSEFORGE_TOKEN }} - project-id: ${{ vars.CURSEFORGE_ID }} - display-name: ${{ needs.info.outputs.project_full_name }} - modpack-path: ${{ needs.info.outputs.project_full_name }}-curseforge.zip - server-display-name: ${{ needs.info.outputs.project_full_name }}-serverpack - modpack-server-path: ${{ needs.info.outputs.project_full_name }}-serverpack.zip - changelog: | - ${{ needs.info.outputs.changelog }} - ${{ needs.info.outputs.diff }} - changelog-format: markdown - game-version: ${{ needs.info.outputs.minecraft_version }} - release-type: ${{ needs.info.outputs.release_type }} - - # release-modrinth: - # name: 🚀 Release to Modrinth - # needs: [info, build-modpack, build-server] - # runs-on: ubuntu-latest - - # steps: - # - name: 🔒 Check if MODRINTH_API_TOKEN exist - # shell: bash - # run: | - # if [ "${{ secrets.MODRINTH_TOKEN }}" == '' ]; then - # echo '::error::No value found for secret key `MODRINTH_TOKEN`. See https://docs.github.com/en/ actionssecurity-guides/ encrypted-secrets#creating-encrypted-secrets-for-a-repository' && exit 1 - # fi - - # - name: 📦 Download artifact modrinth - # uses: actions/download-artifact@v4.1.8 - # with: - # name: ${{ needs.info.outputs.project_full_name }}-modrinth - - # - name: 📦 Download artifact server - # uses: actions/download-artifact@v4.1.8 - # with: - # name: ${{ needs.info.outputs.project_full_name }}-serverpack - - # - name: 🚀 Upload Modrinth - # id: release - # uses: Xikaro/upload-curseforge-modpack-action@1.1.1 - # with: - # api-token: ${{ secrets.MODRINTH_TOKEN }} - # project-id: ${{ vars.MODRINTH_ID }} - # modpack-path: ${{ needs.info.outputs.project_full_name }}-modrinth.mrpack - # modpack-server-path: ${{ needs.info.outputs.project_full_name }}-serverpack.zip - # changelog: ${{ needs.info.outputs.changelog }} - # changelog-format: markdown - # game-version: ${{ needs.info.outputs.minecraft_version }} - # display-name: ${{ needs.info.outputs.project_full_name }} - # server-display-name: ${{ needs.info.outputs.project_full_name }}-serverpack - # release-type: ${{ needs.info.outputs.release_type }} - release-github: name: 🚀 Release to GitHub needs: [info, build-modpack, build-server, build-multimc] @@ -456,6 +373,87 @@ jobs: generate_release_notes: true token: ${{ secrets.GITHUB_TOKEN }} + release-curseforge: + name: 🚀 Release to CurseForge + needs: [info, build-modpack, build-server, release-github] + runs-on: ubuntu-latest + outputs: + id: ${{ steps.release.outputs.id }} + + steps: + - name: 🔒 Check if CURSEFORGE_TOKEN exist + shell: bash + run: | + if [ "${{ secrets.CURSEFORGE_TOKEN }}" == '' ]; then + echo '::error::No value found for secret key `CURSEFORGE_TOKEN`. See https://docs.github.com/en/actions/security-guides/encrypted-secrets#creating-encrypted-secrets-for-a-repository' && exit 1 + fi + + - name: 📦 Download artifact curseforge + uses: actions/download-artifact@v4.1.8 + with: + name: ${{ needs.info.outputs.project_full_name }}-curseforge + + - name: 📦 Download artifact server + uses: actions/download-artifact@v4.1.8 + with: + name: ${{ needs.info.outputs.project_full_name }}-serverpack + + - name: 🚀 Upload Curseforge + id: release + uses: Xikaro/upload-curseforge-modpack-action@1.1.1 + with: + api-token: ${{ secrets.CURSEFORGE_TOKEN }} + project-id: ${{ vars.CURSEFORGE_ID }} + display-name: ${{ needs.info.outputs.project_full_name }} + modpack-path: ${{ needs.info.outputs.project_full_name }}-curseforge.zip + server-display-name: ${{ needs.info.outputs.project_full_name }}-serverpack + modpack-server-path: ${{ needs.info.outputs.project_full_name }}-serverpack.zip + changelog: | + ${{ needs.info.outputs.changelog }} + ${{ needs.info.outputs.diff }} + changelog-format: markdown + game-version: ${{ needs.info.outputs.minecraft_version }} + release-type: ${{ needs.info.outputs.release_type }} + + # release-modrinth: + # name: 🚀 Release to Modrinth + # needs: [info, build-modpack, build-server, release-github] + # runs-on: ubuntu-latest + + # steps: + # - name: 🔒 Check if MODRINTH_API_TOKEN exist + # shell: bash + # run: | + # if [ "${{ secrets.MODRINTH_TOKEN }}" == '' ]; then + # echo '::error::No value found for secret key `MODRINTH_TOKEN`. See https://docs.github.com/en/ actionssecurity-guides/ encrypted-secrets#creating-encrypted-secrets-for-a-repository' && exit 1 + # fi + + # - name: 📦 Download artifact modrinth + # uses: actions/download-artifact@v4.1.8 + # with: + # name: ${{ needs.info.outputs.project_full_name }}-modrinth + + # - name: 📦 Download artifact server + # uses: actions/download-artifact@v4.1.8 + # with: + # name: ${{ needs.info.outputs.project_full_name }}-serverpack + + # - name: 🚀 Upload Modrinth + # id: release + # uses: Xikaro/upload-curseforge-modpack-action@1.1.1 + # with: + # api-token: ${{ secrets.MODRINTH_TOKEN }} + # project-id: ${{ vars.MODRINTH_ID }} + # modpack-path: ${{ needs.info.outputs.project_full_name }}-modrinth.mrpack + # modpack-server-path: ${{ needs.info.outputs.project_full_name }}-serverpack.zip + # changelog: ${{ needs.info.outputs.changelog }} + # changelog-format: markdown + # game-version: ${{ needs.info.outputs.minecraft_version }} + # display-name: ${{ needs.info.outputs.project_full_name }} + # server-display-name: ${{ needs.info.outputs.project_full_name }}-serverpack + # release-type: ${{ needs.info.outputs.release_type }} + + discord-message: name: 📱 Discord Message needs: [info, release-curseforge, release-github] diff --git a/CHANGELOG.md b/CHANGELOG.md index 985501ac7..479e28937 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [0.7.16] - 13.01.2025 +## [0.7.16] - 12.01.2025 ### Changes - Removed links for excel spreadsheet ore gen (Pyritie). - Fix maintenance hatch recycling recipes too (fluffle). From ba895caa1534a71382669cc7e49a64f601c3c0c2 Mon Sep 17 00:00:00 2001 From: Dmitry <52341158+Exzept1on@users.noreply.github.com> Date: Sun, 12 Jan 2025 16:41:19 +0700 Subject: [PATCH 31/33] Update CHANGELOG.md Signed-off-by: Dmitry <52341158+Exzept1on@users.noreply.github.com> --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 479e28937..7de39dfa1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [0.7.17] - ? +### Changes +- Added ore index, started work on other TFC info category (Pyritie). + ## [0.7.16] - 12.01.2025 ### Changes - Removed links for excel spreadsheet ore gen (Pyritie). @@ -15,7 +19,7 @@ - Fixed mixer recipes for red/blue steel (Pyritie). - Added another recipe for Create's electron tubes (Pyritie). - Electric cheese, tomato sauce and cream (Saaghh). -- Leather producting using GTM machines. +- Leather producting using GTM machines (Saaghh). ## [0.7.15] - 08.01.2025 ### Changes From e7129dac26a1491dc25afeaacd5bf476db93510d Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sun, 12 Jan 2025 15:47:35 +0500 Subject: [PATCH 32/33] Update pakku-lock.json --- pakku-lock.json | 582 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 460 insertions(+), 122 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 857107252..4a63aafcc 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -247,20 +247,23 @@ ] }, { - "pakku_id": "cVlajuXjdGCDgeWt", + "pakku_id": "D8R9K5y7VUMkfQ0I", "pakku_links": [ "UOjZxqemtQFAP9R8" ], "type": "MOD", "side": "CLIENT", "slug": { - "curseforge": "ambientsounds" + "curseforge": "ambientsounds", + "modrinth": "ambientsounds" }, "name": { - "curseforge": "AmbientSounds 6" + "curseforge": "AmbientSounds 6", + "modrinth": "AmbientSounds" }, "id": { - "curseforge": "254284" + "curseforge": "254284", + "modrinth": "fM515JnW" }, "files": [ { @@ -274,18 +277,42 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/5739/342/AmbientSounds_FORGE_v6.1.1_mc1.20.1.jar", - "id": "5739342", + "url": "https://edge.forgecdn.net/files/5968/59/AmbientSounds_FORGE_v6.1.1_mc1.20.1.jar", + "id": "5968059", "parent_id": "254284", "hashes": { - "sha1": "5e8b5e0a899b647e30fc7ad2854c7c74393361d5", - "md5": "37f2875e2d9ad9bb70f3fc1f949da22e" + "sha1": "4ed2c5bee5988f40cebef3bbc9dec39ab9096bf1", + "md5": "10709a88a6c11f0c4d6cf9759297a704" }, "required_dependencies": [ "257814" ], - "size": 85695724, - "date_published": "2024-09-20T08:46:30.717Z" + "size": 83885724, + "date_published": "2024-12-06T14:06:33.837Z" + }, + { + "type": "modrinth", + "file_name": "AmbientSounds_FORGE_v6.1.1_mc1.20.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge", + "neoforge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/fM515JnW/versions/8wDLqykj/AmbientSounds_FORGE_v6.1.1_mc1.20.1.jar", + "id": "8wDLqykj", + "parent_id": "fM515JnW", + "hashes": { + "sha512": "83baaee77627817718d5eab3f67bb93a9cb69012ff0de62f96ec18bba42f89c02a316324b9323d7300af180a2629a40ea34f3ecbad8821d9b1ff1103a194f8b3", + "sha1": "708a552879860884b7180b1867ada199001d698c" + }, + "required_dependencies": [ + "OsZiaDHq" + ], + "size": 83885725, + "date_published": "2024-12-06T14:29:25.836455Z" } ] }, @@ -676,38 +703,65 @@ ] }, { - "pakku_id": "CBSBD7u2DdsFEaoX", + "pakku_id": "nSmnsenCD9KSplvm", "type": "MOD", + "side": "BOTH", "slug": { - "curseforge": "balm" + "curseforge": "balm", + "modrinth": "balm" }, "name": { - "curseforge": "Balm" + "curseforge": "Balm", + "modrinth": "Balm" }, "id": { - "curseforge": "531761" + "curseforge": "531761", + "modrinth": "MBAkmtvl" }, "files": [ { "type": "curseforge", "file_name": "balm-forge-1.20.1-7.3.9-all.jar", "mc_versions": [ + "1.20.1", + "1.20" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6077/684/balm-forge-1.20.1-7.3.9-all.jar", + "id": "6077684", + "parent_id": "531761", + "hashes": { + "sha1": "55e98bd34d43210f492d3aababe6583db96e3077", + "md5": "1ff3ff55f1968b426e7b808e8827f244" + }, + "required_dependencies": [], + "size": 373787, + "date_published": "2025-01-11T19:21:45.637Z" + }, + { + "type": "modrinth", + "file_name": "balm-forge-1.20.1-7.3.9-all.jar", + "mc_versions": [ + "1.20", "1.20.1" ], "loaders": [ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/5644/976/balm-forge-1.20.1-7.3.9-all.jar", - "id": "5644976", - "parent_id": "531761", + "url": "https://cdn.modrinth.com/data/MBAkmtvl/versions/YTL0DSNu/balm-forge-1.20.1-7.3.9-all.jar", + "id": "YTL0DSNu", + "parent_id": "MBAkmtvl", "hashes": { - "sha1": "e041f044d707dd06a6efa2c63b39f26abf60f671", - "md5": "ccb8e1687a39cc613ad910460bd4ac3b" + "sha512": "203d17bef716fb920ca762a524e774cf4b628fbda620a2bda9d9ff47a44c36f60ef06591e4911b4c75673a2f70efed595c589ddbcbd87d3549e0a43bd7804193", + "sha1": "31ec8590783cf3d40d3077efb60ceb7ab5928b2d" }, "required_dependencies": [], - "size": 373583, - "date_published": "2024-08-19T19:53:51.597Z" + "size": 373787, + "date_published": "2025-01-11T19:21:38.118245Z" } ] }, @@ -1174,16 +1228,23 @@ ] }, { - "pakku_id": "NZANIGIK8HPdr4i7", + "pakku_id": "oW7roeBSwAk7qxrL", + "pakku_links": [ + "3B5EGC3hh54PlLuy" + ], "type": "MOD", + "side": "BOTH", "slug": { - "curseforge": "carpeted-stairs" + "curseforge": "carpeted-stairs", + "modrinth": "carpeted-stairs" }, "name": { - "curseforge": "Carpeted Stairs & Slabs" + "curseforge": "Carpeted Stairs & Slabs", + "modrinth": "Carpeted Stairs & Slabs" }, "id": { - "curseforge": "720848" + "curseforge": "720848", + "modrinth": "Ogzlp7me" }, "files": [ { @@ -1209,6 +1270,29 @@ ], "size": 81717, "date_published": "2023-06-25T13:50:29.323Z" + }, + { + "type": "modrinth", + "file_name": "carpeted-1.20-1.4.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/Ogzlp7me/versions/5v8AkQ8d/carpeted-1.20-1.4.jar", + "id": "5v8AkQ8d", + "parent_id": "Ogzlp7me", + "hashes": { + "sha512": "4c9932e314ed8b9db1947e5a1174d84261e2b1258224ec1583fe84c4b8451fa34e750a660113abd19a4866b06f48bc80dd266167a247a0b743afddc4e3a80d5c", + "sha1": "5f177a96a08454572723cf31fee9187c6bc1140e" + }, + "required_dependencies": [ + "twkfQtEc" + ], + "size": 81717, + "date_published": "2023-07-20T22:42:01.926447Z" } ] }, @@ -1277,7 +1361,7 @@ ] }, { - "pakku_id": "scaS4vsSneWYIouC", + "pakku_id": "ZO1AhknuOpXV5b7Z", "type": "MOD", "slug": { "curseforge": "catalogue" @@ -1439,20 +1523,23 @@ ] }, { - "pakku_id": "2wmaTBMHkCmjJgHW", + "pakku_id": "AdxIV6YtgwKFXBHj", "pakku_links": [ - "CBSBD7u2DdsFEaoX" + "nSmnsenCD9KSplvm" ], "type": "MOD", "side": "CLIENT", "slug": { - "curseforge": "client-tweaks" + "curseforge": "client-tweaks", + "modrinth": "client-tweaks" }, "name": { - "curseforge": "Client Tweaks" + "curseforge": "Client Tweaks", + "modrinth": "Client Tweaks" }, "id": { - "curseforge": "251407" + "curseforge": "251407", + "modrinth": "vPNqo58Q" }, "files": [ { @@ -1478,6 +1565,30 @@ ], "size": 131208, "date_published": "2023-09-14T10:30:30.320Z" + }, + { + "type": "modrinth", + "file_name": "clienttweaks-forge-1.20-11.1.0.jar", + "mc_versions": [ + "1.20", + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/vPNqo58Q/versions/7Zzx91AW/clienttweaks-forge-1.20-11.1.0.jar", + "id": "7Zzx91AW", + "parent_id": "vPNqo58Q", + "hashes": { + "sha512": "5995788c20ae1c9e24f68a2ff7479841b2d0dbb1a299f25ad2208ae54b4bcb3ab1b3a22403139c31470240877f42eba113d8c7b9e704831e8df63c35179d6dbc", + "sha1": "f46ab635dfb286443581a24d2162b4ab442dbf83" + }, + "required_dependencies": [ + "MBAkmtvl" + ], + "size": 131209, + "date_published": "2023-09-14T10:30:27.975695Z" } ] }, @@ -1546,16 +1657,20 @@ ] }, { - "pakku_id": "od9yjKETa58AwHsT", + "pakku_id": "ocoWbpFEv2jES9I4", "type": "MOD", + "side": "BOTH", "slug": { - "curseforge": "clumps" + "curseforge": "clumps", + "modrinth": "clumps" }, "name": { - "curseforge": "Clumps" + "curseforge": "Clumps", + "modrinth": "Clumps" }, "id": { - "curseforge": "256717" + "curseforge": "256717", + "modrinth": "Wnxd13zP" }, "files": [ { @@ -1578,28 +1693,53 @@ "required_dependencies": [], "size": 20299, "date_published": "2024-04-21T05:04:02.807Z" + }, + { + "type": "modrinth", + "file_name": "Clumps-forge-1.20.1-12.0.0.4.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/Wnxd13zP/versions/nAHGB5ls/Clumps-forge-1.20.1-12.0.0.4.jar", + "id": "nAHGB5ls", + "parent_id": "Wnxd13zP", + "hashes": { + "sha512": "ffd8ff2438e9f9d260d3926ccdd0cccc4772c6f99f29715690aed4f6e97a76035f3aeaa78168e2a458bc4cccf521e97ebdb6e0b61c819facb04af9ebb3638383", + "sha1": "8809c7aa6c71389e9c59abfe5def52c1cb8d4f1c" + }, + "required_dependencies": [], + "size": 20300, + "date_published": "2024-04-21T05:04:09.708311Z" } ] }, { - "pakku_id": "GzdI0oHwJrRp9mrA", + "pakku_id": "OHzftr8XsZM6XbYZ", "pakku_links": [ - "yTR90RtnmEyMuFnr" + "yTR90RtnmEyMuFnr", + "8yUuu1fbwebEeWRc" ], "type": "MOD", "side": "CLIENT", "slug": { - "curseforge": "controlling" + "curseforge": "controlling", + "modrinth": "controlling" }, "name": { - "curseforge": "Controlling" + "curseforge": "Controlling", + "modrinth": "Controlling" }, "id": { - "curseforge": "250398" + "curseforge": "250398", + "modrinth": "xv94TkTM" }, "files": [ { - "type": "curseforge", + "type": "modrinth", "file_name": "Controlling-forge-1.20.1-12.0.2.jar", "mc_versions": [ "1.20.1" @@ -1608,18 +1748,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/4646/682/Controlling-forge-1.20.1-12.0.2.jar", - "id": "4646682", - "parent_id": "250398", + "url": "https://cdn.modrinth.com/data/xv94TkTM/versions/LH6Bi6Am/Controlling-forge-1.20.1-12.0.2.jar", + "id": "LH6Bi6Am", + "parent_id": "xv94TkTM", "hashes": { - "sha1": "f6d3cdd3ec68c5590cf5b2e89c38dbf031824bfd", - "md5": "952274bc9994bba9733e8747558f73fa" + "sha512": "3945bf3f6d843957f13584dfc70bede253d1e48f0dcb96f647fbcc6fcd3d1748a0dd9c6ca5c882e07a41f98eb84057934f51e43ab6023ed0a19695de2e6fe9f5", + "sha1": "6195a3d1464f8fb641d7e165163aea1a857ce08e" }, "required_dependencies": [ - "858542" + "fuuu3xnx" ], "size": 115280, - "date_published": "2023-07-16T04:39:22.697Z" + "date_published": "2023-07-16T04:39:30.644589Z" } ] }, @@ -1692,16 +1832,20 @@ ] }, { - "pakku_id": "w2JoHfVDhChSvfRK", + "pakku_id": "sB9gSEmLABWCMLZL", "type": "MOD", + "side": "BOTH", "slug": { - "curseforge": "corpse" + "curseforge": "corpse", + "modrinth": "corpse" }, "name": { - "curseforge": "Corpse" + "curseforge": "Corpse", + "modrinth": "Corpse" }, "id": { - "curseforge": "316582" + "curseforge": "316582", + "modrinth": "WrpuIfhw" }, "files": [ { @@ -1714,16 +1858,37 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/5661/478/corpse-forge-1.20.1-1.0.14.jar", - "id": "5661478", + "url": "https://edge.forgecdn.net/files/5985/511/corpse-forge-1.20.1-1.0.14.jar", + "id": "5985511", "parent_id": "316582", "hashes": { - "sha1": "48dcc561acd65585c546b39b4a6716bf43672976", - "md5": "a6f4636df407761c177fab2d485280cf" + "sha1": "db1348bf38522cdac460cf203b9b72d66cf742d9", + "md5": "15c7502edeaba9e1025fe81453720477" }, "required_dependencies": [], - "size": 243748, - "date_published": "2024-08-25T09:04:11.647Z" + "size": 244998, + "date_published": "2024-12-12T16:50:10.933Z" + }, + { + "type": "modrinth", + "file_name": "corpse-forge-1.20.1-1.0.14.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/WrpuIfhw/versions/TlmJAOz2/corpse-forge-1.20.1-1.0.14.jar", + "id": "TlmJAOz2", + "parent_id": "WrpuIfhw", + "hashes": { + "sha512": "0a709113a43830e0974e85bada6fc9c3345379e1e4386c5f18fe1568d48d66affa172390c6c3d0acfb3e10a60a8062b503c0da3ea5e850ead103e50a05584ed2", + "sha1": "72344b98b481e55795b5b1937f11c9641c53f619" + }, + "required_dependencies": [], + "size": 244998, + "date_published": "2024-12-12T19:08:25.932146Z" } ] }, @@ -1833,19 +1998,23 @@ ] }, { - "pakku_id": "7BDiKQxTw2I9CY1A", + "pakku_id": "9FLmqyqGrtHadrHV", "pakku_links": [ - "CBSBD7u2DdsFEaoX" + "nSmnsenCD9KSplvm" ], "type": "MOD", + "side": "BOTH", "slug": { - "curseforge": "crafting-tweaks" + "curseforge": "crafting-tweaks", + "modrinth": "crafting-tweaks" }, "name": { - "curseforge": "Crafting Tweaks" + "curseforge": "Crafting Tweaks", + "modrinth": "Crafting Tweaks" }, "id": { - "curseforge": "233071" + "curseforge": "233071", + "modrinth": "DMu0oBKf" }, "files": [ { @@ -1871,6 +2040,30 @@ ], "size": 221275, "date_published": "2024-08-13T07:08:04.687Z" + }, + { + "type": "modrinth", + "file_name": "craftingtweaks-forge-1.20.1-18.2.5.jar", + "mc_versions": [ + "1.20", + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/DMu0oBKf/versions/toAiSZzl/craftingtweaks-forge-1.20.1-18.2.5.jar", + "id": "toAiSZzl", + "parent_id": "DMu0oBKf", + "hashes": { + "sha512": "397f4faa63baf736c2fccb07182e5d0507116aaa506027311b7130e5047fd029bcc8e8f39353c1d1eb2bf9a6f1a12946d1ca2a4ccae74d082b8e517820da4d0b", + "sha1": "3c4bc369c16bdeb00782b2c141eeb6aecbbbcd0a" + }, + "required_dependencies": [ + "MBAkmtvl" + ], + "size": 221276, + "date_published": "2024-08-13T07:07:48.482441Z" } ] }, @@ -2262,7 +2455,7 @@ ] }, { - "pakku_id": "GOh1ocuoLHhYMq2J", + "pakku_id": "5UqsflpbLTegLWvO", "type": "MOD", "slug": { "curseforge": "cupboard" @@ -2366,7 +2559,8 @@ { "pakku_id": "LdL5SyxWFRXcqOzw", "pakku_links": [ - "CBSBD7u2DdsFEaoX" + "CBSBD7u2DdsFEaoX", + "nSmnsenCD9KSplvm" ], "type": "MOD", "slug": { @@ -7255,16 +7449,20 @@ ] }, { - "pakku_id": "65w2fJEd83KAQpHz", + "pakku_id": "ljO4VhmFy221z52d", "type": "MOD", + "side": "BOTH", "slug": { - "curseforge": "placebo" + "curseforge": "placebo", + "modrinth": "placebo" }, "name": { - "curseforge": "Placebo" + "curseforge": "Placebo", + "modrinth": "Placebo" }, "id": { - "curseforge": "283644" + "curseforge": "283644", + "modrinth": "tCkE8p2N" }, "files": [ { @@ -7551,9 +7749,9 @@ ] }, { - "pakku_id": "mLvNtlnkhh3Rrdhq", + "pakku_id": "M4Dcaj971tBzoSHy", "pakku_links": [ - "GOh1ocuoLHhYMq2J" + "5UqsflpbLTegLWvO" ], "type": "MOD", "slug": { @@ -7577,18 +7775,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/5581/360/recipeessentials-1.20.1-3.6.jar", - "id": "5581360", + "url": "https://edge.forgecdn.net/files/6056/900/recipeessentials-1.20.1-3.6.jar", + "id": "6056900", "parent_id": "907856", "hashes": { - "sha1": "65eb0d1447c9e96bac7c8f24fb73998f45c0da14", - "md5": "fbc49bde00072751b93eb071babb9511" + "sha1": "3e0bf298ca6e6f8d8a7ee2c97076e5e4250fd2fe", + "md5": "3ee83d9c3ddcba3f4f1b425f85c21d92" }, "required_dependencies": [ "326652" ], - "size": 52519, - "date_published": "2024-07-30T18:28:00.613Z" + "size": 55207, + "date_published": "2025-01-05T18:35:31.143Z" } ] }, @@ -7715,17 +7913,20 @@ ] }, { - "pakku_id": "yTR90RtnmEyMuFnr", + "pakku_id": "8yUuu1fbwebEeWRc", "type": "MOD", "side": "CLIENT", "slug": { - "curseforge": "searchables" + "curseforge": "searchables", + "modrinth": "searchables" }, "name": { - "curseforge": "Searchables" + "curseforge": "Searchables", + "modrinth": "Searchables" }, "id": { - "curseforge": "858542" + "curseforge": "858542", + "modrinth": "fuuu3xnx" }, "files": [ { @@ -7748,6 +7949,27 @@ "required_dependencies": [], "size": 77732, "date_published": "2024-04-23T06:56:49.313Z" + }, + { + "type": "modrinth", + "file_name": "Searchables-forge-1.20.1-1.0.3.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/fuuu3xnx/versions/PM9yAW1G/Searchables-forge-1.20.1-1.0.3.jar", + "id": "PM9yAW1G", + "parent_id": "fuuu3xnx", + "hashes": { + "sha512": "185617d6d446f3d4ef6c7d5c6ee4e2fb731a89f7495157313b21292ec6b8e3dbcc10c0379ab49ecb2d0c64d0a78df74750d7f7336d5e6c43516a7c92f278c0a2", + "sha1": "5b976f6e76ec74cdef21865e31f56bcb11558db7" + }, + "required_dependencies": [], + "size": 77732, + "date_published": "2024-04-23T06:56:56.381361Z" } ] }, @@ -8021,16 +8243,24 @@ ] }, { - "pakku_id": "oJGHQ159WfLFe4FX", + "pakku_id": "4vtETLwpFWWBll7Z", + "pakku_links": [ + "rGWvsBlQF5Fc28FG", + "Ja8BYh7qwYGKKSYS" + ], "type": "MOD", + "side": "BOTH", "slug": { - "curseforge": "sophisticated-backpacks" + "curseforge": "sophisticated-backpacks", + "modrinth": "sophisticated-backpacks" }, "name": { - "curseforge": "Sophisticated Backpacks" + "curseforge": "Sophisticated Backpacks", + "modrinth": "Sophisticated Backpacks" }, "id": { - "curseforge": "422301" + "curseforge": "422301", + "modrinth": "TyCTlI4b" }, "files": [ { @@ -8044,32 +8274,60 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/5296/475/sophisticatedbackpacks-1.20.1-3.20.5.1044.jar", - "id": "5296475", + "url": "https://edge.forgecdn.net/files/6078/400/sophisticatedbackpacks-1.20.1-3.20.5.1044.jar", + "id": "6078400", "parent_id": "422301", "hashes": { - "sha1": "82e97629d2383d87d65f6684c6270c438f95156b", - "md5": "1cb86d978ee8780206de685497d1faf0" + "sha1": "5725ea9d0d32ce14e08b8f2d8896c071d35e4ac1", + "md5": "7f68442d35bc82df53405a91432f5f91" }, "required_dependencies": [ "618298" ], - "size": 851750, - "date_published": "2024-04-27T20:58:03.903Z" + "size": 884853, + "date_published": "2025-01-11T23:24:18.020Z" + }, + { + "type": "modrinth", + "file_name": "sophisticatedbackpacks-1.20.1-3.20.5.1044.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge", + "neoforge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/TyCTlI4b/versions/BBnklAGB/sophisticatedbackpacks-1.20.1-3.20.5.1044.jar", + "id": "BBnklAGB", + "parent_id": "TyCTlI4b", + "hashes": { + "sha512": "00bbb6bfd0c503d4202a21d6aea511d0f1ed226600702c389cdb6d45b9c5164de5f5a02a6e0eb22c97001c0d761ff5996a94af41f5b1c704dbd1685aeb88bf1c", + "sha1": "f18f80d4bfa611b79426664c72118191bb39b446" + }, + "required_dependencies": [ + "nmoqTijg" + ], + "size": 884853, + "date_published": "2025-01-11T23:24:34.655448Z" } ] }, { - "pakku_id": "rGWvsBlQF5Fc28FG", + "pakku_id": "Ja8BYh7qwYGKKSYS", "type": "MOD", + "side": "BOTH", "slug": { - "curseforge": "sophisticated-core" + "curseforge": "sophisticated-core", + "modrinth": "sophisticated-core" }, "name": { - "curseforge": "Sophisticated Core" + "curseforge": "Sophisticated Core", + "modrinth": "Sophisticated Core" }, "id": { - "curseforge": "618298" + "curseforge": "618298", + "modrinth": "nmoqTijg" }, "files": [ { @@ -8083,16 +8341,38 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/5326/245/sophisticatedcore-1.20.1-0.6.22.611.jar", - "id": "5326245", + "url": "https://edge.forgecdn.net/files/6077/68/sophisticatedcore-1.20.1-0.6.22.611.jar", + "id": "6077068", "parent_id": "618298", "hashes": { - "sha1": "f2f9639f50d04fa4f6ae7a2e972428f40a8f80d4", - "md5": "3569d694bccc0e8e35ab7707b4baf0b1" + "sha1": "d9dc5fa6678bfe9886820d312af31b925404dced", + "md5": "e23b4cd582b140726f67a0c847657705" }, "required_dependencies": [], - "size": 1080551, - "date_published": "2024-05-08T09:36:29.750Z" + "size": 1137946, + "date_published": "2025-01-11T16:07:45.820Z" + }, + { + "type": "modrinth", + "file_name": "sophisticatedcore-1.20.1-0.6.22.611.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge", + "neoforge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/nmoqTijg/versions/zUCWJ5rF/sophisticatedcore-1.20.1-0.6.22.611.jar", + "id": "zUCWJ5rF", + "parent_id": "nmoqTijg", + "hashes": { + "sha512": "826fc1c3fc083f47671033156d111e1f13c79243c7334dcc863ee5064e004ba4f6c3a114f85ad017f2378855b543f4c0560e0ac693307059a913581b332b8630", + "sha1": "42842e9ad6c66669681a17618448d22828a0be2d" + }, + "required_dependencies": [], + "size": 1137947, + "date_published": "2025-01-11T16:08:04.095623Z" } ] }, @@ -8473,16 +8753,23 @@ ] }, { - "pakku_id": "jTFJiriG6OqMgTuz", + "pakku_id": "t7vhdrZdRVQR5XeC", + "pakku_links": [ + "F6H99cZ4H6jZRpEK" + ], "type": "MOD", + "side": "BOTH", "slug": { - "curseforge": "tfc-hot-or-not" + "curseforge": "tfc-hot-or-not", + "modrinth": "tfc-hot-or-not" }, "name": { - "curseforge": "TFC Hot or Not" + "curseforge": "TFC Hot or Not", + "modrinth": "TFC Hot or Not" }, "id": { - "curseforge": "499096" + "curseforge": "499096", + "modrinth": "6fOyWxrE" }, "files": [ { @@ -8496,16 +8783,42 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/5224/988/TFCHotOrNot-1.20.1-1.0.4.jar", - "id": "5224988", + "url": "https://edge.forgecdn.net/files/6047/294/TFCHotOrNot-1.20.1-1.0.4.jar", + "id": "6047294", "parent_id": "499096", "hashes": { - "sha1": "e14da2835e8194aa60ecdb8cfb8b2acab75d4d36", - "md5": "e873757565b7a5f2c73d0ebd7812b4d5" + "sha1": "383507ce61eaa1fe9368915536de8b3685517728", + "md5": "b246317dee8a8789f3cdb13f70cb2391" }, - "required_dependencies": [], - "size": 448456, - "date_published": "2024-03-31T15:46:58.620Z" + "required_dependencies": [ + "302973" + ], + "size": 464173, + "date_published": "2025-01-02T23:13:06.400Z" + }, + { + "type": "modrinth", + "file_name": "TFCHotOrNot-1.20.1-1.0.4.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge", + "neoforge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/6fOyWxrE/versions/5c1Fc17J/TFCHotOrNot-1.20.1-1.0.4.jar", + "id": "5c1Fc17J", + "parent_id": "6fOyWxrE", + "hashes": { + "sha512": "1f1360cabdd509a6aab65c4d3be822adeb45315553293cc80e5d1c77f444dc9e38fd904252c6ef9f60b80ec550792d4b9197c973ebb9ec459c5ba3dd946e0aeb", + "sha1": "383507ce61eaa1fe9368915536de8b3685517728" + }, + "required_dependencies": [ + "JaCEZUhg" + ], + "size": 464173, + "date_published": "2025-01-02T23:13:30.140364Z" } ] }, @@ -8644,16 +8957,20 @@ ] }, { - "pakku_id": "jo3K9IPap32RKmxd", + "pakku_id": "ly7B1QXfJ2pX1xHm", "type": "MOD", + "side": "BOTH", "slug": { - "curseforge": "water-flasks" + "curseforge": "water-flasks", + "modrinth": "water-flasks" }, "name": { - "curseforge": "TFC Water Flasks" + "curseforge": "TFC Water Flasks", + "modrinth": "Water Flasks" }, "id": { - "curseforge": "354353" + "curseforge": "354353", + "modrinth": "ONgsGaM9" }, "files": [ { @@ -8667,16 +8984,37 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/5666/352/waterflasks-3.0.3.jar", - "id": "5666352", + "url": "https://edge.forgecdn.net/files/5886/257/waterflasks-3.0.3.jar", + "id": "5886257", "parent_id": "354353", "hashes": { - "sha1": "2464553c4bf78e26b6a4ae6487aa0c94cd845d89", - "md5": "81b481ecd103fb8c74a7491d76d2133a" + "sha1": "d0a7c71a077713fb312cb89831debfc0886c5488", + "md5": "678eb1ea51d0c25df347ab0cca454a56" }, "required_dependencies": [], - "size": 824370, - "date_published": "2024-08-26T20:11:30.380Z" + "size": 931560, + "date_published": "2024-11-08T21:46:15.830Z" + }, + { + "type": "modrinth", + "file_name": "waterflasks-3.0.3.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/ONgsGaM9/versions/C6LQYEfr/waterflasks-3.0.3.jar", + "id": "C6LQYEfr", + "parent_id": "ONgsGaM9", + "hashes": { + "sha512": "8b2940c880ef8dedf31afef30b183519c16884c3e7bb3b1436fba366ed5f47a62ebc39acea550fcf12e02bcc57bcb64f98f1f0d309a4f2891394c28d6047dbb2", + "sha1": "d0a7c71a077713fb312cb89831debfc0886c5488" + }, + "required_dependencies": [], + "size": 931560, + "date_published": "2024-11-08T21:48:24.848798Z" } ] }, From 0babb1175aaca67d2632148a2726eaa812445fe0 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sun, 12 Jan 2025 17:28:38 +0500 Subject: [PATCH 33/33] Revert "Update pakku-lock.json" This reverts commit e7129dac26a1491dc25afeaacd5bf476db93510d. --- pakku-lock.json | 582 ++++++++++-------------------------------------- 1 file changed, 122 insertions(+), 460 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 4a63aafcc..857107252 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -247,23 +247,20 @@ ] }, { - "pakku_id": "D8R9K5y7VUMkfQ0I", + "pakku_id": "cVlajuXjdGCDgeWt", "pakku_links": [ "UOjZxqemtQFAP9R8" ], "type": "MOD", "side": "CLIENT", "slug": { - "curseforge": "ambientsounds", - "modrinth": "ambientsounds" + "curseforge": "ambientsounds" }, "name": { - "curseforge": "AmbientSounds 6", - "modrinth": "AmbientSounds" + "curseforge": "AmbientSounds 6" }, "id": { - "curseforge": "254284", - "modrinth": "fM515JnW" + "curseforge": "254284" }, "files": [ { @@ -277,42 +274,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/5968/59/AmbientSounds_FORGE_v6.1.1_mc1.20.1.jar", - "id": "5968059", + "url": "https://edge.forgecdn.net/files/5739/342/AmbientSounds_FORGE_v6.1.1_mc1.20.1.jar", + "id": "5739342", "parent_id": "254284", "hashes": { - "sha1": "4ed2c5bee5988f40cebef3bbc9dec39ab9096bf1", - "md5": "10709a88a6c11f0c4d6cf9759297a704" + "sha1": "5e8b5e0a899b647e30fc7ad2854c7c74393361d5", + "md5": "37f2875e2d9ad9bb70f3fc1f949da22e" }, "required_dependencies": [ "257814" ], - "size": 83885724, - "date_published": "2024-12-06T14:06:33.837Z" - }, - { - "type": "modrinth", - "file_name": "AmbientSounds_FORGE_v6.1.1_mc1.20.1.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge", - "neoforge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/fM515JnW/versions/8wDLqykj/AmbientSounds_FORGE_v6.1.1_mc1.20.1.jar", - "id": "8wDLqykj", - "parent_id": "fM515JnW", - "hashes": { - "sha512": "83baaee77627817718d5eab3f67bb93a9cb69012ff0de62f96ec18bba42f89c02a316324b9323d7300af180a2629a40ea34f3ecbad8821d9b1ff1103a194f8b3", - "sha1": "708a552879860884b7180b1867ada199001d698c" - }, - "required_dependencies": [ - "OsZiaDHq" - ], - "size": 83885725, - "date_published": "2024-12-06T14:29:25.836455Z" + "size": 85695724, + "date_published": "2024-09-20T08:46:30.717Z" } ] }, @@ -703,65 +676,38 @@ ] }, { - "pakku_id": "nSmnsenCD9KSplvm", + "pakku_id": "CBSBD7u2DdsFEaoX", "type": "MOD", - "side": "BOTH", "slug": { - "curseforge": "balm", - "modrinth": "balm" + "curseforge": "balm" }, "name": { - "curseforge": "Balm", - "modrinth": "Balm" + "curseforge": "Balm" }, "id": { - "curseforge": "531761", - "modrinth": "MBAkmtvl" + "curseforge": "531761" }, "files": [ { "type": "curseforge", "file_name": "balm-forge-1.20.1-7.3.9-all.jar", "mc_versions": [ - "1.20.1", - "1.20" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6077/684/balm-forge-1.20.1-7.3.9-all.jar", - "id": "6077684", - "parent_id": "531761", - "hashes": { - "sha1": "55e98bd34d43210f492d3aababe6583db96e3077", - "md5": "1ff3ff55f1968b426e7b808e8827f244" - }, - "required_dependencies": [], - "size": 373787, - "date_published": "2025-01-11T19:21:45.637Z" - }, - { - "type": "modrinth", - "file_name": "balm-forge-1.20.1-7.3.9-all.jar", - "mc_versions": [ - "1.20", "1.20.1" ], "loaders": [ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/MBAkmtvl/versions/YTL0DSNu/balm-forge-1.20.1-7.3.9-all.jar", - "id": "YTL0DSNu", - "parent_id": "MBAkmtvl", + "url": "https://edge.forgecdn.net/files/5644/976/balm-forge-1.20.1-7.3.9-all.jar", + "id": "5644976", + "parent_id": "531761", "hashes": { - "sha512": "203d17bef716fb920ca762a524e774cf4b628fbda620a2bda9d9ff47a44c36f60ef06591e4911b4c75673a2f70efed595c589ddbcbd87d3549e0a43bd7804193", - "sha1": "31ec8590783cf3d40d3077efb60ceb7ab5928b2d" + "sha1": "e041f044d707dd06a6efa2c63b39f26abf60f671", + "md5": "ccb8e1687a39cc613ad910460bd4ac3b" }, "required_dependencies": [], - "size": 373787, - "date_published": "2025-01-11T19:21:38.118245Z" + "size": 373583, + "date_published": "2024-08-19T19:53:51.597Z" } ] }, @@ -1228,23 +1174,16 @@ ] }, { - "pakku_id": "oW7roeBSwAk7qxrL", - "pakku_links": [ - "3B5EGC3hh54PlLuy" - ], + "pakku_id": "NZANIGIK8HPdr4i7", "type": "MOD", - "side": "BOTH", "slug": { - "curseforge": "carpeted-stairs", - "modrinth": "carpeted-stairs" + "curseforge": "carpeted-stairs" }, "name": { - "curseforge": "Carpeted Stairs & Slabs", - "modrinth": "Carpeted Stairs & Slabs" + "curseforge": "Carpeted Stairs & Slabs" }, "id": { - "curseforge": "720848", - "modrinth": "Ogzlp7me" + "curseforge": "720848" }, "files": [ { @@ -1270,29 +1209,6 @@ ], "size": 81717, "date_published": "2023-06-25T13:50:29.323Z" - }, - { - "type": "modrinth", - "file_name": "carpeted-1.20-1.4.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/Ogzlp7me/versions/5v8AkQ8d/carpeted-1.20-1.4.jar", - "id": "5v8AkQ8d", - "parent_id": "Ogzlp7me", - "hashes": { - "sha512": "4c9932e314ed8b9db1947e5a1174d84261e2b1258224ec1583fe84c4b8451fa34e750a660113abd19a4866b06f48bc80dd266167a247a0b743afddc4e3a80d5c", - "sha1": "5f177a96a08454572723cf31fee9187c6bc1140e" - }, - "required_dependencies": [ - "twkfQtEc" - ], - "size": 81717, - "date_published": "2023-07-20T22:42:01.926447Z" } ] }, @@ -1361,7 +1277,7 @@ ] }, { - "pakku_id": "ZO1AhknuOpXV5b7Z", + "pakku_id": "scaS4vsSneWYIouC", "type": "MOD", "slug": { "curseforge": "catalogue" @@ -1523,23 +1439,20 @@ ] }, { - "pakku_id": "AdxIV6YtgwKFXBHj", + "pakku_id": "2wmaTBMHkCmjJgHW", "pakku_links": [ - "nSmnsenCD9KSplvm" + "CBSBD7u2DdsFEaoX" ], "type": "MOD", "side": "CLIENT", "slug": { - "curseforge": "client-tweaks", - "modrinth": "client-tweaks" + "curseforge": "client-tweaks" }, "name": { - "curseforge": "Client Tweaks", - "modrinth": "Client Tweaks" + "curseforge": "Client Tweaks" }, "id": { - "curseforge": "251407", - "modrinth": "vPNqo58Q" + "curseforge": "251407" }, "files": [ { @@ -1565,30 +1478,6 @@ ], "size": 131208, "date_published": "2023-09-14T10:30:30.320Z" - }, - { - "type": "modrinth", - "file_name": "clienttweaks-forge-1.20-11.1.0.jar", - "mc_versions": [ - "1.20", - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/vPNqo58Q/versions/7Zzx91AW/clienttweaks-forge-1.20-11.1.0.jar", - "id": "7Zzx91AW", - "parent_id": "vPNqo58Q", - "hashes": { - "sha512": "5995788c20ae1c9e24f68a2ff7479841b2d0dbb1a299f25ad2208ae54b4bcb3ab1b3a22403139c31470240877f42eba113d8c7b9e704831e8df63c35179d6dbc", - "sha1": "f46ab635dfb286443581a24d2162b4ab442dbf83" - }, - "required_dependencies": [ - "MBAkmtvl" - ], - "size": 131209, - "date_published": "2023-09-14T10:30:27.975695Z" } ] }, @@ -1657,20 +1546,16 @@ ] }, { - "pakku_id": "ocoWbpFEv2jES9I4", + "pakku_id": "od9yjKETa58AwHsT", "type": "MOD", - "side": "BOTH", "slug": { - "curseforge": "clumps", - "modrinth": "clumps" + "curseforge": "clumps" }, "name": { - "curseforge": "Clumps", - "modrinth": "Clumps" + "curseforge": "Clumps" }, "id": { - "curseforge": "256717", - "modrinth": "Wnxd13zP" + "curseforge": "256717" }, "files": [ { @@ -1693,53 +1578,28 @@ "required_dependencies": [], "size": 20299, "date_published": "2024-04-21T05:04:02.807Z" - }, - { - "type": "modrinth", - "file_name": "Clumps-forge-1.20.1-12.0.0.4.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/Wnxd13zP/versions/nAHGB5ls/Clumps-forge-1.20.1-12.0.0.4.jar", - "id": "nAHGB5ls", - "parent_id": "Wnxd13zP", - "hashes": { - "sha512": "ffd8ff2438e9f9d260d3926ccdd0cccc4772c6f99f29715690aed4f6e97a76035f3aeaa78168e2a458bc4cccf521e97ebdb6e0b61c819facb04af9ebb3638383", - "sha1": "8809c7aa6c71389e9c59abfe5def52c1cb8d4f1c" - }, - "required_dependencies": [], - "size": 20300, - "date_published": "2024-04-21T05:04:09.708311Z" } ] }, { - "pakku_id": "OHzftr8XsZM6XbYZ", + "pakku_id": "GzdI0oHwJrRp9mrA", "pakku_links": [ - "yTR90RtnmEyMuFnr", - "8yUuu1fbwebEeWRc" + "yTR90RtnmEyMuFnr" ], "type": "MOD", "side": "CLIENT", "slug": { - "curseforge": "controlling", - "modrinth": "controlling" + "curseforge": "controlling" }, "name": { - "curseforge": "Controlling", - "modrinth": "Controlling" + "curseforge": "Controlling" }, "id": { - "curseforge": "250398", - "modrinth": "xv94TkTM" + "curseforge": "250398" }, "files": [ { - "type": "modrinth", + "type": "curseforge", "file_name": "Controlling-forge-1.20.1-12.0.2.jar", "mc_versions": [ "1.20.1" @@ -1748,18 +1608,18 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/xv94TkTM/versions/LH6Bi6Am/Controlling-forge-1.20.1-12.0.2.jar", - "id": "LH6Bi6Am", - "parent_id": "xv94TkTM", + "url": "https://edge.forgecdn.net/files/4646/682/Controlling-forge-1.20.1-12.0.2.jar", + "id": "4646682", + "parent_id": "250398", "hashes": { - "sha512": "3945bf3f6d843957f13584dfc70bede253d1e48f0dcb96f647fbcc6fcd3d1748a0dd9c6ca5c882e07a41f98eb84057934f51e43ab6023ed0a19695de2e6fe9f5", - "sha1": "6195a3d1464f8fb641d7e165163aea1a857ce08e" + "sha1": "f6d3cdd3ec68c5590cf5b2e89c38dbf031824bfd", + "md5": "952274bc9994bba9733e8747558f73fa" }, "required_dependencies": [ - "fuuu3xnx" + "858542" ], "size": 115280, - "date_published": "2023-07-16T04:39:30.644589Z" + "date_published": "2023-07-16T04:39:22.697Z" } ] }, @@ -1832,20 +1692,16 @@ ] }, { - "pakku_id": "sB9gSEmLABWCMLZL", + "pakku_id": "w2JoHfVDhChSvfRK", "type": "MOD", - "side": "BOTH", "slug": { - "curseforge": "corpse", - "modrinth": "corpse" + "curseforge": "corpse" }, "name": { - "curseforge": "Corpse", - "modrinth": "Corpse" + "curseforge": "Corpse" }, "id": { - "curseforge": "316582", - "modrinth": "WrpuIfhw" + "curseforge": "316582" }, "files": [ { @@ -1858,37 +1714,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/5985/511/corpse-forge-1.20.1-1.0.14.jar", - "id": "5985511", + "url": "https://edge.forgecdn.net/files/5661/478/corpse-forge-1.20.1-1.0.14.jar", + "id": "5661478", "parent_id": "316582", "hashes": { - "sha1": "db1348bf38522cdac460cf203b9b72d66cf742d9", - "md5": "15c7502edeaba9e1025fe81453720477" + "sha1": "48dcc561acd65585c546b39b4a6716bf43672976", + "md5": "a6f4636df407761c177fab2d485280cf" }, "required_dependencies": [], - "size": 244998, - "date_published": "2024-12-12T16:50:10.933Z" - }, - { - "type": "modrinth", - "file_name": "corpse-forge-1.20.1-1.0.14.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/WrpuIfhw/versions/TlmJAOz2/corpse-forge-1.20.1-1.0.14.jar", - "id": "TlmJAOz2", - "parent_id": "WrpuIfhw", - "hashes": { - "sha512": "0a709113a43830e0974e85bada6fc9c3345379e1e4386c5f18fe1568d48d66affa172390c6c3d0acfb3e10a60a8062b503c0da3ea5e850ead103e50a05584ed2", - "sha1": "72344b98b481e55795b5b1937f11c9641c53f619" - }, - "required_dependencies": [], - "size": 244998, - "date_published": "2024-12-12T19:08:25.932146Z" + "size": 243748, + "date_published": "2024-08-25T09:04:11.647Z" } ] }, @@ -1998,23 +1833,19 @@ ] }, { - "pakku_id": "9FLmqyqGrtHadrHV", + "pakku_id": "7BDiKQxTw2I9CY1A", "pakku_links": [ - "nSmnsenCD9KSplvm" + "CBSBD7u2DdsFEaoX" ], "type": "MOD", - "side": "BOTH", "slug": { - "curseforge": "crafting-tweaks", - "modrinth": "crafting-tweaks" + "curseforge": "crafting-tweaks" }, "name": { - "curseforge": "Crafting Tweaks", - "modrinth": "Crafting Tweaks" + "curseforge": "Crafting Tweaks" }, "id": { - "curseforge": "233071", - "modrinth": "DMu0oBKf" + "curseforge": "233071" }, "files": [ { @@ -2040,30 +1871,6 @@ ], "size": 221275, "date_published": "2024-08-13T07:08:04.687Z" - }, - { - "type": "modrinth", - "file_name": "craftingtweaks-forge-1.20.1-18.2.5.jar", - "mc_versions": [ - "1.20", - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/DMu0oBKf/versions/toAiSZzl/craftingtweaks-forge-1.20.1-18.2.5.jar", - "id": "toAiSZzl", - "parent_id": "DMu0oBKf", - "hashes": { - "sha512": "397f4faa63baf736c2fccb07182e5d0507116aaa506027311b7130e5047fd029bcc8e8f39353c1d1eb2bf9a6f1a12946d1ca2a4ccae74d082b8e517820da4d0b", - "sha1": "3c4bc369c16bdeb00782b2c141eeb6aecbbbcd0a" - }, - "required_dependencies": [ - "MBAkmtvl" - ], - "size": 221276, - "date_published": "2024-08-13T07:07:48.482441Z" } ] }, @@ -2455,7 +2262,7 @@ ] }, { - "pakku_id": "5UqsflpbLTegLWvO", + "pakku_id": "GOh1ocuoLHhYMq2J", "type": "MOD", "slug": { "curseforge": "cupboard" @@ -2559,8 +2366,7 @@ { "pakku_id": "LdL5SyxWFRXcqOzw", "pakku_links": [ - "CBSBD7u2DdsFEaoX", - "nSmnsenCD9KSplvm" + "CBSBD7u2DdsFEaoX" ], "type": "MOD", "slug": { @@ -7449,20 +7255,16 @@ ] }, { - "pakku_id": "ljO4VhmFy221z52d", + "pakku_id": "65w2fJEd83KAQpHz", "type": "MOD", - "side": "BOTH", "slug": { - "curseforge": "placebo", - "modrinth": "placebo" + "curseforge": "placebo" }, "name": { - "curseforge": "Placebo", - "modrinth": "Placebo" + "curseforge": "Placebo" }, "id": { - "curseforge": "283644", - "modrinth": "tCkE8p2N" + "curseforge": "283644" }, "files": [ { @@ -7749,9 +7551,9 @@ ] }, { - "pakku_id": "M4Dcaj971tBzoSHy", + "pakku_id": "mLvNtlnkhh3Rrdhq", "pakku_links": [ - "5UqsflpbLTegLWvO" + "GOh1ocuoLHhYMq2J" ], "type": "MOD", "slug": { @@ -7775,18 +7577,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6056/900/recipeessentials-1.20.1-3.6.jar", - "id": "6056900", + "url": "https://edge.forgecdn.net/files/5581/360/recipeessentials-1.20.1-3.6.jar", + "id": "5581360", "parent_id": "907856", "hashes": { - "sha1": "3e0bf298ca6e6f8d8a7ee2c97076e5e4250fd2fe", - "md5": "3ee83d9c3ddcba3f4f1b425f85c21d92" + "sha1": "65eb0d1447c9e96bac7c8f24fb73998f45c0da14", + "md5": "fbc49bde00072751b93eb071babb9511" }, "required_dependencies": [ "326652" ], - "size": 55207, - "date_published": "2025-01-05T18:35:31.143Z" + "size": 52519, + "date_published": "2024-07-30T18:28:00.613Z" } ] }, @@ -7913,20 +7715,17 @@ ] }, { - "pakku_id": "8yUuu1fbwebEeWRc", + "pakku_id": "yTR90RtnmEyMuFnr", "type": "MOD", "side": "CLIENT", "slug": { - "curseforge": "searchables", - "modrinth": "searchables" + "curseforge": "searchables" }, "name": { - "curseforge": "Searchables", - "modrinth": "Searchables" + "curseforge": "Searchables" }, "id": { - "curseforge": "858542", - "modrinth": "fuuu3xnx" + "curseforge": "858542" }, "files": [ { @@ -7949,27 +7748,6 @@ "required_dependencies": [], "size": 77732, "date_published": "2024-04-23T06:56:49.313Z" - }, - { - "type": "modrinth", - "file_name": "Searchables-forge-1.20.1-1.0.3.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/fuuu3xnx/versions/PM9yAW1G/Searchables-forge-1.20.1-1.0.3.jar", - "id": "PM9yAW1G", - "parent_id": "fuuu3xnx", - "hashes": { - "sha512": "185617d6d446f3d4ef6c7d5c6ee4e2fb731a89f7495157313b21292ec6b8e3dbcc10c0379ab49ecb2d0c64d0a78df74750d7f7336d5e6c43516a7c92f278c0a2", - "sha1": "5b976f6e76ec74cdef21865e31f56bcb11558db7" - }, - "required_dependencies": [], - "size": 77732, - "date_published": "2024-04-23T06:56:56.381361Z" } ] }, @@ -8243,24 +8021,16 @@ ] }, { - "pakku_id": "4vtETLwpFWWBll7Z", - "pakku_links": [ - "rGWvsBlQF5Fc28FG", - "Ja8BYh7qwYGKKSYS" - ], + "pakku_id": "oJGHQ159WfLFe4FX", "type": "MOD", - "side": "BOTH", "slug": { - "curseforge": "sophisticated-backpacks", - "modrinth": "sophisticated-backpacks" + "curseforge": "sophisticated-backpacks" }, "name": { - "curseforge": "Sophisticated Backpacks", - "modrinth": "Sophisticated Backpacks" + "curseforge": "Sophisticated Backpacks" }, "id": { - "curseforge": "422301", - "modrinth": "TyCTlI4b" + "curseforge": "422301" }, "files": [ { @@ -8274,60 +8044,32 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6078/400/sophisticatedbackpacks-1.20.1-3.20.5.1044.jar", - "id": "6078400", + "url": "https://edge.forgecdn.net/files/5296/475/sophisticatedbackpacks-1.20.1-3.20.5.1044.jar", + "id": "5296475", "parent_id": "422301", "hashes": { - "sha1": "5725ea9d0d32ce14e08b8f2d8896c071d35e4ac1", - "md5": "7f68442d35bc82df53405a91432f5f91" + "sha1": "82e97629d2383d87d65f6684c6270c438f95156b", + "md5": "1cb86d978ee8780206de685497d1faf0" }, "required_dependencies": [ "618298" ], - "size": 884853, - "date_published": "2025-01-11T23:24:18.020Z" - }, - { - "type": "modrinth", - "file_name": "sophisticatedbackpacks-1.20.1-3.20.5.1044.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge", - "neoforge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/TyCTlI4b/versions/BBnklAGB/sophisticatedbackpacks-1.20.1-3.20.5.1044.jar", - "id": "BBnklAGB", - "parent_id": "TyCTlI4b", - "hashes": { - "sha512": "00bbb6bfd0c503d4202a21d6aea511d0f1ed226600702c389cdb6d45b9c5164de5f5a02a6e0eb22c97001c0d761ff5996a94af41f5b1c704dbd1685aeb88bf1c", - "sha1": "f18f80d4bfa611b79426664c72118191bb39b446" - }, - "required_dependencies": [ - "nmoqTijg" - ], - "size": 884853, - "date_published": "2025-01-11T23:24:34.655448Z" + "size": 851750, + "date_published": "2024-04-27T20:58:03.903Z" } ] }, { - "pakku_id": "Ja8BYh7qwYGKKSYS", + "pakku_id": "rGWvsBlQF5Fc28FG", "type": "MOD", - "side": "BOTH", "slug": { - "curseforge": "sophisticated-core", - "modrinth": "sophisticated-core" + "curseforge": "sophisticated-core" }, "name": { - "curseforge": "Sophisticated Core", - "modrinth": "Sophisticated Core" + "curseforge": "Sophisticated Core" }, "id": { - "curseforge": "618298", - "modrinth": "nmoqTijg" + "curseforge": "618298" }, "files": [ { @@ -8341,38 +8083,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6077/68/sophisticatedcore-1.20.1-0.6.22.611.jar", - "id": "6077068", + "url": "https://edge.forgecdn.net/files/5326/245/sophisticatedcore-1.20.1-0.6.22.611.jar", + "id": "5326245", "parent_id": "618298", "hashes": { - "sha1": "d9dc5fa6678bfe9886820d312af31b925404dced", - "md5": "e23b4cd582b140726f67a0c847657705" + "sha1": "f2f9639f50d04fa4f6ae7a2e972428f40a8f80d4", + "md5": "3569d694bccc0e8e35ab7707b4baf0b1" }, "required_dependencies": [], - "size": 1137946, - "date_published": "2025-01-11T16:07:45.820Z" - }, - { - "type": "modrinth", - "file_name": "sophisticatedcore-1.20.1-0.6.22.611.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge", - "neoforge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/nmoqTijg/versions/zUCWJ5rF/sophisticatedcore-1.20.1-0.6.22.611.jar", - "id": "zUCWJ5rF", - "parent_id": "nmoqTijg", - "hashes": { - "sha512": "826fc1c3fc083f47671033156d111e1f13c79243c7334dcc863ee5064e004ba4f6c3a114f85ad017f2378855b543f4c0560e0ac693307059a913581b332b8630", - "sha1": "42842e9ad6c66669681a17618448d22828a0be2d" - }, - "required_dependencies": [], - "size": 1137947, - "date_published": "2025-01-11T16:08:04.095623Z" + "size": 1080551, + "date_published": "2024-05-08T09:36:29.750Z" } ] }, @@ -8753,23 +8473,16 @@ ] }, { - "pakku_id": "t7vhdrZdRVQR5XeC", - "pakku_links": [ - "F6H99cZ4H6jZRpEK" - ], + "pakku_id": "jTFJiriG6OqMgTuz", "type": "MOD", - "side": "BOTH", "slug": { - "curseforge": "tfc-hot-or-not", - "modrinth": "tfc-hot-or-not" + "curseforge": "tfc-hot-or-not" }, "name": { - "curseforge": "TFC Hot or Not", - "modrinth": "TFC Hot or Not" + "curseforge": "TFC Hot or Not" }, "id": { - "curseforge": "499096", - "modrinth": "6fOyWxrE" + "curseforge": "499096" }, "files": [ { @@ -8783,42 +8496,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6047/294/TFCHotOrNot-1.20.1-1.0.4.jar", - "id": "6047294", + "url": "https://edge.forgecdn.net/files/5224/988/TFCHotOrNot-1.20.1-1.0.4.jar", + "id": "5224988", "parent_id": "499096", "hashes": { - "sha1": "383507ce61eaa1fe9368915536de8b3685517728", - "md5": "b246317dee8a8789f3cdb13f70cb2391" + "sha1": "e14da2835e8194aa60ecdb8cfb8b2acab75d4d36", + "md5": "e873757565b7a5f2c73d0ebd7812b4d5" }, - "required_dependencies": [ - "302973" - ], - "size": 464173, - "date_published": "2025-01-02T23:13:06.400Z" - }, - { - "type": "modrinth", - "file_name": "TFCHotOrNot-1.20.1-1.0.4.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge", - "neoforge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/6fOyWxrE/versions/5c1Fc17J/TFCHotOrNot-1.20.1-1.0.4.jar", - "id": "5c1Fc17J", - "parent_id": "6fOyWxrE", - "hashes": { - "sha512": "1f1360cabdd509a6aab65c4d3be822adeb45315553293cc80e5d1c77f444dc9e38fd904252c6ef9f60b80ec550792d4b9197c973ebb9ec459c5ba3dd946e0aeb", - "sha1": "383507ce61eaa1fe9368915536de8b3685517728" - }, - "required_dependencies": [ - "JaCEZUhg" - ], - "size": 464173, - "date_published": "2025-01-02T23:13:30.140364Z" + "required_dependencies": [], + "size": 448456, + "date_published": "2024-03-31T15:46:58.620Z" } ] }, @@ -8957,20 +8644,16 @@ ] }, { - "pakku_id": "ly7B1QXfJ2pX1xHm", + "pakku_id": "jo3K9IPap32RKmxd", "type": "MOD", - "side": "BOTH", "slug": { - "curseforge": "water-flasks", - "modrinth": "water-flasks" + "curseforge": "water-flasks" }, "name": { - "curseforge": "TFC Water Flasks", - "modrinth": "Water Flasks" + "curseforge": "TFC Water Flasks" }, "id": { - "curseforge": "354353", - "modrinth": "ONgsGaM9" + "curseforge": "354353" }, "files": [ { @@ -8984,37 +8667,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/5886/257/waterflasks-3.0.3.jar", - "id": "5886257", + "url": "https://edge.forgecdn.net/files/5666/352/waterflasks-3.0.3.jar", + "id": "5666352", "parent_id": "354353", "hashes": { - "sha1": "d0a7c71a077713fb312cb89831debfc0886c5488", - "md5": "678eb1ea51d0c25df347ab0cca454a56" + "sha1": "2464553c4bf78e26b6a4ae6487aa0c94cd845d89", + "md5": "81b481ecd103fb8c74a7491d76d2133a" }, "required_dependencies": [], - "size": 931560, - "date_published": "2024-11-08T21:46:15.830Z" - }, - { - "type": "modrinth", - "file_name": "waterflasks-3.0.3.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/ONgsGaM9/versions/C6LQYEfr/waterflasks-3.0.3.jar", - "id": "C6LQYEfr", - "parent_id": "ONgsGaM9", - "hashes": { - "sha512": "8b2940c880ef8dedf31afef30b183519c16884c3e7bb3b1436fba366ed5f47a62ebc39acea550fcf12e02bcc57bcb64f98f1f0d309a4f2891394c28d6047dbb2", - "sha1": "d0a7c71a077713fb312cb89831debfc0886c5488" - }, - "required_dependencies": [], - "size": 931560, - "date_published": "2024-11-08T21:48:24.848798Z" + "size": 824370, + "date_published": "2024-08-26T20:11:30.380Z" } ] },