diff --git a/CHANGELOG.md b/CHANGELOG.md index ffeaa2e5d..1791e5edc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ Added TFC Gurman, which adds even more food and drink - Oilsands dust can now be centrifuged in the mechanical centrifuge @Pyritie - All oils (both the petrochem kind and the cooking kind) can now be used to fuel small boilers as well @Pyritie - Reduced the cost of the ME Ingredient Buffer @Pyritie +- Renamed Blubber to Animal Fat and added it to the drop tables of more animals (pigs drop a fair bit, orcas drop a ton). Renamed Fish Oil to Tallowate since you can turn animal fat into tallow into fish oil (now tallowate). From there you can turn it into biodiesel! @Pyritie ### Bug fixes - Fixed brown gravy recipe @Redeix - Fixed instant mac recipe requiring less cardboard than it gives back @Redeix diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 14f38307d..816f01032 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -302,13 +302,13 @@ const registerGTCEURecipes = (event) => { //#region Выход: Рыбье масло - event.recipes.gtceu.extractor(`tfg/fish_oil`) + event.recipes.gtceu.extractor(`tfg:fish_oil`) .itemInputs('#minecraft:fishes') .outputFluids(Fluid.of('gtceu:fish_oil', 200)) .duration(40) .EUt(4) - event.recipes.gtceu.extractor(`tfg/tallow`) + event.recipes.gtceu.extractor(`tfg:tallow`) .itemInputs('tfc:blubber') .outputFluids(Fluid.of('tfc:tallow', 200)) .duration(40) @@ -325,7 +325,7 @@ const registerGTCEURecipes = (event) => { //#region Выход: Семянное масло - event.recipes.gtceu.extractor(`tfg/seed_oil`) + event.recipes.gtceu.extractor(`tfg:seed_oil`) .itemInputs('#tfc:seeds') .outputFluids(Fluid.of('gtceu:seed_oil', 50)) .duration(32) diff --git a/kubejs/server_scripts/tfc/loot.js b/kubejs/server_scripts/tfc/loot.js index 044f9b757..62e9e1909 100644 --- a/kubejs/server_scripts/tfc/loot.js +++ b/kubejs/server_scripts/tfc/loot.js @@ -153,7 +153,9 @@ function registerTFCLoots(event) { event.addEntityLootModifier('tfc:bongo') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([2, 4], ['tfc:food/venison']) - + + event.addEntityLootModifier('tfc:caribou') + .addWeightedLoot([1, 3], ['tfc:blubber']) event.addEntityLootModifier('tfc:caribou') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([3, 5], ['tfc:food/venison']) @@ -169,6 +171,14 @@ function registerTFCLoots(event) { event.addEntityLootModifier('tfc:deer') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([2, 4], ['tfc:food/venison']) + + event.addEntityLootModifier('tfc:dolphin') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addWeightedLoot([5, 12], ['tfc:blubber']) + .addWeightedLoot([1, 5], ['minecraft:bone']) + event.addEntityLootModifier('tfc:dolphin') + .matchMainHand('#forge:tools/butchery_knives') + .addWeightedLoot([2, 6], ['tfc:blubber']) event.addEntityLootModifier('tfc:donkey') .matchMainHand('#forge:tools/butchery_knives') @@ -198,14 +208,25 @@ function registerTFCLoots(event) { .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([7, 10], ['tfc:food/horse_meat']) + event.addEntityLootModifier('tfc:manatee') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addWeightedLoot([5, 12], ['tfc:blubber']) + .addWeightedLoot([1, 5], ['minecraft:bone']) + event.addEntityLootModifier('tfc:manatee') + .matchMainHand('#forge:tools/butchery_knives') + .addWeightedLoot([2, 6], ['tfc:blubber']) + event.addEntityLootModifier('tfc:moose') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([5, 10], ['tfc:food/venison']) + .addWeightedLoot([1, 2], ['tfc:blubber']) event.addEntityLootModifier('tfc:mule') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([7, 10], ['tfc:food/horse_meat']) - + + event.addEntityLootModifier('tfc:musk_ox') + .addWeightedLoot([1, 2], ['tfc:blubber']) event.addEntityLootModifier('tfc:musk_ox') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([7, 10], ['tfc:food/mutton']) @@ -218,9 +239,20 @@ function registerTFCLoots(event) { .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([1, 2], ['tfc:food/pheasant']) + event.addEntityLootModifier('tfc:pig') + .addWeightedLoot([3, 6], ['tfc:blubber']) event.addEntityLootModifier('tfc:pig') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([5, 7], ['tfc:food/pork']) + .addWeightedLoot([1, 3], ['tfc:blubber']) + + event.addEntityLootModifier('tfc:orca') + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addWeightedLoot([8, 20], ['tfc:blubber']) + .addWeightedLoot([3, 7], ['minecraft:bone']) + event.addEntityLootModifier('tfc:orca') + .matchMainHand('#forge:tools/butchery_knives') + .addWeightedLoot([4, 10], ['tfc:blubber']) event.addEntityLootModifier('tfc:quail') .matchMainHand('#forge:tools/butchery_knives')