diff --git a/kubejs/data/minecraft/loot_tables/blocks/brown_mushroom_block.json b/kubejs/data/minecraft/loot_tables/blocks/brown_mushroom_block.json new file mode 100644 index 000000000..08eeb81be --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/brown_mushroom_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:brown_mushroom_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/minecraft/loot_tables/blocks/red_mushroom_block.json b/kubejs/data/minecraft/loot_tables/blocks/red_mushroom_block.json new file mode 100644 index 000000000..9b2379355 --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/red_mushroom_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:red_mushroom_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/minecraft/loot_tables/blocks/shroomlight.json b/kubejs/data/minecraft/loot_tables/blocks/shroomlight.json new file mode 100644 index 000000000..8df9d37a0 --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/shroomlight.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:glowstone_dust" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:brown_mushroom_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json b/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json index 05b645dd1..d61eacbd3 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json @@ -827,13 +827,13 @@ }, { "type": "minecraft:item", - "name": "minecraft:shroomlight", + "name": "minecraft:phantom_membrane", "functions": [ { "function": "minecraft:set_count", "count": { - "min": 3, - "max": 6, + "min": 1, + "max": 3, "type": "minecraft:uniform" } } @@ -842,7 +842,7 @@ }, { "type": "minecraft:item", - "name": "minecraft:glowstone", + "name": "minecraft:glowstone_dust", "functions": [ { "function": "minecraft:set_count", diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json b/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json index 05b645dd1..d61eacbd3 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json @@ -827,13 +827,13 @@ }, { "type": "minecraft:item", - "name": "minecraft:shroomlight", + "name": "minecraft:phantom_membrane", "functions": [ { "function": "minecraft:set_count", "count": { - "min": 3, - "max": 6, + "min": 1, + "max": 3, "type": "minecraft:uniform" } } @@ -842,7 +842,7 @@ }, { "type": "minecraft:item", - "name": "minecraft:glowstone", + "name": "minecraft:glowstone_dust", "functions": [ { "function": "minecraft:set_count", diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_other.json b/kubejs/data/minecraft/loot_tables/chests/bastion_other.json index 05b645dd1..d61eacbd3 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_other.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_other.json @@ -827,13 +827,13 @@ }, { "type": "minecraft:item", - "name": "minecraft:shroomlight", + "name": "minecraft:phantom_membrane", "functions": [ { "function": "minecraft:set_count", "count": { - "min": 3, - "max": 6, + "min": 1, + "max": 3, "type": "minecraft:uniform" } } @@ -842,7 +842,7 @@ }, { "type": "minecraft:item", - "name": "minecraft:glowstone", + "name": "minecraft:glowstone_dust", "functions": [ { "function": "minecraft:set_count", diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 0fa318848..f4d96fd6b 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -986,4 +986,26 @@ const registerMinecraftRecipes = (event) => { event.shapeless('4x minecraft:clay_ball', ['minecraft:clay']) .id('tfg:shapeless/clay_block_to_balls') + + // Mushrooms + + event.shapeless('4x minecraft:red_mushroom', ['minecraft:red_mushroom_block', '#forge:tools/knives']) + .id('tfg:shapeless/cut_red_mushroom_block') + + event.shapeless('4x minecraft:brown_mushroom', ['minecraft:brown_mushroom_block', '#forge:tools/knives']) + .id('tfg:shapeless/cut_brown_mushroom_block') + + event.recipes.gtceu.chemical_bath('tfg:red_mushroom_to_shroomlight') + .itemInputs('minecraft:red_mushroom_block') + .inputFluids(Fluid.of('gtceu:glowstone', 144)) + .itemOutputs('minecraft:shroomlight') + .duration(200) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.chemical_bath('tfg:brown_mushroom_to_shroomlight') + .itemInputs('minecraft:brown_mushroom_block') + .inputFluids(Fluid.of('gtceu:glowstone', 144)) + .itemOutputs('minecraft:shroomlight') + .duration(200) + .EUt(GTValues.VA[GTValues.ULV]) } diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 46d1c06e9..1f227b270 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -57,6 +57,9 @@ const registerMinecraftItemTags = (event) => { event.remove('forge:gems', 'minecraft:charcoal') event.remove('forge:gems', 'minecraft:coal') event.remove('minecraft:dirt', 'minecraft:moss_block') + + event.add('tfc:compost_greens_high', 'minecraft:red_mushroom_block') + event.add('tfc:compost_greens_high', 'minecraft:brown_mushroom_block') } const registerMinecraftBlockTags = (event) => {