From 2180da493262d6e8c4d9334060c649f3bd95f080 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 7 Jun 2025 20:06:27 +0100 Subject: [PATCH] cc recipe tweaks --- config/fallingtrees_common.json | 210 +++++++++--------- .../server_scripts/computer_craft/recipes.js | 8 +- kubejs/startup_scripts/ad_astra/materials.js | 47 ++-- kubejs/startup_scripts/gtceu/materials.js | 2 +- 4 files changed, 147 insertions(+), 120 deletions(-) diff --git a/config/fallingtrees_common.json b/config/fallingtrees_common.json index 9f62a9d23..3e2a1cb52 100644 --- a/config/fallingtrees_common.json +++ b/config/fallingtrees_common.json @@ -1,104 +1,110 @@ { - "disableCrouchMining": false, - "disableExtraToolDamage": false, - "disableExtraFoodExhaustion": false, - "treeLifetimeLength": 4.0, - "dynamicMiningSpeed": { - "disable": false, - "speedMultiplication": 0.05, - "maxSpeedMultiplication": 16.0 - }, - "trees": { - "standardTree": { - "algorithm": { - "maxLeavesRadius": 15, - "maxLogAmount": 512, - "shouldFallOnMaxLogAmount": true, - "shouldIgnorePersistentLeaves": true - }, - "logFilter": { - "whitelistedTags": [ - "minecraft:logs" - ], - "whitelist": [], - "blacklist": [] - }, - "leavesFilter": { - "whitelistedTags": [ - "minecraft:leaves" - ], - "whitelist": [], - "blacklist": [] - }, - "extraBlockFilter": { - "whitelistedTags": [], - "whitelist": [ - "minecraft:vine", - "minecraft:bee_nest", - "minecraft:cocoa" - ], - "blacklist": [] - }, - "enabled": true, - "onlyFallWithRequiredTool": false, - "allowedToolFilter": { - "whitelistedTags": [ - "minecraft:axes" - ], - "whitelist": [], - "blacklist": [] - } - }, - "verticalTree": { - "filter": { - "whitelistedTags": [], - "whitelist": [ - "minecraft:cactus", - "minecraft:bamboo" - ], - "blacklist": [] - }, - "enabled": true, - "onlyFallWithRequiredTool": false, - "allowedToolFilter": { - "whitelistedTags": [], - "whitelist": [], - "blacklist": [] - } - }, - "chorusTree": { - "enabled": false, - "onlyFallWithRequiredTool": false, - "allowedToolFilter": { - "whitelistedTags": [], - "whitelist": [], - "blacklist": [] - } - }, - "mushroomTree": { - "stemFilter": { - "whitelistedTags": [], - "whitelist": [ - "minecraft:mushroom_stem" - ], - "blacklist": [] - }, - "capFilter": { - "whitelistedTags": [], - "whitelist": [ - "minecraft:red_mushroom_block", - "minecraft:brown_mushroom_block", - "minecraft:shroomlight" - ], - "blacklist": [] - }, - "enabled": true, - "onlyFallWithRequiredTool": false, - "allowedToolFilter": { - "whitelistedTags": [], - "whitelist": [], - "blacklist": [] - } - } - } + "disableCrouchMining": false, + "disableExtraToolDamage": false, + "disableExtraFoodExhaustion": false, + "treeLifetimeLength": 4.0, + "dynamicMiningSpeed": { + "disable": false, + "speedMultiplication": 0.05, + "maxSpeedMultiplication": 16.0 + }, + "trees": { + "standardTree": { + "algorithm": { + "maxLeavesRadius": 15, + "maxLogAmount": 512, + "shouldFallOnMaxLogAmount": true, + "shouldIgnorePersistentLeaves": true + }, + "logFilter": { + "whitelistedTags": [ + "minecraft:logs" + ], + "whitelist": [], + "blacklist": [] + }, + "leavesFilter": { + "whitelistedTags": [ + "minecraft:leaves" + ], + "whitelist": [], + "blacklist": [] + }, + "extraBlockFilter": { + "whitelistedTags": [], + "whitelist": [ + "minecraft:vine", + "minecraft:bee_nest", + "minecraft:cocoa" + ], + "blacklist": [] + }, + "enabled": true, + "onlyFallWithRequiredTool": false, + "allowedToolFilter": { + "whitelistedTags": [ + "minecraft:axes" + ], + "whitelist": [], + "blacklist": [] + } + }, + "verticalTree": { + "filter": { + "whitelistedTags": [], + "whitelist": [ + "minecraft:cactus", + "minecraft:bamboo" + ], + "blacklist": [] + }, + "enabled": true, + "onlyFallWithRequiredTool": false, + "allowedToolFilter": { + "whitelistedTags": [], + "whitelist": [], + "blacklist": [] + } + }, + "chorusTree": { + "enabled": true, + "filter": { + "whitelist": [ + "tfg:lunar_chorus_plant", + "tfg:lunar_chorus_flower" + ] + }, + "onlyFallWithRequiredTool": false, + "allowedToolFilter": { + "whitelistedTags": [], + "whitelist": [], + "blacklist": [] + } + }, + "mushroomTree": { + "stemFilter": { + "whitelistedTags": [], + "whitelist": [ + "minecraft:mushroom_stem" + ], + "blacklist": [] + }, + "capFilter": { + "whitelistedTags": [], + "whitelist": [ + "minecraft:red_mushroom_block", + "minecraft:brown_mushroom_block", + "minecraft:shroomlight" + ], + "blacklist": [] + }, + "enabled": true, + "onlyFallWithRequiredTool": false, + "allowedToolFilter": { + "whitelistedTags": [], + "whitelist": [], + "blacklist": [] + } + } + } } \ No newline at end of file diff --git a/kubejs/server_scripts/computer_craft/recipes.js b/kubejs/server_scripts/computer_craft/recipes.js index db1a6f95f..b2f3892e5 100644 --- a/kubejs/server_scripts/computer_craft/recipes.js +++ b/kubejs/server_scripts/computer_craft/recipes.js @@ -78,9 +78,9 @@ const registerComputerCraftRecipes = (event) => { ], { A: 'computercraft:cable', B: 'ae2:drive', - C: '#gtceu:circuits/hv', - D: 'gtceu:hv_machine_casing', - E: 'gtceu:hv_sensor', + C: '#gtceu:circuits/mv', + D: 'gtceu:mv_machine_casing', + E: 'gtceu:mv_sensor', }).id('tfg:crafting/disk_drive') // Speaker @@ -105,7 +105,7 @@ const registerComputerCraftRecipes = (event) => { B: '#gtceu:circuits/mv', C: 'gtceu:mv_robot_arm', D: 'computercraft:cable', - E: 'gtceu:mv_machine_casing', + E: 'gtceu:hv_machine_casing', F: 'gtceu:mv_conveyor_module' }).id('tfg:crafting/printer') diff --git a/kubejs/startup_scripts/ad_astra/materials.js b/kubejs/startup_scripts/ad_astra/materials.js index 4b2d83ca6..392aa55dd 100644 --- a/kubejs/startup_scripts/ad_astra/materials.js +++ b/kubejs/startup_scripts/ad_astra/materials.js @@ -45,40 +45,61 @@ const registerAdAstraMaterials = (event) => { // #region ad astra ores // moon - - // TODO: add smelting recipe for this event.create('desh') .components('2x olivine', '1x rutile', '4x nitrogen') - .color(0xd38b4c) - .secondaryColor(0xa90936) + .color(0xF39A4C) + .secondaryColor(0xF35A6C) .iconSet(GTMaterialIconSet.getByName('tfc_hematite')) .ore() + .addOreByproducts('olivine', 'rutile', 'rutile') + .ingot() + .flags( + GTMaterialFlags.FORCE_GENERATE_BLOCK, + GTMaterialFlags.GENERATE_PLATE, + GTMaterialFlags.GENERATE_ROD + ) - // TODO: still need to balance these + // TODO: remove the components until we know what to put in them - // mars + // mars? event.create('ostrum') .components('2x scheelite', '1x hematite', '1x rutile', '4x oxygen') .color(0xbd7980) - .secondaryColor(0x543d4a) + .secondaryColor(0xA66C8D) .iconSet(GTMaterialIconSet.getByName('tfc_cassiterite')) .ore() + .ingot() + .flags( + GTMaterialFlags.FORCE_GENERATE_BLOCK, + GTMaterialFlags.GENERATE_PLATE + ) - // mercury + // venus? event.create('calorite') .components('2x mercury', '1x tungsten', '1x rhodium', '2x sulfur') - .color(0xcf223c) - .secondaryColor(0x691533) + .color(0xC94D4E) + .secondaryColor(0x9A296A) .iconSet(GTMaterialIconSet.getByName('tfc_copper')) .ore() + .ingot() + .flags( + GTMaterialFlags.FORCE_GENERATE_BLOCK, + GTMaterialFlags.GENERATE_PLATE + ) - // venus + // ??? event.create('etrium') .components('1x niobium', '1x molybdenum', '1x ruthenium', '3x carbon', '1x monochloramine') - .color(0x58b1a1) - .secondaryColor(0xbafcf6) + .color(0x7BFCD7) + .secondaryColor(0x3582D2) .iconSet(GTMaterialIconSet.getByName('tfc_silver')) .ore() + .ingot() + .flags( + GTMaterialFlags.FORCE_GENERATE_BLOCK, + GTMaterialFlags.GENERATE_PLATE, + GTMaterialFlags.GENERATE_ROD + ) // #endregion } \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 679e61cb4..557b556f1 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -284,7 +284,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Cobalt.setMaterialARGB(0xC9E4FB) GTMaterials.Cobalt.setMaterialSecondaryARGB(0x1D2688) GTMaterials.CertusQuartz.setMaterialARGB(0xB8D8FC) - GTMaterials.CertusQuartz.setMaterialSecondaryARGB(0x466580) + GTMaterials.CertusQuartz.setMaterialSecondaryARGB(0xADCCEF) GTMaterials.Vanadium.setMaterialARGB(0xD8D4E7) GTMaterials.Vanadium.setMaterialSecondaryARGB(0x7E988F) GTMaterials.Brass.setMaterialSecondaryARGB(0x791905)