some modpack cleanup from glacian ram/sniffer (#1617)
* whitespace changes * some animal compat * snifferified recipes * nest box recipe
This commit is contained in:
parent
fc35769678
commit
848dc99bf8
8 changed files with 179 additions and 122 deletions
6
kubejs/assets/tfg/models/item/sniffer_wool.json
Normal file
6
kubejs/assets/tfg/models/item/sniffer_wool.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "tfg:item/sniffer_wool"
|
||||
}
|
||||
}
|
||||
BIN
kubejs/assets/tfg/textures/entity/sniffer/sheared_sniffer.png
Normal file
BIN
kubejs/assets/tfg/textures/entity/sniffer/sheared_sniffer.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.4 KiB |
BIN
kubejs/assets/tfg/textures/item/sniffer_wool.png
Normal file
BIN
kubejs/assets/tfg/textures/item/sniffer_wool.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 852 B |
|
|
@ -1,60 +1,60 @@
|
|||
{
|
||||
"__comment__": "This file was automatically created by mcresources",
|
||||
"type": "minecraft:entity",
|
||||
"pools": [
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "tfg:food/raw_glacian_mutton",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"count": {
|
||||
"type": "tfc:animal_yield",
|
||||
"min": 4,
|
||||
"max": {
|
||||
"type": "minecraft:uniform",
|
||||
"min": 12,
|
||||
"max": 18
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "minecraft:bone",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"count": {
|
||||
"min": 1,
|
||||
"max": 3,
|
||||
"type": "minecraft:uniform"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "tfc:small_raw_hide"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
{
|
||||
"__comment__": "This file was automatically created by mcresources",
|
||||
"type": "minecraft:entity",
|
||||
"pools": [
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "tfg:food/raw_glacian_mutton",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"count": {
|
||||
"type": "tfc:animal_yield",
|
||||
"min": 4,
|
||||
"max": {
|
||||
"type": "minecraft:uniform",
|
||||
"min": 12,
|
||||
"max": 18
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "minecraft:bone",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"count": {
|
||||
"min": 1,
|
||||
"max": 3,
|
||||
"type": "minecraft:uniform"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "tfc:small_raw_hide"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -1,60 +1,60 @@
|
|||
{
|
||||
"__comment__": "This file was automatically created by mcresources",
|
||||
"type": "minecraft:entity",
|
||||
"pools": [
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 2,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "tfg:food/raw_sniffer_beef",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"count": {
|
||||
"type": "tfc:animal_yield",
|
||||
"min": 4,
|
||||
"max": {
|
||||
"type": "minecraft:uniform",
|
||||
"min": 12,
|
||||
"max": 18
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 2,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "minecraft:bone",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"count": {
|
||||
"min": 1,
|
||||
"max": 3,
|
||||
"type": "minecraft:uniform"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "tfc:large_raw_hide"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
{
|
||||
"__comment__": "This file was automatically created by mcresources",
|
||||
"type": "minecraft:entity",
|
||||
"pools": [
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 2,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "tfg:food/raw_sniffer_beef",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"count": {
|
||||
"type": "tfc:animal_yield",
|
||||
"min": 4,
|
||||
"max": {
|
||||
"type": "minecraft:uniform",
|
||||
"min": 12,
|
||||
"max": 18
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 2,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "minecraft:bone",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"count": {
|
||||
"min": 1,
|
||||
"max": 3,
|
||||
"type": "minecraft:uniform"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "tfc:large_raw_hide"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -926,15 +926,14 @@ function registerTFGFoodRecipes(event) {
|
|||
[TFC.ingredient.notRotten('betterend:cave_pumpkin'), '#tfc:knives'], 'betterend:cave_pumpkin')
|
||||
.id(`tfg:crafting/cave_pumpkin_chunks_knife`)
|
||||
|
||||
// TODO: replace sniffer egg with a tag for all mars eggs?
|
||||
processorRecipe("cave_pumpkin_pie_dough", 300, GTValues.VA[GTValues.HV], {
|
||||
itemInputs: ['minecraft:sniffer_egg', '2x betterend:cave_pumpkin_chunks', 'betterend:amber_root_product', '#tfc:sweetener'],
|
||||
itemInputs: ['#tfg:martian_eggs', '2x betterend:cave_pumpkin_chunks', 'betterend:amber_root_product', '#tfc:sweetener'],
|
||||
fluidInputs: ['minecraft:water 1000'],
|
||||
itemOutputs: ["betterend:cave_pumpkin_pie_dough"]
|
||||
})
|
||||
|
||||
event.recipes.firmalife.mixing_bowl()
|
||||
.ingredients(['minecraft:sniffer_egg', 'betterend:cave_pumpkin_chunks', 'betterend:cave_pumpkin_chunks', 'betterend:amber_root_product', '#tfc:sweetener'],
|
||||
.ingredients(['#tfg:martian_eggs', 'betterend:cave_pumpkin_chunks', 'betterend:cave_pumpkin_chunks', 'betterend:amber_root_product', '#tfc:sweetener'],
|
||||
Fluid.of('minecraft:water', 1000))
|
||||
.outputItem('betterend:cave_pumpkin_pie_dough')
|
||||
.id('tfg:mixing_bowl/cave_pumpkin_pie_dough')
|
||||
|
|
|
|||
|
|
@ -995,6 +995,17 @@ function registerTFGMiscellaneousRecipes(event) {
|
|||
.duration(1000)
|
||||
.blastFurnaceTemp(3000)
|
||||
.EUt(GTValues.VA[GTValues.EV])
|
||||
|
||||
event.recipes.gtceu.electric_blast_furnace('smelt_sniffer_wool')
|
||||
.itemInputs('tfg:sniffer_wool')
|
||||
.chancedOutput('gtceu:ash_dust', 7500, 0)
|
||||
.outputFluids(Fluid.of('tfg:molten_aes', 200))
|
||||
.circuit(4)
|
||||
.duration(80)
|
||||
.blastFurnaceTemp(3400)
|
||||
.EUt(GTValues.VA[GTValues.EV])
|
||||
|
||||
|
||||
//endregion
|
||||
|
||||
//#region Casings
|
||||
|
|
@ -1149,7 +1160,7 @@ function registerTFGMiscellaneousRecipes(event) {
|
|||
.duration(80)
|
||||
.EUt(GTValues.VA[GTValues.IV])
|
||||
event.recipes.gtceu.mixer('tfg:aes_polyurethane_electric_only')
|
||||
.itemInputs('tfg:aes_compressed_wool', '#forge:dusts/methylene_diphenyl_diisocyanate')
|
||||
.itemInputs('tfg:aes_compressed_wool', '2x tfg:sniffer_wool','#forge:dusts/methylene_diphenyl_diisocyanate')
|
||||
.inputFluids(Fluid.of('gtceu:diethylenetriamine', 250), Fluid.of('gtceu:acetone', 1000))
|
||||
.itemOutputs('tfg:aes_polyurethane')
|
||||
.duration(80)
|
||||
|
|
@ -1324,4 +1335,29 @@ function registerTFGMiscellaneousRecipes(event) {
|
|||
]));
|
||||
|
||||
event.replaceInput({ id: "minecraft:jukebox"}, 'minecraft:diamond', 'tfg:etching_diamond_tip');
|
||||
|
||||
|
||||
//Large Nest
|
||||
event.shaped('tfg:large_nest_box',
|
||||
[
|
||||
'B B',
|
||||
'ABA',
|
||||
'AAA'
|
||||
], {
|
||||
A: 'beneath:crimson_thatch',
|
||||
B: 'beneath:crimson_straw'
|
||||
}).id('tfg:shaped_large_nest_crimson')
|
||||
|
||||
event.shaped('tfg:large_nest_box_warped',
|
||||
[
|
||||
'B B',
|
||||
'ABA',
|
||||
'AAA'
|
||||
], {
|
||||
A: 'beneath:warped_thatch',
|
||||
B: 'beneath:warped_straw'
|
||||
}).id('tfg:shaped_large_nest_warped')
|
||||
|
||||
|
||||
//#endregion
|
||||
}
|
||||
|
|
|
|||
|
|
@ -304,6 +304,22 @@ const registerTFGItemTags = (event) => {
|
|||
event.add('forge:mars_stone_dusts', 'gtceu:granite_red_dust')
|
||||
event.add('forge:mars_stone_dusts', 'tfg:mars_stone_dust')
|
||||
|
||||
//Mars animal region
|
||||
event.add('tfg:martian_eggs', 'tfg:sniffer_egg')
|
||||
|
||||
event.add('tfg:martian_animal_foods', 'betterend:amber_root_product')
|
||||
event.add('tfg:martian_animal_foods', 'betterend:blossom_berry_product')
|
||||
event.add('tfg:martian_animal_foods', 'betterend:chorus_mushroom_product')
|
||||
event.add('tfg:martian_animal_foods', 'betterend:shadow_berry_product')
|
||||
event.add('tfg:martian_animal_foods', 'betterend:bolux_mushroom_product')
|
||||
event.add('tfg:martian_animal_foods', 'betterend:cave_pumpkin_chunks')
|
||||
|
||||
event.add('tfg:glacian_ram_food', '#tfg:martian_animal_foods')
|
||||
event.add('tfg:sniffer_food', '#tfg:martian_animal_foods')
|
||||
|
||||
//#endregion
|
||||
|
||||
|
||||
// #region 0.7.19 -> 0.9 conversion
|
||||
event.add('c:hidden_from_recipe_viewers', 'treetap:tap')
|
||||
event.add('c:hidden_from_recipe_viewers', 'tfcea:refrigerator')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue