diff --git a/CHANGELOG.md b/CHANGELOG.md index 01a84b855..aee86aa42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,9 @@ ### Breaking changes - The chemical reactor recipe for making Kaolinite Powder now uses circuit 3 @Pyritie ### Changes +- Added much more music to the different dimensions @Pyritie - Vanadium magnetite is now usable as an iron ore for TFC purposes (#2834) @Pyritie +- Added steam alloy smelter glass batch recipes (#2853) @Pyritie ### Bug fixes - Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie - Fixed red granite ores never dropping poor or rich raw ores @Pyritie diff --git a/kubejs/assets/tfg/sounds.json b/kubejs/assets/tfg/sounds.json index 45cc75407..7adb8d046 100644 --- a/kubejs/assets/tfg/sounds.json +++ b/kubejs/assets/tfg/sounds.json @@ -916,7 +916,15 @@ } ] }, - + "music.mercury": { + "sounds": [ + { + "name": "minecraft:records/13", + "stream": true, + "volume": 0.4 + } + ] + }, "music.europa": { "sounds": [ { diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js index 3214c5bed..eee2285b4 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js @@ -35,11 +35,12 @@ function registerTFGQuartzRecipes(event) { { input: "tfc:silica_glass_batch", output: "tfc:silica_glass_bottle", name: "silica_glass_bottle" }, { input: "tfc:hematitic_glass_batch", output: "tfc:hematitic_glass_bottle", name: "hematitic_glass_bottle" }, { input: "tfc:olivine_glass_batch", output: "tfc:olivine_glass_bottle", name: "olivine_glass_bottle" }, - { input: "tfc:volcanic_glass_batch", output: "tfc:volcanic_glass_bottle", name: "volcanic_glass_bottle" } + { input: "tfc:volcanic_glass_batch", output: "tfc:volcanic_glass_bottle", name: "volcanic_glass_bottle" }, + { input: '#forge:dusts/glass', output: "tfc:silica_glass_bottle", name: "glass_dust_to_bottle" } ]); TFC_BATCH_TO_BOTTLE_ASSEMBLING_RECIPE_COMPONENTS.forEach(element => { - event.recipes.gtceu.alloy_smelter(`tfg:tfc/${element.name}`) + event.recipes.gtceu.alloy_smelter(`tfg:${element.name}`) .itemInputs(element.input) .notConsumable('gtceu:bottle_casting_mold') .itemOutputs(element.output) @@ -95,12 +96,14 @@ function registerTFGQuartzRecipes(event) { .duration(50) .EUt(2) + // Extracting event.recipes.gtceu.extractor('tfg:glass_batch_extraction') .itemInputs('#tfc:glass_batches') .outputFluids(Fluid.of('gtceu:glass', 144)) .duration(50) .EUt(2) + // TFC lens event.recipes.gtceu.lathe('tfg:tfc_lens') .itemInputs('#forge:glass') .itemOutputs('tfc:lens') @@ -131,26 +134,49 @@ function registerTFGQuartzRecipes(event) { "#forge:glass" ); - - event.recipes.gtceu.alloy_smelter('glass_bottle') - .itemInputs('#forge:dusts/glass') - .itemOutputs('tfc:silica_glass_bottle') - .notConsumable('gtceu:bottle_casting_mold') - .EUt(2) - .duration(20 * 5) - .category(GTRecipeCategories.INGOT_MOLDING) + // Glass blocks + event.recipes.gtceu.alloy_smelter('tfg:clear_glass_block_from_batch') + .itemInputs('tfc:silica_glass_batch') + .notConsumable('gtceu:block_casting_mold') + .itemOutputs('minecraft:glass') + .duration(12 * 20) + .EUt(16) + .category(GTRecipeCategories.INGOT_MOLDING); + event.recipes.gtceu.alloy_smelter('tfg:orange_glass_block_from_batch') + .itemInputs('tfc:hematitic_glass_batch') + .notConsumable('gtceu:block_casting_mold') + .itemOutputs('minecraft:orange_stained_glass') + .duration(12 * 20) + .EUt(16) + .category(GTRecipeCategories.INGOT_MOLDING); + + event.recipes.gtceu.alloy_smelter('tfg:green_glass_block_from_batch') + .itemInputs('tfc:olivine_glass_batch') + .notConsumable('gtceu:block_casting_mold') + .itemOutputs('minecraft:green_stained_glass') + .duration(12 * 20) + .EUt(16) + .category(GTRecipeCategories.INGOT_MOLDING); + + event.recipes.gtceu.alloy_smelter('tfg:blue_glass_block_from_batch') + .itemInputs('tfc:volcanic_glass_batch') + .notConsumable('gtceu:block_casting_mold') + .itemOutputs('minecraft:blue_stained_glass') + .duration(12 * 20) + .EUt(16) + .category(GTRecipeCategories.INGOT_MOLDING); // Glass Tube event.recipes.tfc.glassworking('gtceu:glass_tube', '#tfc:glass_batches_tier_3', ['blow', 'stretch', 'stretch']) .id('tfg:gtceu/glassworking/glass_tube') event.recipes.gtceu.alloy_smelter('tfg:glass_tube_from_batch') - .itemInputs('#tfc:glass_batches') + .itemInputs('#tfc:glass_batches_tier_3') .notConsumable('gtceu:ball_casting_mold') .itemOutputs('gtceu:glass_tube') - .duration(8 * 20) - .EUt(GTValues.VA[GTValues.LV]) + .duration(16 * 20) + .EUt(16) .category(GTRecipeCategories.INGOT_MOLDING); //#endregion }