diff --git a/CHANGELOG.md b/CHANGELOG.md index 9aed3cc50..2470f19a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,8 @@ - Added some resource packs for TFC, disabled by default - Lenses are now allowed on tool racks (#2434) @thederpysockdude123 - The Active Transformer multiblock is now craftable at EV, with a new texture and casings. (#2424) @BlueBoat29 +- Renamed AE2 Sky Stone to Suevite @Pyritie +- Removed the shapeless crafting recipe for colored concrete powder, added an instant barrel recipe to turn it into solid concrete @Pyritie ### Bug fixes - Fixed aged sake, vodka, and whiskey losing their buff effects, but for real this time @Pyritie - Fixed fries and cheese curds not being able to be put on burgers. @Redeix diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index acfe66bc3..64bf70cae 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -8,7 +8,6 @@ const registerMinecraftRecipes = (event) => { removeMinecraftRecipes(event) - registerMinecraftDyeRecipes(event) //#region Добавление, copper diff --git a/kubejs/server_scripts/minecraft/recipes.dyes.js b/kubejs/server_scripts/tfg/primitive/recipes.dyes.js similarity index 95% rename from kubejs/server_scripts/minecraft/recipes.dyes.js rename to kubejs/server_scripts/tfg/primitive/recipes.dyes.js index 0bc7e9350..a7f97bc90 100644 --- a/kubejs/server_scripts/minecraft/recipes.dyes.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.dyes.js @@ -1,7 +1,7 @@ // priority: 0 "use strict"; -function registerMinecraftDyeRecipes(event) { +function registerTFGDyeRecipes(event) { global.MINECRAFT_DYE_NAMES.forEach(dye => { event.remove({ id: `minecraft:dye_${dye}_wool` }) @@ -9,8 +9,7 @@ function registerMinecraftDyeRecipes(event) { event.remove({ id: `minecraft:dye_${dye}_carpet` }) event.remove({ id: `minecraft:${dye}_bed` }) event.remove({ id: `minecraft:dye_${dye}_bed` }) - - //#region Выход: Ковры, Кровати + event.remove({ id: `tfc:crafting/vanilla/color/${dye}_concrete_powder` }) event.shapeless(`2x minecraft:${dye}_carpet`, [ '#tfc:saws', @@ -27,7 +26,10 @@ function registerMinecraftDyeRecipes(event) { .category(GTRecipeCategories.CHEM_DYES) } - //#endregion + event.recipes.tfc.barrel_instant() + .inputs(`minecraft:${dye}_concrete_powder`, TFC.fluidStackIngredient('minecraft:water', 100)) + .outputItem(`minecraft:${dye}_concrete`) + .id(`tfg:barrel/dye/${dye}_concrete`); }) // White diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index ece695bda..f6d91db2c 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -44,6 +44,7 @@ const registerTFGRecipes = (event) => { registerTFGLeatherRecipes(event) registerTFGClayRecipes(event) registerTFGEquipmentRecipes(event) + registerTFGDyeRecipes(event) registerTFGCasingRecipes(event) registerTFGEnderPearlRecipes(event)