diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b9590bce..0376bd5e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ### Other Changes - Added recipes for create's shadow and radiant casings (#2256) @Ujhik ### Bug fixes +- Fixed missing recipes for many fluid and item pipes @Pyritie - Fixed missing cleanroom tags for the ad astra 3x3 doors, so now you can *actually* use them in a cleanroom @Pyritie - Fixed aged sake, vodka, and whiskey losing their buff effects @Pyritie diff --git a/kubejs/server_scripts/tfg/recipes.converting.js b/kubejs/server_scripts/tfg/recipes.converting.js deleted file mode 100644 index bb415f91a..000000000 --- a/kubejs/server_scripts/tfg/recipes.converting.js +++ /dev/null @@ -1,12 +0,0 @@ -// priority: 0 -"use strict"; - -/** - * @param {Internal.RecipesEventJS} event - */ -function registerTFGConvertingRecipes(event) { - - event.shapeless('vintageimprovements:belt_grinder', 'vintageimprovements:lathe') - - event.shapeless('tfg:ostrum_linear_accelerator', 'gtceu:ostrum_linear_accelerator') -} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index 43f6d5572..4424c0a17 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -8,7 +8,7 @@ const registerTFGRecipes = (event) => { registerTFGMoldRecipes(event) registerTFGMiscellaneousRecipes(event) - registerTFGConvertingRecipes(event) + registerTFGTemporaryRecipes(event) registerTFGFoodRecipes(event) registerTFGRefrigeratorRecipes(event) diff --git a/kubejs/server_scripts/tfg/recipes.temporary.js b/kubejs/server_scripts/tfg/recipes.temporary.js new file mode 100644 index 000000000..9d9015bc3 --- /dev/null +++ b/kubejs/server_scripts/tfg/recipes.temporary.js @@ -0,0 +1,104 @@ +// priority: 0 +"use strict"; + +/** + * @param {Internal.RecipesEventJS} event + */ +function registerTFGTemporaryRecipes(event) { + + event.shapeless('vintageimprovements:belt_grinder', 'vintageimprovements:lathe') + + event.shapeless('tfg:ostrum_linear_accelerator', 'gtceu:ostrum_linear_accelerator') + + // TODO: remove nether/ender air in 0.12 + + + // Temporary recipes until gregtech fixes its pipe problem with .setIgnored() + const broken_pipes = [ + GTMaterials.Copper, + GTMaterials.Brass, + GTMaterials.Gold, + GTMaterials.Iron, + GTMaterials.Cobalt, + GTMaterials.RoseGold, + GTMaterials.Aluminium, + GTMaterials.Invar, + GTMaterials.Lead, + GTMaterials.Nickel, + GTMaterials.Osmium, + GTMaterials.Palladium, + GTMaterials.Platinum, + GTMaterials.Rhodium, + GTMaterials.Silver, + GTMaterials.Vanadium, + GTMaterials.Zinc, + TFGHelpers.getMaterial('ostrum') + ] + broken_pipes.forEach(material => { + if (material.hasProperty(PropertyKey.FLUID_PIPE)) { + event.shaped(ChemicalHelper.get(TagPrefix.pipeTinyFluid, material, 1), [ + ' S ', + 'HPW' + ], { + P: ChemicalHelper.get(TagPrefix.plate, material, 1), + H: '#forge:tools/hammers', + W: '#forge:tools/wrenches', + S: '#forge:tools/saws' + }).id(`tfg:temp/tiny_fluid_pipe_${material.getName()}`) + + event.shaped(ChemicalHelper.get(TagPrefix.pipeSmallFluid, material, 1), [ + 'WPH' + ], { + P: ChemicalHelper.get(TagPrefix.plate, material, 1), + H: '#forge:tools/hammers', + W: '#forge:tools/wrenches' + }).id(`tfg:temp/small_fluid_pipe_${material.getName()}`) + + event.shaped(ChemicalHelper.get(TagPrefix.pipeNormalFluid, material, 1), [ + 'PPP', + 'W H' + ], { + P: ChemicalHelper.get(TagPrefix.plate, material, 1), + H: '#forge:tools/hammers', + W: '#forge:tools/wrenches' + }).id(`tfg:temp/normal_fluid_pipe_${material.getName()}`) + + event.shaped(ChemicalHelper.get(TagPrefix.pipeLargeFluid, material, 1), [ + 'PPP', + 'W H', + 'PPP' + ], { + P: ChemicalHelper.get(TagPrefix.plate, material, 1), + H: '#forge:tools/hammers', + W: '#forge:tools/wrenches' + }).id(`tfg:temp/large_fluid_pipe_${material.getName()}`) + } + else if (material.hasProperty(PropertyKey.ITEM_PIPE)) { + event.shaped(ChemicalHelper.get(TagPrefix.pipeSmallItem, material, 1), [ + 'WPH' + ], { + P: ChemicalHelper.get(TagPrefix.plate, material, 1), + H: '#forge:tools/hammers', + W: '#forge:tools/wrenches' + }).id(`tfg:temp/small_item_pipe_${material.getName()}`) + + event.shaped(ChemicalHelper.get(TagPrefix.pipeNormalItem, material, 1), [ + 'PPP', + 'W H' + ], { + P: ChemicalHelper.get(TagPrefix.plate, material, 1), + H: '#forge:tools/hammers', + W: '#forge:tools/wrenches' + }).id(`tfg:temp/normal_item_pipe_${material.getName()}`) + + event.shaped(ChemicalHelper.get(TagPrefix.pipeLargeItem, material, 1), [ + 'PPP', + 'W H', + 'PPP' + ], { + P: ChemicalHelper.get(TagPrefix.plate, material, 1), + H: '#forge:tools/hammers', + W: '#forge:tools/wrenches' + }).id(`tfg:temp/large_item_pipe_${material.getName()}`) + }) +} \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/tag_prefixes.js b/kubejs/startup_scripts/tfg/tag_prefixes.js index 800a69fb2..4e1ef1d21 100644 --- a/kubejs/startup_scripts/tfg/tag_prefixes.js +++ b/kubejs/startup_scripts/tfg/tag_prefixes.js @@ -7,7 +7,8 @@ function registerTFGTagPrefixes(event) { excludeAllGemsButNormal(TFGHelpers.getMaterial('tfg:tetrafluoroethane')); excludeAllGemsButNormal(TFGHelpers.getMaterial('tfg:crimsene')); excludeAllGemsButNormal(TFGHelpers.getMaterial('tfg:warpane')); - + + TagPrefix.nugget.setIgnored(GTMaterials.RawRubber); TagPrefix.ingot.setIgnored(GTMaterials.RawRubber); TagPrefix.plate.setIgnored(GTMaterials.RawRubber); TagPrefix.plateDouble.setIgnored(GTMaterials.RawRubber);