Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
This commit is contained in:
commit
27c2cc6623
17 changed files with 496 additions and 449 deletions
|
|
@ -11,11 +11,21 @@
|
|||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"add": false,
|
||||
"count": {
|
||||
"min": 4,
|
||||
"max": 10,
|
||||
"type": "minecraft:uniform"
|
||||
}
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 3.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -34,7 +44,7 @@
|
|||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"min": 1,
|
||||
"max": 3
|
||||
"max": 6
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -6,27 +6,11 @@
|
|||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
{
|
||||
"add": false,
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 3.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 2.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "ae2:ender_dust"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "endermanoverhaul:summoner_pearl"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
|
|
@ -45,25 +29,10 @@
|
|||
"min": 2.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 2.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "gtceu:raw_coal"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
},
|
||||
{
|
||||
"bonus_rolls": 0.0,
|
||||
"entries": [
|
||||
},
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
|
|
@ -75,25 +44,10 @@
|
|||
"min": 2.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 2.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "gtceu:raw_goethite"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
},
|
||||
{
|
||||
"bonus_rolls": 0.0,
|
||||
"entries": [
|
||||
"name": "tfc:ore/normal_magnetite"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
|
|
@ -105,51 +59,12 @@
|
|||
"min": 2.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 2.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "tfc:ore/normal_native_copper"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
},
|
||||
{
|
||||
"bonus_rolls": 0.0,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
{
|
||||
"add": false,
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 1.0,
|
||||
"min": 0.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 1.0,
|
||||
"min": 0.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "endermanoverhaul:summoner_pearl"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
}
|
||||
],
|
||||
"random_sequence": "endermanoverhaul:entities/cave_enderman"
|
||||
|
|
|
|||
|
|
@ -6,27 +6,11 @@
|
|||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
{
|
||||
"add": false,
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 2.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 2.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "ae2:ender_dust"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "endermanoverhaul:corrupted_pearl"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
|
|
@ -45,18 +29,9 @@
|
|||
"min": 4.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 2.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "tfc:powder/wood_ash"
|
||||
"name": "tfc:soot"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
|
|
@ -75,51 +50,12 @@
|
|||
"min": 4.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 2.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "minecraft:charcoal"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
},
|
||||
{
|
||||
"bonus_rolls": 0.0,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
{
|
||||
"add": false,
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 1.0,
|
||||
"min": 0.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 1.0,
|
||||
"min": 0.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "endermanoverhaul:corrupted_pearl"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
}
|
||||
],
|
||||
"random_sequence": "endermanoverhaul:entities/dark_oak_enderman"
|
||||
|
|
|
|||
|
|
@ -6,27 +6,11 @@
|
|||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
{
|
||||
"add": false,
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 3.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 3.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "ae2:ender_dust"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "endermanoverhaul:summoner_pearl"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
|
|
@ -41,85 +25,25 @@
|
|||
"add": false,
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 4.0,
|
||||
"min": 2.0
|
||||
"max": 2.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"add": false,
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 4.0,
|
||||
"min": 2.0
|
||||
"max": 2.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
"function": "minecraft:set_count"
|
||||
}
|
||||
],
|
||||
"name": "minecraft:red_mushroom"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
},
|
||||
{
|
||||
"bonus_rolls": 0.0,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
{
|
||||
"add": false,
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 4.0,
|
||||
"min": 2.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 4.0,
|
||||
"min": 2.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "minecraft:brown_mushroom"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
},
|
||||
{
|
||||
"bonus_rolls": 0.0,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
{
|
||||
"add": false,
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 1.0,
|
||||
"min": 0.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 1.0,
|
||||
"min": 0.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "endermanoverhaul:summoner_pearl"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
"rolls": 3.0
|
||||
}
|
||||
],
|
||||
"random_sequence": "endermanoverhaul:entities/mushroom_fields_enderman"
|
||||
|
|
|
|||
|
|
@ -6,27 +6,11 @@
|
|||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
{
|
||||
"add": false,
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 3.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 3.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "ae2:ender_dust"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "endermanoverhaul:summoner_pearl"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
|
|
@ -45,25 +29,25 @@
|
|||
"min": 2.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 4.0,
|
||||
"min": 2.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "minecraft:glow_berries"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
},
|
||||
{
|
||||
"bonus_rolls": 0.0,
|
||||
"entries": [
|
||||
},
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
{
|
||||
"add": false,
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 4.0,
|
||||
"min": 2.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
}
|
||||
],
|
||||
"name": "minecraft:moss_block"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
|
|
@ -75,51 +59,12 @@
|
|||
"min": 1.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 2.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "tfc:wood/sapling/mangrove"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
},
|
||||
{
|
||||
"bonus_rolls": 0.0,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
{
|
||||
"add": false,
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 1.0,
|
||||
"min": 0.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 1.0,
|
||||
"min": 0.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "endermanoverhaul:summoner_pearl"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
"rolls": 2.0
|
||||
}
|
||||
],
|
||||
"random_sequence": "endermanoverhaul:entities/swamp_enderman"
|
||||
|
|
|
|||
65
kubejs/data/minecraft/loot_tables/entities/drowned.json
Normal file
65
kubejs/data/minecraft/loot_tables/entities/drowned.json
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
{
|
||||
"type": "minecraft:entity",
|
||||
"pools": [
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "minecraft:rotten_flesh",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"count": {
|
||||
"max": 2,
|
||||
"min": 1,
|
||||
"type": "minecraft:uniform"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "tfc:groundcover/driftwood",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"count": {
|
||||
"max": 2,
|
||||
"min": 0,
|
||||
"type": "minecraft:uniform"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "minecraft:bone",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"count": {
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"type": "minecraft:uniform"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -7,26 +7,6 @@
|
|||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
{
|
||||
"add": false,
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 3.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 3.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "ae2:ender_dust"
|
||||
}
|
||||
]
|
||||
|
|
@ -46,15 +26,6 @@
|
|||
"min": 2.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 4.0,
|
||||
"min": 2.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "minecraft:chorus_fruit"
|
||||
|
|
|
|||
54
kubejs/data/minecraft/loot_tables/entities/frog.json
Normal file
54
kubejs/data/minecraft/loot_tables/entities/frog.json
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{
|
||||
"type": "minecraft:entity",
|
||||
"pools": [
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "tfc:food/frog_legs",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"count": {
|
||||
"min": 2,
|
||||
"max": 3,
|
||||
"type": "minecraft:uniform"
|
||||
}
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 1.0,
|
||||
"min": 0.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "minecraft:bone",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"count": {
|
||||
"min": 1,
|
||||
"max": 2,
|
||||
"type": "minecraft:uniform"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -12,19 +12,10 @@
|
|||
"add": false,
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 1.0,
|
||||
"min": 0.0
|
||||
"max": 2.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 1.0,
|
||||
"min": 0.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "minecraft:magma_cream"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
"pools": [
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 2,
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
|
|
@ -16,19 +16,16 @@
|
|||
"min": 1.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 3.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "minecraft:bone"
|
||||
},
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
|
|
@ -40,15 +37,6 @@
|
|||
"min": 1.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 2.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "minecraft:phantom_membrane"
|
||||
|
|
|
|||
|
|
@ -16,15 +16,6 @@
|
|||
"min": 2.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 2.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "minecraft:bone"
|
||||
|
|
@ -42,29 +33,14 @@
|
|||
"add": false,
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 5.0,
|
||||
"max": 4.0,
|
||||
"min": 2.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 2.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "beneath:cursecoal"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
},
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
|
|
@ -73,18 +49,9 @@
|
|||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 5.0,
|
||||
"min": 2.0
|
||||
"min": 3.0
|
||||
},
|
||||
"function": "minecraft:set_count"
|
||||
},
|
||||
{
|
||||
"count": {
|
||||
"type": "minecraft:uniform",
|
||||
"max": 2.0,
|
||||
"min": 1.0
|
||||
},
|
||||
"enchantment": "minecraft:looting",
|
||||
"function": "minecraft:looting_enchant"
|
||||
}
|
||||
],
|
||||
"name": "gtceu:rich_raw_coal"
|
||||
|
|
|
|||
65
kubejs/data/minecraft/loot_tables/entities/zombie.json
Normal file
65
kubejs/data/minecraft/loot_tables/entities/zombie.json
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
{
|
||||
"type": "minecraft:entity",
|
||||
"pools": [
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "minecraft:rotten_flesh",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"count": {
|
||||
"max": 2,
|
||||
"min": 1,
|
||||
"type": "minecraft:uniform"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "minecraft:stick",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"count": {
|
||||
"max": 2,
|
||||
"min": 0,
|
||||
"type": "minecraft:uniform"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "loot_pool",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "minecraft:bone",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"count": {
|
||||
"max": 1,
|
||||
"min": 0,
|
||||
"type": "minecraft:uniform"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -4,5 +4,14 @@ function registerEndermanOverhaulRecipes(event) {
|
|||
|
||||
event.remove({ id: 'endermanoverhaul:corrupted_shield' })
|
||||
event.remove({ id: 'endermanoverhaul:corrupted_blade' })
|
||||
|
||||
event.shapeless('ae2:ender_dust', ['#forge:ender_pearls', '#forge:tools/mortars'])
|
||||
.id('tfg:shapeless/mortar_ender_pearls')
|
||||
|
||||
event.recipes.gtceu.macerator('tfg:macerate_ender_pearls')
|
||||
.itemInputs('#forge:ender_pearls')
|
||||
.itemOutputs('ae2:ender_dust')
|
||||
.category(GTRecipeCategories.MACERATOR_RECYCLING)
|
||||
.duration(50)
|
||||
.EUt(GTValues.VA[GTValues.ULV])
|
||||
}
|
||||
|
|
@ -204,6 +204,7 @@ ServerEvents.recipes(event => {
|
|||
registerTFCBetterBFRecipes(event)
|
||||
registerTFGRecipes(event)
|
||||
registerTFCGroomingStationRecipes(event)
|
||||
registerTFCTextileRecipes(event)
|
||||
registerToolBeltRecipes(event)
|
||||
registerTreeTapRecipes(event)
|
||||
registerVintageImprovementsRecipes(event)
|
||||
|
|
|
|||
|
|
@ -3,8 +3,10 @@
|
|||
function registerPrimitiveCreatesLoots(event) {
|
||||
|
||||
event.addEntityLootModifier('kaolinclayze:tfc')
|
||||
.addWeightedLoot([7,15], ['tfc:kaolin_clay', 'minecraft:clay_ball'])
|
||||
.removeLoot(ItemFilter.ALWAYS_TRUE)
|
||||
.addWeightedLoot([12,16], ['tfc:kaolin_clay', 'minecraft:clay_ball'])
|
||||
|
||||
event.addEntityLootModifier('kaolinclayze:golem_2')
|
||||
.addWeightedLoot([7,15], ['gtceu:poor_raw_graphite', 'gtceu:raw_graphite', 'gtceu:rich_raw_graphite'])
|
||||
.removeLoot(ItemFilter.ALWAYS_TRUE)
|
||||
.addWeightedLoot([4,6], ['gtceu:rich_raw_graphite'])
|
||||
}
|
||||
|
|
@ -1,64 +1,261 @@
|
|||
// priority: 0
|
||||
|
||||
function registerTFCLoots(event)
|
||||
{
|
||||
function registerTFCLoots(event) {
|
||||
// Hostile animals
|
||||
|
||||
event.addEntityLootModifier('tfc:black_bear')
|
||||
.addWeightedLoot([8,12], ['tfc:food/bear'])
|
||||
.addWeightedLoot([8, 12], ['tfc:food/bear'])
|
||||
|
||||
event.addEntityLootModifier('tfc:black_bear')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([4, 6], ['tfc:food/bear'])
|
||||
|
||||
|
||||
event.addEntityLootModifier('tfc:grizzly_bear')
|
||||
.addWeightedLoot([10,16], ['tfc:food/bear'])
|
||||
.addWeightedLoot([10, 16], ['tfc:food/bear'])
|
||||
|
||||
event.addEntityLootModifier('tfc:grizzly_bear')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([5, 8], ['tfc:food/bear'])
|
||||
|
||||
|
||||
event.addEntityLootModifier('tfc:polar_bear')
|
||||
.addWeightedLoot([14,20], ['tfc:food/bear'])
|
||||
.addWeightedLoot([2,5], ['tfc:blubber'])
|
||||
.addWeightedLoot([14, 20], ['tfc:food/bear'])
|
||||
.addWeightedLoot([2, 5], ['tfc:blubber'])
|
||||
|
||||
event.addEntityLootModifier('tfc:polar_bear')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([7, 10], ['tfc:food/bear'])
|
||||
|
||||
|
||||
event.addEntityLootModifier('tfc:cougar')
|
||||
.addWeightedLoot([6,10], ['tfc:food/gran_feline'])
|
||||
.addWeightedLoot([6, 10], ['tfc:food/gran_feline'])
|
||||
|
||||
event.addEntityLootModifier('tfc:cougar')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([3, 5], ['tfc:food/gran_feline'])
|
||||
|
||||
|
||||
event.addEntityLootModifier('tfc:panther')
|
||||
.addWeightedLoot([6,10], ['tfc:food/gran_feline'])
|
||||
.addWeightedLoot([6, 10], ['tfc:food/gran_feline'])
|
||||
|
||||
event.addEntityLootModifier('tfc:panther')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([3, 5], ['tfc:food/gran_feline'])
|
||||
|
||||
|
||||
event.addEntityLootModifier('tfc:sabertooth')
|
||||
.addWeightedLoot([9,14], ['tfc:food/gran_feline'])
|
||||
.addWeightedLoot([9, 14], ['tfc:food/gran_feline'])
|
||||
|
||||
event.addEntityLootModifier('tfc:sabertooth')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([4, 7], ['tfc:food/gran_feline'])
|
||||
|
||||
|
||||
event.addEntityLootModifier('tfc:lion')
|
||||
.addWeightedLoot([9,14], ['tfc:food/gran_feline'])
|
||||
|
||||
.addWeightedLoot([9, 14], ['tfc:food/gran_feline'])
|
||||
|
||||
event.addEntityLootModifier('tfc:lion')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([4, 7], ['tfc:food/gran_feline'])
|
||||
|
||||
|
||||
event.addEntityLootModifier('tfc:tiger')
|
||||
.addWeightedLoot([9,14], ['tfc:food/gran_feline'])
|
||||
.addWeightedLoot([9, 14], ['tfc:food/gran_feline'])
|
||||
|
||||
event.addEntityLootModifier('tfc:tiger')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([4, 7], ['tfc:food/gran_feline'])
|
||||
|
||||
|
||||
event.addEntityLootModifier('tfc:ocelot')
|
||||
.addWeightedLoot([2,5], ['tfc:food/gran_feline'])
|
||||
.addWeightedLoot([2, 5], ['tfc:food/gran_feline'])
|
||||
|
||||
event.addEntityLootModifier('tfc:ocelot')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([1, 2], ['tfc:food/gran_feline'])
|
||||
|
||||
|
||||
event.addEntityLootModifier('tfc:cat')
|
||||
.addWeightedLoot([2,5], ['tfc:food/gran_feline'])
|
||||
.addWeightedLoot([2, 5], ['tfc:food/gran_feline'])
|
||||
|
||||
event.addEntityLootModifier('tfc:cat')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([1, 2], ['tfc:food/gran_feline'])
|
||||
|
||||
|
||||
event.addEntityLootModifier('tfc:sabertooth')
|
||||
.addWeightedLoot([9,14], ['tfc:food/gran_feline'])
|
||||
.addWeightedLoot([9, 14], ['tfc:food/gran_feline'])
|
||||
|
||||
event.addEntityLootModifier('tfc:sabertooth')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([4, 7], ['tfc:food/gran_feline'])
|
||||
|
||||
|
||||
event.addEntityLootModifier('tfc:dog')
|
||||
.addWeightedLoot([5,9], ['tfc:food/wolf'])
|
||||
.addWeightedLoot([5, 8], ['tfc:food/wolf'])
|
||||
|
||||
event.addEntityLootModifier('tfc:dog')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([2, 4], ['tfc:food/wolf'])
|
||||
|
||||
|
||||
event.addEntityLootModifier('tfc:wolf')
|
||||
.addWeightedLoot([5,9], ['tfc:food/wolf'])
|
||||
.addWeightedLoot([5, 8], ['tfc:food/wolf'])
|
||||
|
||||
event.addEntityLootModifier('tfc:wolf')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([2, 4], ['tfc:food/wolf'])
|
||||
|
||||
|
||||
event.addEntityLootModifier('tfc:direwolf')
|
||||
.addWeightedLoot([10,15], ['tfc:food/wolf'])
|
||||
.addWeightedLoot([8, 12], ['tfc:food/wolf'])
|
||||
|
||||
event.addEntityLootModifier('tfc:direwolf')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([4, 6], ['tfc:food/wolf'])
|
||||
|
||||
event.addEntityLootModifier('tfc:wolf')
|
||||
.addWeightedLoot([5,9], ['tfc:food/wolf'])
|
||||
|
||||
event.addEntityLootModifier('tfc:hyena')
|
||||
.addWeightedLoot([5,9], ['tfc:food/hyena'])
|
||||
.addWeightedLoot([4, 7], ['tfc:food/hyena'])
|
||||
|
||||
event.addEntityLootModifier('tfc:hyena')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([2, 4], ['tfc:food/hyena'])
|
||||
|
||||
|
||||
event.addEntityLootModifier('tfc:fox')
|
||||
.addWeightedLoot([5,9], ['tfc:food/fox'])
|
||||
.addWeightedLoot([4, 7], ['tfc:food/fox'])
|
||||
|
||||
event.addEntityLootModifier('tfc:fox')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([2, 4], ['tfc:food/fox'])
|
||||
|
||||
|
||||
|
||||
event.addEntityLootModifier('tfc:crocodile')
|
||||
.addWeightedLoot([5,10], ['tfc:food/bluegill', 'tfc:food/crappie', 'tfc:food/lake_trout', 'tfc:food/rainbow_trout', 'tfc:food/frog_legs'])
|
||||
.addWeightedLoot([5, 10], ['tfc:food/bluegill', 'tfc:food/crappie', 'tfc:food/lake_trout', 'tfc:food/rainbow_trout', 'tfc:food/frog_legs'])
|
||||
.addSequenceLoot(LootEntry.of('tfc:metal/fish_hook/copper').when(c => c.randomChance(0.2)))
|
||||
|
||||
event.addEntityLootModifier('tfc:crocodile')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([2, 5], ['tfc:food/bluegill', 'tfc:food/crappie', 'tfc:food/lake_trout', 'tfc:food/rainbow_trout', 'tfc:food/frog_legs'])
|
||||
|
||||
// Passive animals
|
||||
|
||||
event.addEntityLootModifier('tfc:alpaca')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([5, 10], ['tfc:food/camelidae'])
|
||||
|
||||
event.addEntityLootModifier('tfc:boar')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([2, 4], ['tfc:food/pork'])
|
||||
|
||||
event.addEntityLootModifier('tfc:bongo')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([2, 4], ['tfc:food/venison'])
|
||||
|
||||
event.addEntityLootModifier('tfc:caribou')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([3, 5], ['tfc:food/venison'])
|
||||
|
||||
event.addEntityLootModifier('tfc:chicken')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([1, 3], ['tfc:food/chicken'])
|
||||
|
||||
event.addEntityLootModifier('tfc:cow')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([8, 12], ['tfc:food/beef'])
|
||||
|
||||
event.addEntityLootModifier('tfc:deer')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([2, 4], ['tfc:food/camelidae'])
|
||||
|
||||
event.addEntityLootModifier('tfc:deer')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([2, 5], ['tfc:food/venison'])
|
||||
|
||||
event.addEntityLootModifier('tfc:donkey')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([7, 10], ['tfc:food/horse_meat'])
|
||||
|
||||
event.addEntityLootModifier('tfc:duck')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([1, 3], ['tfc:food/duck'])
|
||||
|
||||
event.addEntityLootModifier('tfc:frog')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([1, 2], ['tfc:food/frog_legs'])
|
||||
|
||||
event.addEntityLootModifier('tfc:gazelle')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([2, 4], ['tfc:food/venison'])
|
||||
|
||||
event.addEntityLootModifier('tfc:goat')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([4, 6], ['tfc:food/chevon'])
|
||||
|
||||
event.addEntityLootModifier('tfc:grouse')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([1, 2], ['tfc:food/grouse'])
|
||||
|
||||
event.addEntityLootModifier('tfc:horse')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([7, 10], ['tfc:food/horse_meat'])
|
||||
|
||||
event.addEntityLootModifier('tfc:moose')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([5, 10], ['tfc:food/venison'])
|
||||
|
||||
event.addEntityLootModifier('tfc:mule')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([7, 10], ['tfc:food/horse_meat'])
|
||||
|
||||
event.addEntityLootModifier('tfc:musk_ox')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([7, 10], ['tfc:food/mutton'])
|
||||
|
||||
event.addEntityLootModifier('tfc:peafowl')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([1, 2], ['tfc:food/peafowl'])
|
||||
|
||||
event.addEntityLootModifier('tfc:pheasant')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([1, 2], ['tfc:food/pheasant'])
|
||||
|
||||
event.addEntityLootModifier('tfc:pig')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([5, 7], ['tfc:food/pork'])
|
||||
|
||||
event.addEntityLootModifier('tfc:quail')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([1, 3], ['tfc:food/quail'])
|
||||
|
||||
event.addEntityLootModifier('tfc:rabbit')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addLoot('tfc:food/rabbit')
|
||||
|
||||
event.addEntityLootModifier('tfc:sheep')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([6, 9], ['tfc:food/mutton'])
|
||||
|
||||
event.addEntityLootModifier('tfc:turkey')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([1, 2], ['tfc:food/turkey'])
|
||||
|
||||
event.addEntityLootModifier('tfc:turtle')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addLoot('tfc:food/turtle')
|
||||
|
||||
event.addEntityLootModifier('tfc:wildebeest')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([4, 7], ['tfc:food/beef'])
|
||||
|
||||
event.addEntityLootModifier('tfc:yak')
|
||||
.randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1])
|
||||
.addWeightedLoot([7, 10], ['tfc:food/chevon'])
|
||||
|
||||
|
||||
// Blocks
|
||||
|
||||
event.addBlockLootModifier('minecraft:ice')
|
||||
.removeLoot(ItemFilter.ALWAYS_TRUE)
|
||||
|
|
@ -66,11 +263,11 @@ function registerTFCLoots(event)
|
|||
|
||||
event.addBlockLootModifier('minecraft:packed_ice')
|
||||
.not(n => n.matchMainHand("#forge:tools/saws"))
|
||||
.addWeightedLoot([4,6], ['firmalife:ice_shavings'])
|
||||
.addWeightedLoot([4, 6], ['firmalife:ice_shavings'])
|
||||
|
||||
event.addBlockLootModifier('minecraft:blue_ice')
|
||||
.not(n => n.matchMainHand("#forge:tools/saws"))
|
||||
.addWeightedLoot([8,12], ['firmalife:ice_shavings'])
|
||||
.addWeightedLoot([8, 12], ['firmalife:ice_shavings'])
|
||||
|
||||
event.addBlockLootModifier('tfc:sea_ice')
|
||||
.removeLoot(ItemFilter.ALWAYS_TRUE)
|
||||
|
|
|
|||
7
kubejs/server_scripts/tfctextile/recipes.js
Normal file
7
kubejs/server_scripts/tfctextile/recipes.js
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
// priority: 0
|
||||
|
||||
function registerTFCTextileRecipes(event) {
|
||||
|
||||
event.shapeless('tfc:large_raw_hide', ['tfc_textile:crocodile_leather', '#forge:tools/knives'])
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue