diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front.png b/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front.png index 5bd5b3654..21458b6d2 100644 Binary files a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front.png and b/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active.png b/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active.png index 9214428f2..db6c56605 100644 Binary files a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active.png and b/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active.png.mcmeta b/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active.png.mcmeta index f3da053bc..92cc62352 100644 --- a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active.png.mcmeta +++ b/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active.png.mcmeta @@ -1,5 +1,5 @@ { "animation":{ - "frametime": 2 + "frametime": 1 } } \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active_emissive.png b/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active_emissive.png new file mode 100644 index 000000000..97ab6af81 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active_emissive.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active_emissive.png.mcmeta b/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active_emissive.png.mcmeta new file mode 100644 index 000000000..92cc62352 --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active_emissive.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_emissive.png b/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_emissive.png new file mode 100644 index 000000000..c20a1c981 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_emissive.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back.png b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back.png new file mode 100644 index 000000000..3c21545d1 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active.png b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active.png new file mode 100644 index 000000000..bcfd65feb Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active.png.mcmeta b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active.png.mcmeta new file mode 100644 index 000000000..92cc62352 --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_emissive.png b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_emissive.png new file mode 100644 index 000000000..8e993ab98 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_emissive.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_emissive.png.mcmeta b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_emissive.png.mcmeta new file mode 100644 index 000000000..92cc62352 --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_emissive.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_emissive_ref.gif b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_emissive_ref.gif new file mode 100644 index 000000000..383a1c800 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_emissive_ref.gif differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_ref.gif b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_ref.gif new file mode 100644 index 000000000..d766d3c18 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_ref.gif differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_bottom.png b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_bottom.png new file mode 100644 index 000000000..f02154247 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_bottom.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_front.png b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_front.png new file mode 100644 index 000000000..01360c35a Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_front.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_front_active.png b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_front_active.png new file mode 100644 index 000000000..e10b0db21 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_front_active.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_side.png b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_side.png new file mode 100644 index 000000000..1161e23a9 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_side.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_top.png b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_top.png new file mode 100644 index 000000000..6dfbd1acc Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_top.png differ diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index b28e87cc3..0a8fa9c76 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -160,10 +160,10 @@ function registerTFGFoodRecipes(event) { ]) }) - + //Note: Jam needs to be first in the recipe code or else it will consider it as the usable_in_jam_sandwhich ingredients. processorRecipe(`${grain}_${type[0]}_jam_sandwich`, 100, 16, { circuit: 4, - itemInputs: [`2x ${type[1]}`, "2x #tfc:foods/usable_in_jam_sandwich", '#tfc:foods/preserves'], + itemInputs: [`2x ${type[1]}`, '#tfc:foods/preserves', '2x #tfc:foods/usable_in_jam_sandwich'], itemOutputs: [`2x tfc:food/${grain}_bread_jam_sandwich`, 'tfc:empty_jar'], itemOutputProvider: TFC.isp.of(`2x tfc:food/${grain}_bread_jam_sandwich`).meal( (food => food.hunger(4).water(0.5).saturation(1).decayModifier(4.5)), [ @@ -277,47 +277,30 @@ function registerTFGFoodRecipes(event) { //#endregion //#region ================= Food preservation ================= - - processorRecipe("food_salting", 10, 16, { - itemInputs: [ - ["#tfc:foods/can_be_salted", TFC.ingredient.lacksTrait("#tfc:foods/can_be_salted", "tfc:salted")], - "tfc:powder/salt"], - itemOutputs: ["#tfc:foods/can_be_salted"], - itemOutputProvider: TFC.isp.copyInput().addTrait("tfc:salted") + + const smoking_meats = Ingredient.of('#tfc:foods/raw_meats').itemIds; + const brining_veg = Ingredient.of('#firmalife:foods/pizza_ingredients').itemIds; + + const brining_ingredients = smoking_meats.concat(brining_veg); + + brining_ingredients.forEach(item => { + processorRecipe(`${item}/brining`, 200, 16, { + circuit: 5, + itemInputs: [item], + itemOutputs: [item], + fluidInputs: [Fluid.of("tfc:brine", 100)], + itemOutputProvider: TFC.isp.of(item).copyOldestFood().addTrait('tfc:brined') + }) }) - - processorRecipe("brine_meat", 200, 16, { - circuit: 5, - itemInputs: [["#tfc:foods/raw_meats", TFC.ingredient.lacksTrait("#tfc:foods/raw_meats", "tfc:brined")]], - itemOutputs: ["#tfc:foods/raw_meats"], - fluidInputs: [Fluid.of("tfc:brine", 100)], - itemOutputProvider: TFC.isp.copyInput().addTrait("tfc:brined") - }) - - processorRecipe("brine_general", 200, 16, { - circuit: 5, - itemInputs: [["#firmalife:foods/pizza_ingredients", TFC.ingredient.lacksTrait("#firmalife:foods/pizza_ingredients", "tfc:brined")]], - itemOutputs: ["#firmalife:foods/pizza_ingredients"], - fluidInputs: [Fluid.of("tfc:brine", 100)], - itemOutputProvider: TFC.isp.copyInput().addTrait("tfc:brined") - }) - - - processorRecipe("pickle_meat", 200, 16, { - circuit: 5, - itemInputs: [ ["#tfc:foods/raw_meats", TFC.ingredient.lacksTrait(TFC.ingredient.hasTrait("#tfc:foods/raw_meats", "tfc:brined"), "tfc:pickled")] ], - itemOutputs: ["#tfc:foods/raw_meats"], - fluidInputs: [Fluid.of("tfc:vinegar", 100)], - itemOutputProvider: TFC.isp.copyInput().addTrait("tfc:pickled") - }) - - processorRecipe("pickle_general", 200, 16, { - circuit: 5, - itemInputs: [ ["#firmalife:foods/pizza_ingredients", TFC.ingredient.lacksTrait(TFC.ingredient.hasTrait("#firmalife:foods/pizza_ingredients", "tfc:brined"), "tfc:pickled")] ], - itemOutputs: ["#firmalife:foods/pizza_ingredients"], - fluidInputs: [Fluid.of("tfc:vinegar", 100)], - itemOutputProvider: TFC.isp.copyInput().addTrait("tfc:pickled") + smoking_meats.forEach(item => { + processorRecipe(`${item}/smoking`, 200, 16, { + circuit: 6, + itemInputs: [[item, TFC.ingredient.lacksTrait(item, "firmalife:smoked")]], + itemOutputs: [item], + fluidInputs: [Fluid.of('gtceu:wood_gas', 50)], + itemOutputProvider: TFC.isp.of(item).copyOldestFood().addTrait("firmalife:smoked") + }) }) //#endregion @@ -327,17 +310,17 @@ function registerTFGFoodRecipes(event) { global.TFC_JAMS.forEach(name => { processorRecipe(`${name}_jam`, 200, 8, { circuit: 15, - itemInputs: [`4x tfc:food/${name}`, "#tfg:sugar", "#tfc:empty_jar_with_lid"], + itemInputs: [`4x tfc:food/${name}`, "#tfg:sugars", "#tfc:empty_jar_with_lid"], itemOutputs: [`4x tfc:jar/${name}`], - fluidInputs: Fluid.of("minecraft:water", 100), + fluidInputs: [Fluid.of("minecraft:water", 100)], itemOutputProvider: TFC.isp.of(`4x tfc:jar/${name}`).copyFood() }) processorRecipe(`${name}_jam_no_seal`, 200, 8, { circuit: 16, - itemInputs: [`4x tfc:food/${name}`, "#tfg:sugar", "#tfc:empty_jar"], + itemInputs: [`4x tfc:food/${name}`, "#tfg:sugars", "tfc:empty_jar"], itemOutputs: [`4x tfc:jar/${name}_unsealed`], - fluidInputs: Fluid.of("minecraft:water", 100), + fluidInputs: [Fluid.of("minecraft:water", 100)], itemOutputProvider: TFC.isp.of(`4x tfc:jar/${name}_unsealed`).copyFood() }) })