From c411791e67a647dca97de68f8ac3eefd111436ad Mon Sep 17 00:00:00 2001 From: Maxx <53229958+MBatt1@users.noreply.github.com> Date: Sun, 13 Oct 2024 20:52:19 -0500 Subject: [PATCH] datagen i think --- build.gradle.kts | 4 + .../blocks/ParadiseLostBlocks.java | 34 +- .../id/paradiselost/datagen/LootTableGen.java | 375 ++++++++++++++++++ .../datagen/ParadiseLostDataGen.java | 12 + .../items/ParadiseLostItemGroups.java | 1 - .../paradiselost/items/ParadiseLostItems.java | 2 - .../blockstates/swedroot_spread.json | 150 ------- .../models/block/swedroot_spread.json | 41 -- .../models/item/swedroot_spread.json | 6 - .../textures/block/swedroot_spread.png | Bin 527 -> 0 bytes .../loot_table/blocks/amadrys.json | 85 ++-- .../loot_table/blocks/ancient_flower.json | 14 +- .../loot_table/blocks/ataraxia.json | 14 +- .../loot_table/blocks/aurel_bookshelf.json | 27 +- .../loot_table/blocks/aurel_button.json | 14 +- .../loot_table/blocks/aurel_door.json | 16 +- .../loot_table/blocks/aurel_fence.json | 14 +- .../loot_table/blocks/aurel_fence_gate.json | 14 +- .../loot_table/blocks/aurel_leaf_pile.json | 22 +- .../loot_table/blocks/aurel_leaves.json | 43 +- .../loot_table/blocks/aurel_log.json | 14 +- .../loot_table/blocks/aurel_planks.json | 14 +- .../blocks/aurel_pressure_plate.json | 14 +- .../loot_table/blocks/aurel_sapling.json | 14 +- .../loot_table/blocks/aurel_slab.json | 13 +- .../loot_table/blocks/aurel_stairs.json | 14 +- .../loot_table/blocks/aurel_trapdoor.json | 14 +- .../loot_table/blocks/aurel_wood.json | 20 + .../loot_table/blocks/blackcurrant_bush.json | 82 +--- .../loot_table/blocks/bloomed_calcite.json | 14 +- .../loot_table/blocks/blue_cloud.json | 14 +- .../loot_table/blocks/brown_sporecap.json | 14 +- .../paradise_lost/loot_table/blocks/bush.json | 56 +-- .../loot_table/blocks/cherine_block.json | 14 +- .../loot_table/blocks/cherine_campfire.json | 26 +- .../loot_table/blocks/cherine_lantern.json | 14 +- .../loot_table/blocks/cherine_ore.json | 26 +- .../loot_table/blocks/cherine_torch.json | 14 +- .../loot_table/blocks/chiseled_floestone.json | 14 +- .../loot_table/blocks/cloudsbluff.json | 14 +- .../loot_table/blocks/coarse_dirt.json | 14 +- .../loot_table/blocks/cobbled_floestone.json | 14 +- .../blocks/cobbled_floestone_slab.json | 13 +- .../blocks/cobbled_floestone_stairs.json | 14 +- .../blocks/cobbled_floestone_wall.json | 14 +- .../loot_table/blocks/cold_cloud.json | 14 +- .../paradise_lost/loot_table/blocks/dirt.json | 14 +- .../loot_table/blocks/drigean.json | 14 +- .../loot_table/blocks/farmland.json | 14 +- .../paradise_lost/loot_table/blocks/fern.json | 56 +-- .../paradise_lost/loot_table/blocks/flax.json | 74 +--- .../loot_table/blocks/flaxweave_cushion.json | 14 +- .../loot_table/blocks/floestone.json | 22 +- .../loot_table/blocks/floestone_brick.json | 14 +- .../blocks/floestone_brick_slab.json | 13 +- .../blocks/floestone_brick_stairs.json | 14 +- .../blocks/floestone_brick_wall.json | 14 +- .../loot_table/blocks/floestone_button.json | 14 +- .../blocks/floestone_pressure_plate.json | 14 +- .../loot_table/blocks/floestone_slab.json | 13 +- .../loot_table/blocks/floestone_stairs.json | 14 +- .../loot_table/blocks/floestone_wall.json | 14 +- .../loot_table/blocks/food_bowl.json | 20 + .../blocks/frost_wisteria_hanger.json | 22 +- .../blocks/frost_wisteria_leaf_pile.json | 22 +- .../blocks/frost_wisteria_leaves.json | 43 +- .../blocks/frost_wisteria_sapling.json | 14 +- .../loot_table/blocks/frozen_grass.json | 22 +- .../loot_table/blocks/frozen_path.json | 14 +- .../loot_table/blocks/golden_amber_tile.json | 14 +- .../blocks/golden_amber_tile_slab.json | 13 +- .../blocks/golden_amber_tile_stairs.json | 14 +- .../loot_table/blocks/golden_cloud.json | 14 +- .../blocks/golden_mossy_floestone.json | 14 +- .../loot_table/blocks/grass_flowering.json | 56 +-- .../loot_table/blocks/grass_path.json | 14 +- .../loot_table/blocks/grass_plant.json | 56 +-- .../loot_table/blocks/heliolith.json | 14 +- .../loot_table/blocks/heliolith_slab.json | 13 +- .../loot_table/blocks/heliolith_stairs.json | 14 +- .../loot_table/blocks/heliolith_wall.json | 14 +- .../loot_table/blocks/highlands_grass.json | 22 +- .../loot_table/blocks/honey_nettle.json | 32 +- .../loot_table/blocks/incubator.json | 20 + .../blocks/lavender_wisteria_hanger.json | 22 +- .../blocks/lavender_wisteria_leaf_pile.json | 22 +- .../blocks/lavender_wisteria_leaves.json | 43 +- .../blocks/lavender_wisteria_sapling.json | 14 +- .../loot_table/blocks/levita.json | 14 +- .../loot_table/blocks/levita_brick.json | 14 +- .../loot_table/blocks/levita_brick_slab.json | 13 +- .../blocks/levita_brick_stairs.json | 14 +- .../loot_table/blocks/levita_ore.json | 26 +- .../loot_table/blocks/levitator.json | 14 +- .../loot_table/blocks/liverwort.json | 14 +- .../loot_table/blocks/liverwort_carpet.json | 14 +- .../loot_table/blocks/luminar.json | 14 +- .../loot_table/blocks/malt_sprig.json | 22 +- .../loot_table/blocks/metamorphic_shell.json | 14 +- .../loot_table/blocks/mossy_floestone.json | 14 +- .../blocks/mossy_floestone_slab.json | 13 +- .../blocks/mossy_floestone_stairs.json | 14 +- .../blocks/mossy_floestone_wall.json | 14 +- .../blocks/mother_aurel_button.json | 14 +- .../loot_table/blocks/mother_aurel_door.json | 16 +- .../loot_table/blocks/mother_aurel_fence.json | 14 +- .../blocks/mother_aurel_fence_gate.json | 14 +- .../blocks/mother_aurel_leaves.json | 43 +- .../loot_table/blocks/mother_aurel_log.json | 14 +- .../blocks/mother_aurel_planks.json | 14 +- .../blocks/mother_aurel_pressure_plate.json | 14 +- .../blocks/mother_aurel_sapling.json | 14 +- .../loot_table/blocks/mother_aurel_slab.json | 13 +- .../blocks/mother_aurel_stairs.json | 14 +- .../blocks/mother_aurel_trapdoor.json | 14 +- .../loot_table/blocks/mother_aurel_wood.json | 20 + .../blocks/mottled_aurel_fallen_log.json | 14 +- .../loot_table/blocks/mottled_aurel_log.json | 14 +- .../loot_table/blocks/nitra.json | 82 ++-- .../loot_table/blocks/nitra_bunch.json | 14 +- .../loot_table/blocks/olvite_block.json | 14 +- .../loot_table/blocks/olvite_chain.json | 14 +- .../loot_table/blocks/olvite_ore.json | 26 +- .../loot_table/blocks/orange_button.json | 14 +- .../loot_table/blocks/orange_door.json | 16 +- .../loot_table/blocks/orange_fence.json | 14 +- .../loot_table/blocks/orange_fence_gate.json | 14 +- .../loot_table/blocks/orange_leaves.json | 43 +- .../loot_table/blocks/orange_log.json | 14 +- .../loot_table/blocks/orange_planks.json | 14 +- .../blocks/orange_pressure_plate.json | 14 +- .../loot_table/blocks/orange_sapling.json | 14 +- .../loot_table/blocks/orange_slab.json | 13 +- .../loot_table/blocks/orange_stairs.json | 14 +- .../loot_table/blocks/orange_trapdoor.json | 14 +- .../loot_table/blocks/orange_wood.json | 20 + .../loot_table/blocks/packed_swedroot.json | 14 +- .../loot_table/blocks/permafrost.json | 14 +- .../loot_table/blocks/pink_sporecap.json | 14 +- .../blocks/potted_ancient_flower.json | 35 ++ .../loot_table/blocks/potted_ataraxia.json | 35 ++ .../blocks/potted_aurel_sapling.json | 24 +- .../loot_table/blocks/potted_cloudsbluff.json | 35 ++ .../loot_table/blocks/potted_drigean.json | 35 ++ .../blocks/potted_frost_wisteria_sapling.json | 24 +- .../potted_lavender_wisteria_sapling.json | 24 +- .../loot_table/blocks/potted_luminar.json | 35 ++ .../blocks/potted_mother_aurel_sapling.json | 24 +- .../blocks/potted_orange_sapling.json | 35 ++ .../blocks/potted_rose_wisteria_sapling.json | 24 +- .../blocks/refined_surtrum_block.json | 14 +- .../loot_table/blocks/rootcap.json | 14 +- .../blocks/rose_wisteria_hanger.json | 22 +- .../blocks/rose_wisteria_leaf_pile.json | 22 +- .../blocks/rose_wisteria_leaves.json | 43 +- .../blocks/rose_wisteria_sapling.json | 14 +- .../loot_table/blocks/shamrock.json | 56 +-- .../loot_table/blocks/short_grass.json | 23 ++ .../loot_table/blocks/smooth_heliolith.json | 14 +- .../blocks/smooth_heliolith_slab.json | 13 +- .../blocks/smooth_heliolith_stairs.json | 14 +- .../loot_table/blocks/stripped_aurel_log.json | 14 +- .../blocks/stripped_aurel_wood.json | 20 + .../blocks/stripped_mother_aurel_log.json | 14 +- .../blocks/stripped_mother_aurel_wood.json | 20 + .../blocks/stripped_orange_log.json | 14 +- .../blocks/stripped_orange_wood.json | 20 + .../blocks/stripped_wisteria_log.json | 14 +- .../blocks/stripped_wisteria_wood.json | 20 + .../loot_table/blocks/surtrum.json | 26 +- .../loot_table/blocks/swedroot.json | 62 ++- .../loot_table/blocks/tall_grass.json | 146 +++---- .../loot_table/blocks/tree_tap.json | 14 +- .../loot_table/blocks/wild_flax.json | 74 ++-- .../loot_table/blocks/wisteria_button.json | 14 +- .../loot_table/blocks/wisteria_door.json | 16 +- .../loot_table/blocks/wisteria_fence.json | 14 +- .../blocks/wisteria_fence_gate.json | 14 +- .../loot_table/blocks/wisteria_log.json | 14 +- .../loot_table/blocks/wisteria_planks.json | 14 +- .../blocks/wisteria_pressure_plate.json | 14 +- .../loot_table/blocks/wisteria_slab.json | 13 +- .../loot_table/blocks/wisteria_stairs.json | 14 +- .../loot_table/blocks/wisteria_trapdoor.json | 14 +- .../loot_table/blocks/wisteria_wood.json | 20 + .../tags/block/mineable_by_axe.json | 1 - src/main/resources/fabric.mod.json | 3 + 187 files changed, 2384 insertions(+), 2006 deletions(-) create mode 100644 src/main/java/net/id/paradiselost/datagen/LootTableGen.java create mode 100644 src/main/java/net/id/paradiselost/datagen/ParadiseLostDataGen.java delete mode 100644 src/main/resources/assets/paradise_lost/blockstates/swedroot_spread.json delete mode 100644 src/main/resources/assets/paradise_lost/models/block/swedroot_spread.json delete mode 100644 src/main/resources/assets/paradise_lost/models/item/swedroot_spread.json delete mode 100644 src/main/resources/assets/paradise_lost/textures/block/swedroot_spread.png create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/aurel_wood.json create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/food_bowl.json create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/incubator.json create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_wood.json create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/orange_wood.json create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/potted_ancient_flower.json create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/potted_ataraxia.json create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/potted_cloudsbluff.json create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/potted_drigean.json create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/potted_luminar.json create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/potted_orange_sapling.json create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/short_grass.json create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/stripped_aurel_wood.json create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/stripped_mother_aurel_wood.json create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/stripped_orange_wood.json create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/stripped_wisteria_wood.json create mode 100644 src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_wood.json diff --git a/build.gradle.kts b/build.gradle.kts index 845816779..53fa86954 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -219,6 +219,10 @@ crowdintranslate { verbose = true } +fabricApi { + configureDataGeneration() +} + publishing { publications { create("mavenJava") { diff --git a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java index 11b97e0cb..d87d30098 100644 --- a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java +++ b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java @@ -43,19 +43,19 @@ private static Settings permafrost() { return copy(Blocks.DIRT).strength(2f).sounds(BlockSoundGroup.GILDED_BLACKSTONE); } + // Soil Blocks public static final FarmlandBlock FARMLAND = add("farmland", new ParadiseLostFarmlandBlock(copy(Blocks.FARMLAND))); public static final ParadiseLostDirtPathBlock DIRT_PATH = add("grass_path", new ParadiseLostDirtPathBlock(copy(Blocks.DIRT_PATH), () -> ParadiseLostBlocks.DIRT)); public static final ParadiseLostDirtPathBlock PERMAFROST_PATH = add("frozen_path", new ParadiseLostDirtPathBlock(permafrost(), () -> ParadiseLostBlocks.PERMAFROST)); public static final ParadiseLostGrassBlock HIGHLANDS_GRASS = add("highlands_grass", new ParadiseLostGrassBlock(grassBlock()), cutoutMippedRenderLayer, tillable(), flattenable(ParadiseLostBlocks.DIRT_PATH)); public static final ParadiseLostSnowyBlock FROZEN_GRASS = add("frozen_grass", new ParadiseLostSnowyBlock(grassBlock().mapColor(MapColor.WHITE).strength(2F).sounds(BlockSoundGroup.GILDED_BLACKSTONE)), flattenable(ParadiseLostBlocks.PERMAFROST_PATH)); - // Soil Blocks + public static final Block DIRT = add("dirt", new Block(copy(Blocks.DIRT).strength(0.3f)), tillable(), flattenable(ParadiseLostBlocks.DIRT_PATH)); public static final Block COARSE_DIRT = add("coarse_dirt", new Block(copy(Blocks.DIRT).strength(0.3f)), coarseTillable(), flattenable(ParadiseLostBlocks.DIRT_PATH)); public static final FloatingBlock LEVITA = add("levita", new FloatingBlock(false, copy(Blocks.GRAVEL).strength(0.3f))); public static final Block PERMAFROST = add("permafrost", new Block(permafrost()), flattenable(ParadiseLostBlocks.PERMAFROST_PATH)); public static final Block PACKED_SWEDROOT = add("packed_swedroot", new Block(create().strength(2f).sounds(BlockSoundGroup.SHROOMLIGHT))); - // Glass Blocks // Clouds private static Settings cloud() { @@ -66,7 +66,7 @@ private static Settings cloud() { public static final BlueParadiseLostCloudBlock BLUE_CLOUD = add("blue_cloud", new BlueParadiseLostCloudBlock(cloud().mapColor(MapColor.LIGHT_BLUE)), translucentRenderLayer); public static final GoldenParadiseLostCloudBlock GOLDEN_CLOUD = add("golden_cloud", new GoldenParadiseLostCloudBlock(cloud().mapColor(MapColor.GOLD)), translucentRenderLayer); - // Smooth Floestone + // Floestone private static Settings floestone() { return create().mapColor(MapColor.LIGHT_GRAY).requiresTool().strength(0.5f, 5f).sounds(BlockSoundGroup.STONE); } @@ -117,17 +117,19 @@ private static Settings floestoneBrick() { public static final ParadiseLostStairsBlock SMOOTH_HELIOLITH_STAIRS = add("smooth_heliolith_stairs", new ParadiseLostStairsBlock(FLOESTONE_BRICK.getDefaultState(), floestone())); public static final WallBlock HELIOLITH_WALL = add("heliolith_wall", new WallBlock(floestone())); - // LEVITA BRICK - public static final SimpleBlockSet LEVITA_BRICK_SET = registerSimpleBlockSet("levita_brick", create().mapColor(MapColor.LIGHT_BLUE_GRAY).requiresTool().strength(0.3f, 3f).sounds(BlockSoundGroup.CALCITE)); + // Levita Brick + public static final SimpleBlockSet LEVITA_BRICK_SET = registerSimpleBlockSet("levita_brick", create().mapColor(MapColor.LIGHT_BLUE_GRAY).strength(0.3f, 3f).sounds(BlockSoundGroup.CALCITE)); private static Settings amberTiles() { return create().mapColor(MapColor.GOLD).requiresTool().sounds(BlockSoundGroup.CALCITE).strength(2, 6); } + // Golden Amber Tile public static final Block GOLDEN_AMBER_TILE = add("golden_amber_tile", new Block(amberTiles())); public static final SlabBlock GOLDEN_AMBER_TILE_SLAB = add("golden_amber_tile_slab", new SlabBlock(amberTiles())); public static final ParadiseLostStairsBlock GOLDEN_AMBER_TILE_STAIRS = add("golden_amber_tile_stairs", new ParadiseLostStairsBlock(GOLDEN_AMBER_TILE.getDefaultState(), amberTiles())); + // Misc public static final CropGrowthBlock BLOOMED_CALCITE = add("bloomed_calcite", new CropGrowthBlock(copy(CALCITE).ticksRandomly(), 2)); protected static Settings flowerPot() { @@ -205,12 +207,6 @@ private static Settings crop() { public static final Block LIVERWORT = add("liverwort", new Block(copy(MOSS_BLOCK).sounds(BlockSoundGroup.AZALEA_LEAVES))); public static final CarpetBlock LIVERWORT_CARPET = add("liverwort_carpet", new CarpetBlock(copy(MOSS_BLOCK).sounds(BlockSoundGroup.AZALEA_LEAVES))); - private static Settings lichen() { - return copy(OAK_WOOD).mapColor(MapColor.DULL_RED).sounds(BlockSoundGroup.MOSS_BLOCK); - } - - public static final GlowLichenBlock SWEDROOT_SPREAD = add("swedroot_spread", new GlowLichenBlock(Settings.create().mapColor(MapColor.OAK_TAN).pistonBehavior(PistonBehavior.DESTROY).noCollision().strength(1F).sounds(BlockSoundGroup.SHROOMLIGHT)), cutoutRenderLayer); - public static final WallClingingPlantBlock ROOTCAP = add("rootcap", new WallClingingPlantBlock(ParadiseLostBlockTags.FUNGI_CLINGABLES, copy(BROWN_MUSHROOM)), cutoutRenderLayer); public static final ParadiseLostMushroomPlantBlock BROWN_SPORECAP = add("brown_sporecap", new ParadiseLostMushroomPlantBlock(BlockTags.MUSHROOM_GROW_BLOCK, copy(BROWN_MUSHROOM)), cutoutRenderLayer); public static final ParadiseLostHangingMushroomPlantBlock PINK_SPORECAP = add("pink_sporecap", new ParadiseLostHangingMushroomPlantBlock(BlockTags.MUSHROOM_GROW_BLOCK, copy(BROWN_MUSHROOM)), cutoutRenderLayer); @@ -266,7 +262,6 @@ private static Settings flower() { public static final CherineLanternBlock CHERINE_LANTERN = add("cherine_lantern", new CherineLanternBlock(copy(LANTERN).resistance(1f)), cutoutMippedRenderLayer); public static final ParadiseLostPortalBlock BLUE_PORTAL = add("blue_portal", new ParadiseLostPortalBlock(copy(NETHER_PORTAL).nonOpaque().blockVision(never).mapColor(MapColor.BLUE)), translucentRenderLayer); - // Torches private static Settings cherineTorch() { return copy(TORCH).ticksRandomly().luminance(state -> 15); } @@ -280,22 +275,7 @@ private static Settings cherineTorch() { public static final Block TREE_TAP = add("tree_tap", new TreeTapBlock(create().mapColor(MapColor.SPRUCE_BROWN).strength(2.5f).sounds(BlockSoundGroup.WOOD).nonOpaque().ticksRandomly()), cutoutRenderLayer); public static final NitraBlock NITRA_BUNCH = add("nitra_bunch", new NitraBlock(create().mapColor(MapColor.PALE_YELLOW).strength(0.5f).sounds(BlockSoundGroup.WET_GRASS))); - //dungeon -// public static final DungeonSwitchBlock DUNGEON_SWITCH = add("dungeonswitch", new DungeonSwitchBlock(of(Material.METAL, MapColor.BLUE).strength(-1.0F, 3600000.0F))); - public static void init() { } -// @Environment(EnvType.CLIENT) -// public static void initClient() { -// for (var signSet : List.of(AUREL_SIGNS, MOTHER_AUREL_SIGNS, ORANGE_SIGNS, WISTERIA_SIGNS)) { -// TexturedRenderLayers.WOOD_TYPE_TEXTURES.put( -// signSet.type(), new SpriteIdentifier( -// TexturedRenderLayers.SIGNS_ATLAS_TEXTURE, new Identifier("entity/signs/" + signSet.type().getName()) -// ) -// ); -// } -// } - - } diff --git a/src/main/java/net/id/paradiselost/datagen/LootTableGen.java b/src/main/java/net/id/paradiselost/datagen/LootTableGen.java new file mode 100644 index 000000000..94b87b7de --- /dev/null +++ b/src/main/java/net/id/paradiselost/datagen/LootTableGen.java @@ -0,0 +1,375 @@ +package net.id.paradiselost.datagen; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider; +import net.id.paradiselost.blocks.BlockRegistration; +import net.id.paradiselost.items.ParadiseLostItems; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.block.CropBlock; +import net.minecraft.block.SweetBerryBushBlock; +import net.minecraft.block.TallPlantBlock; +import net.minecraft.block.enums.DoubleBlockHalf; +import net.minecraft.data.server.loottable.BlockLootTableGenerator; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.item.Item; +import net.minecraft.item.ItemConvertible; +import net.minecraft.item.Items; +import net.minecraft.loot.LootPool; +import net.minecraft.loot.LootTable; +import net.minecraft.loot.condition.BlockStatePropertyLootCondition; +import net.minecraft.loot.condition.LocationCheckLootCondition; +import net.minecraft.loot.condition.LootCondition; +import net.minecraft.loot.entry.ItemEntry; +import net.minecraft.loot.entry.LootPoolEntry; +import net.minecraft.loot.function.ApplyBonusLootFunction; +import net.minecraft.loot.function.SetCountLootFunction; +import net.minecraft.loot.provider.number.ConstantLootNumberProvider; +import net.minecraft.loot.provider.number.LootNumberProvider; +import net.minecraft.loot.provider.number.UniformLootNumberProvider; +import net.minecraft.predicate.BlockPredicate; +import net.minecraft.predicate.StatePredicate; +import net.minecraft.predicate.entity.LocationPredicate; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.util.math.BlockPos; + +import java.util.concurrent.CompletableFuture; + +import static net.id.paradiselost.blocks.ParadiseLostBlocks.*; + +public class LootTableGen extends FabricBlockLootTableProvider { + + protected LootTableGen(FabricDataOutput dataOutput, CompletableFuture registryLookup) { + super(dataOutput, registryLookup); + } + + @Override + public void generate() { + + // Soil Blocks + addDrop(FARMLAND, DIRT); + addDrop(DIRT_PATH, DIRT); + addDrop(PERMAFROST_PATH, PERMAFROST); + addDrop(HIGHLANDS_GRASS, block -> this.drops(block, DIRT)); + addDrop(FROZEN_GRASS, block -> this.drops(block, PERMAFROST)); + addDrop(DIRT); + addDrop(COARSE_DIRT); + addDrop(LEVITA); + addDrop(PERMAFROST); + addDrop(PACKED_SWEDROOT); + + // Clouds + addDrop(COLD_CLOUD); + addDrop(BLUE_CLOUD); + addDrop(GOLDEN_CLOUD); + + // Floestone + addDrop(FLOESTONE, block -> this.drops(block, COBBLED_FLOESTONE)); + addDrop(FLOESTONE_SLAB, this::slabDrops); + addDrop(FLOESTONE_STAIRS); + addDrop(FLOESTONE_WALL); + // Cobbled Floestone + addDrop(COBBLED_FLOESTONE); + addDrop(COBBLED_FLOESTONE_SLAB, this::slabDrops); + addDrop(COBBLED_FLOESTONE_STAIRS); + addDrop(COBBLED_FLOESTONE_WALL); + // Mossy Floestone + addDrop(MOSSY_FLOESTONE); + addDrop(GOLDEN_MOSSY_FLOESTONE); + addDrop(MOSSY_FLOESTONE_SLAB, this::slabDrops); + addDrop(MOSSY_FLOESTONE_STAIRS); + addDrop(MOSSY_FLOESTONE_WALL); + // Floestone Bricks + addDrop(FLOESTONE_BRICK); + addDrop(CHISELED_FLOESTONE); + addDrop(FLOESTONE_BRICK_SLAB, this::slabDrops); + addDrop(FLOESTONE_BRICK_STAIRS); + addDrop(FLOESTONE_BRICK_WALL); + + // Heliolith + addDrop(HELIOLITH); + addDrop(SMOOTH_HELIOLITH); + addDrop(HELIOLITH_SLAB, this::slabDrops); + addDrop(SMOOTH_HELIOLITH_SLAB, this::slabDrops); + addDrop(HELIOLITH_STAIRS); + addDrop(SMOOTH_HELIOLITH_STAIRS); + addDrop(HELIOLITH_WALL); + + // Levita Brick + addSimpleBlockSetDrops(LEVITA_BRICK_SET); + + // Golden Amber Tile + addDrop(GOLDEN_AMBER_TILE); + addDrop(GOLDEN_AMBER_TILE_SLAB, this::slabDrops); + addDrop(GOLDEN_AMBER_TILE_STAIRS); + + + // Misc + addDrop(BLOOMED_CALCITE); + addDrop(CHERINE_CAMPFIRE, this::campfireDrops); + + + // Aurel Wood + addWoodBlockSetDrops(AUREL_WOODSTUFF, 0.05F, 0.0625F, 0.083333336F, 0.1F); + addDrop(MOTTLED_AUREL_LOG); + addDrop(MOTTLED_AUREL_FALLEN_LOG); + addDropsWithShears(AUREL_LEAF_PILE); + addDrop(AUREL_BOOKSHELF, block -> this.drops(block, Items.BOOK, ConstantLootNumberProvider.create(3.0F))); + addDrop(MOTTLED_AUREL_FALLEN_LOG); + addSignSetDrops(AUREL_SIGNS); + + // Mother Aurel Wood + addWoodBlockSetDrops(MOTHER_AUREL_WOODSTUFF, 0.05F, 0.0625F, 0.083333336F, 0.1F); + addSignSetDrops(MOTHER_AUREL_SIGNS); + + // Orange Wood + addWoodBlockSetDrops(ORANGE_WOODSTUFF, 0.05F, 0.0625F, 0.083333336F, 0.1F); + addSignSetDrops(ORANGE_SIGNS); + + // Wisteria Wood + addDrop(WISTERIA_WOODSTUFF.log()); + addDrop(WISTERIA_WOODSTUFF.wood()); + addDrop(WISTERIA_WOODSTUFF.strippedLog()); + addDrop(WISTERIA_WOODSTUFF.strippedWood()); + addDrop(WISTERIA_WOODSTUFF.plank()); + addDrop(WISTERIA_WOODSTUFF.plankStairs()); + addDrop(WISTERIA_WOODSTUFF.plankSlab(), this::slabDrops); + addDrop(WISTERIA_WOODSTUFF.fence()); + addDrop(WISTERIA_WOODSTUFF.fenceGate()); + addDrop(WISTERIA_WOODSTUFF.door(), this::doorDrops); + addDrop(WISTERIA_WOODSTUFF.trapdoor()); + addDrop(WISTERIA_WOODSTUFF.button()); + addDrop(WISTERIA_WOODSTUFF.pressurePlate()); + addSignSetDrops(WISTERIA_SIGNS); + + addDrop(ROSE_WISTERIA_LEAVES, block -> leavesDrops(ROSE_WISTERIA_LEAVES, ROSE_WISTERIA_SAPLING, 0.05F, 0.0625F, 0.083333336F, 0.1F)); + addDropsWithShears(ROSE_WISTERIA_LEAF_PILE); + addDrop(ROSE_WISTERIA_SAPLING); + addPottedPlantDrops(POTTED_ROSE_WISTERIA_SAPLING); + addDropsWithShears(ROSE_WISTERIA_HANGER); + + addDrop(FROST_WISTERIA_LEAVES, block -> leavesDrops(FROST_WISTERIA_LEAVES, FROST_WISTERIA_SAPLING, 0.05F, 0.0625F, 0.083333336F, 0.1F)); + addDropsWithShears(FROST_WISTERIA_LEAF_PILE); + addDrop(FROST_WISTERIA_SAPLING); + addPottedPlantDrops(POTTED_FROST_WISTERIA_SAPLING); + addDropsWithShears(FROST_WISTERIA_HANGER); + + addDrop(LAVENDER_WISTERIA_LEAVES, block -> leavesDrops(LAVENDER_WISTERIA_LEAVES, LAVENDER_WISTERIA_SAPLING, 0.05F, 0.0625F, 0.083333336F, 0.1F)); + addDropsWithShears(LAVENDER_WISTERIA_LEAF_PILE); + addDrop(LAVENDER_WISTERIA_SAPLING); + addPottedPlantDrops(POTTED_LAVENDER_WISTERIA_SAPLING); + addDropsWithShears(LAVENDER_WISTERIA_HANGER); + + // Grasses + addDropsWithShears(GRASS); + addDropsWithShears(GRASS_FLOWERING); + addDropsWithShears(SHORT_GRASS); + addDrop(TALL_GRASS, block -> tallPlantNoSeedsDrops(block, GRASS)); + addDropsWithShears(FERN); + pottedPlantDrops(POTTED_FERN); + addDropsWithShears(BUSH); + addDropsWithShears(SHAMROCK); + addDropsWithShears(MALT_SPRIG); + addDrop(HONEY_NETTLE, block -> shearsWeightedDrops(HONEY_NETTLE, ParadiseLostItems.AMADRYS_BUSHEL, UniformLootNumberProvider.create(2, 4))); + addDrop(LIVERWORT); + addDrop(LIVERWORT_CARPET); + + addDrop(ROOTCAP); + addDrop(BROWN_SPORECAP); + addDrop(PINK_SPORECAP); + + addDrop(AMADRYS, block -> cropDrops(AMADRYS, ParadiseLostItems.AMADRYS_BUSHEL, ParadiseLostItems.AMADRYS_BUSHEL, + BlockStatePropertyLootCondition.builder(AMADRYS) + .properties(StatePredicate.Builder.create().exactMatch(CropBlock.AGE, 7)))); + + addDrop(FLAX, block -> cropDrops(FLAX, ParadiseLostItems.FLAXSEED, ParadiseLostItems.FLAX_THREAD, + BlockStatePropertyLootCondition.builder(FLAX) + .properties(StatePredicate.Builder.create().exactMatch(CropBlock.AGE, 7).exactMatch(TallPlantBlock.HALF, DoubleBlockHalf.LOWER)))); + + addDrop(SWEDROOT, block -> cropDrops(SWEDROOT, ParadiseLostItems.SWEDROOT, ParadiseLostItems.SWEDROOT, + BlockStatePropertyLootCondition.builder(SWEDROOT) + .properties(StatePredicate.Builder.create().exactMatch(CropBlock.AGE, 7)))); + + addDrop(NITRA, block -> cropDrops(NITRA, ParadiseLostItems.NITRA_BULB, ParadiseLostItems.NITRA_SEED, + BlockStatePropertyLootCondition.builder(NITRA) + .properties(StatePredicate.Builder.create().exactMatch(CropBlock.AGE, 7)))); + + addDrop(FLAXWEAVE_CUSHION); + + addDrop(BLACKCURRANT_BUSH, this::bushDrops); + + // Flowers + addDrop(ANCIENT_FLOWER); + addPottedPlantDrops(POTTED_ANCIENT_FLOWER); + addDrop(ATARAXIA); + addPottedPlantDrops(POTTED_ATARAXIA); + addDrop(CLOUDSBLUFF); + addPottedPlantDrops(POTTED_CLOUDSBLUFF); + addDrop(DRIGEAN); + addPottedPlantDrops(POTTED_DRIGEAN); + addDrop(LUMINAR); + addPottedPlantDrops(POTTED_LUMINAR); + + // Tall Flowers + addDrop(WILD_FLAX, wildFlaxDrops()); + + // Ores + addOreDrops(CHERINE_ORE, ParadiseLostItems.CHERINE); + addOreDrops(OLVITE_ORE, ParadiseLostItems.OLVITE); + addOreDrops(SURTRUM, ParadiseLostItems.RAW_SURTRUM); + addDrop(METAMORPHIC_SHELL); + addOreDrops(LEVITA_ORE, ParadiseLostItems.LEVITA_GEM); + addDrop(CHERINE_BLOCK); + addDrop(OLVITE_BLOCK); + addDrop(REFINED_SURTRUM_BLOCK); + + // Misc + addDrop(FLOESTONE_BUTTON); + addDrop(FLOESTONE_PRESSURE_PLATE); + addDrop(LEVITATOR); + addDrop(OLVITE_CHAIN); + addDrop(CHERINE_LANTERN); + addDrop(CHERINE_TORCH); + + // Usables + addDrop(INCUBATOR); + addDrop(FOOD_BOWL); + addDrop(TREE_TAP); + addDrop(NITRA_BUNCH); + + } + + // Helper Functions + private LootTable.Builder tallPlantNoSeedsDrops(Block tallPlant, Block shortPlant) { + LootPoolEntry.Builder builder = ItemEntry.builder(shortPlant) + .apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(2.0F))) + .conditionally(WITH_SHEARS); + return LootTable.builder() + .pool( + LootPool.builder() + .with(builder) + .conditionally( + BlockStatePropertyLootCondition.builder(tallPlant).properties(StatePredicate.Builder.create().exactMatch(TallPlantBlock.HALF, DoubleBlockHalf.LOWER)) + ) + .conditionally( + LocationCheckLootCondition.builder( + LocationPredicate.Builder.create() + .block(BlockPredicate.Builder.create().blocks(tallPlant).state(StatePredicate.Builder.create().exactMatch(TallPlantBlock.HALF, DoubleBlockHalf.UPPER))), + new BlockPos(0, 1, 0) + ) + ) + ) + .pool( + LootPool.builder() + .with(builder) + .conditionally( + BlockStatePropertyLootCondition.builder(tallPlant).properties(StatePredicate.Builder.create().exactMatch(TallPlantBlock.HALF, DoubleBlockHalf.UPPER)) + ) + .conditionally( + LocationCheckLootCondition.builder( + LocationPredicate.Builder.create() + .block(BlockPredicate.Builder.create().blocks(tallPlant).state(StatePredicate.Builder.create().exactMatch(TallPlantBlock.HALF, DoubleBlockHalf.LOWER))), + new BlockPos(0, -1, 0) + ) + ) + ); + } + + private LootTable.Builder shearsWeightedDrops(Block block, ItemConvertible drop, LootNumberProvider provider) { + RegistryWrapper.Impl impl = this.registryLookup.getWrapperOrThrow(RegistryKeys.ENCHANTMENT); + LootPoolEntry.Builder builder = this.applyExplosionDecay( + block, + ItemEntry.builder(drop) + .apply(SetCountLootFunction.builder(provider)) + .apply(ApplyBonusLootFunction.binomialWithBonusCount(impl.getOrThrow(Enchantments.FORTUNE), 0.5714286F, 3)) + ); + return dropsWithShears(block, builder); + } + + private LootTable.Builder campfireDrops(Block block) { + return this.dropsWithSilkTouch( + block, + this.addSurvivesExplosionCondition( + block, ItemEntry.builder(Items.CHARCOAL).apply(SetCountLootFunction.builder(ConstantLootNumberProvider.create(2.0F))) + ) + ); + } + + private LootTable.Builder bushDrops(Block block) { + RegistryWrapper.Impl impl = this.registryLookup.getWrapperOrThrow(RegistryKeys.ENCHANTMENT); + return this.applyExplosionDecay( + block, + LootTable.builder() + .pool( + LootPool.builder() + .conditionally( + BlockStatePropertyLootCondition.builder(BLACKCURRANT_BUSH) + .properties(StatePredicate.Builder.create().exactMatch(SweetBerryBushBlock.AGE, 3))) + .with(ItemEntry.builder(block).apply(ApplyBonusLootFunction.binomialWithBonusCount(impl.getOrThrow(Enchantments.FORTUNE), 0.5714286F, 3))) + ) + ); + } + + private LootTable.Builder wildFlaxDrops() { + RegistryWrapper.Impl impl = this.registryLookup.getWrapperOrThrow(RegistryKeys.ENCHANTMENT); + var condition = BlockStatePropertyLootCondition.builder(WILD_FLAX) + .properties(StatePredicate.Builder.create().exactMatch(TallPlantBlock.HALF, DoubleBlockHalf.LOWER)); + return this.applyExplosionDecay( + WILD_FLAX, + LootTable.builder() + .pool( + LootPool.builder() + .with(ItemEntry.builder(ParadiseLostItems.FLAX_THREAD).conditionally(condition)) + .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1, 3))) + ) + .pool( + LootPool.builder() + .conditionally(condition) + .with(ItemEntry.builder(ParadiseLostItems.FLAXSEED).apply(ApplyBonusLootFunction.binomialWithBonusCount(impl.getOrThrow(Enchantments.FORTUNE), 0.5714286F, 3))) + ) + ); + } + + private void addDropsWithShears(Block block) { + addDrop(block, BlockLootTableGenerator::dropsWithShears); + } + + private void addOreDrops(Block withSilkTouch, Item withoutSilkTouch) { + addDrop(withSilkTouch, block -> oreDrops(block, withoutSilkTouch)); + } + + private void addSimpleBlockSetDrops(BlockRegistration.SimpleBlockSet set) { + addDrop(set.block()); + addDrop(set.slab(), this::slabDrops); + addDrop(set.stairs()); + } + + private void addWoodBlockSetDrops(BlockRegistration.WoodBlockSet set, float... saplingChance) { + addDrop(set.sapling()); + addPottedPlantDrops(set.flowerPot()); + addDrop(set.log()); + addDrop(set.wood()); + addDrop(set.strippedLog()); + addDrop(set.strippedWood()); + addDrop(set.leaves(), b -> leavesDrops(set.leaves(), set.sapling(), saplingChance)); + addDrop(set.plank()); + addDrop(set.plankStairs()); + addDrop(set.plankSlab(), this::slabDrops); + addDrop(set.fence()); + addDrop(set.fenceGate()); + addDrop(set.door(), this::doorDrops); + addDrop(set.trapdoor()); + addDrop(set.button()); + addDrop(set.pressurePlate()); + } + + private void addSignSetDrops(BlockRegistration.SignSet set) { + addDrop(set.sign()); + addDrop(set.wallSign()); + addDrop(set.hangingSign()); + addDrop(set.wallHangingSign()); + } + +} diff --git a/src/main/java/net/id/paradiselost/datagen/ParadiseLostDataGen.java b/src/main/java/net/id/paradiselost/datagen/ParadiseLostDataGen.java new file mode 100644 index 000000000..02741811d --- /dev/null +++ b/src/main/java/net/id/paradiselost/datagen/ParadiseLostDataGen.java @@ -0,0 +1,12 @@ +package net.id.paradiselost.datagen; + +import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; +import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; + +public class ParadiseLostDataGen implements DataGeneratorEntrypoint { + @Override + public void onInitializeDataGenerator(FabricDataGenerator generator) { + FabricDataGenerator.Pack pack = generator.createPack(); + pack.addProvider(LootTableGen::new); + } +} diff --git a/src/main/java/net/id/paradiselost/items/ParadiseLostItemGroups.java b/src/main/java/net/id/paradiselost/items/ParadiseLostItemGroups.java index 85c6c2025..aea44f3fa 100644 --- a/src/main/java/net/id/paradiselost/items/ParadiseLostItemGroups.java +++ b/src/main/java/net/id/paradiselost/items/ParadiseLostItemGroups.java @@ -190,7 +190,6 @@ public class ParadiseLostItemGroups { entries.add(NITRA_SEED); entries.add(NITRA_BULB); entries.add(SWEDROOT); - entries.add(SWEDROOT_SPREAD); })); public static final RegistryKey PARADISE_DECO = create("decoration", FabricItemGroup.builder() diff --git a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java index 97234f7ed..35fceb640 100644 --- a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java +++ b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java @@ -354,8 +354,6 @@ private static Settings food(FoodComponent foodComponent) { public static final BlockItem BROWN_SPORECAP = add(ParadiseLostBlocks.BROWN_SPORECAP, compostable65); public static final BlockItem PINK_SPORECAP = add(ParadiseLostBlocks.PINK_SPORECAP, compostable65); - public static final BlockItem SWEDROOT_SPREAD = add(ParadiseLostBlocks.SWEDROOT_SPREAD, compostable65); - public static final BlockItem FLAXWEAVE_CUSHION = add(ParadiseLostBlocks.FLAXWEAVE_CUSHION, fuel(300)); public static final BlockItem CHEESECAKE = add(ParadiseLostBlocks.CHEESECAKE); diff --git a/src/main/resources/assets/paradise_lost/blockstates/swedroot_spread.json b/src/main/resources/assets/paradise_lost/blockstates/swedroot_spread.json deleted file mode 100644 index 5a4a49d97..000000000 --- a/src/main/resources/assets/paradise_lost/blockstates/swedroot_spread.json +++ /dev/null @@ -1,150 +0,0 @@ -{ - "multipart": [ - { - "when": { - "up": "true" - }, - "apply": { - "model": "paradise_lost:block/swedroot_spread", - "x": 270, - "uvlock": true - } - }, - { - "when": { - "up": "false", - "north": "false", - "west": "false", - "south": "false", - "east": "false", - "down": "false" - }, - "apply": { - "model": "paradise_lost:block/swedroot_spread", - "x": 270, - "uvlock": true - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "paradise_lost:block/swedroot_spread" - } - }, - { - "when": { - "up": "false", - "north": "false", - "west": "false", - "south": "false", - "east": "false", - "down": "false" - }, - "apply": { - "model": "paradise_lost:block/swedroot_spread" - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "paradise_lost:block/swedroot_spread", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "up": "false", - "north": "false", - "west": "false", - "south": "false", - "east": "false", - "down": "false" - }, - "apply": { - "model": "paradise_lost:block/swedroot_spread", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "paradise_lost:block/swedroot_spread", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "up": "false", - "north": "false", - "west": "false", - "south": "false", - "east": "false", - "down": "false" - }, - "apply": { - "model": "paradise_lost:block/swedroot_spread", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "paradise_lost:block/swedroot_spread", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "up": "false", - "north": "false", - "west": "false", - "south": "false", - "east": "false", - "down": "false" - }, - "apply": { - "model": "paradise_lost:block/swedroot_spread", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "down": "true" - }, - "apply": { - "model": "paradise_lost:block/swedroot_spread", - "x": 90, - "uvlock": true - } - }, - { - "when": { - "up": "false", - "north": "false", - "west": "false", - "south": "false", - "east": "false", - "down": "false" - }, - "apply": { - "model": "paradise_lost:block/swedroot_spread", - "x": 90, - "uvlock": true - } - } - ] -} diff --git a/src/main/resources/assets/paradise_lost/models/block/swedroot_spread.json b/src/main/resources/assets/paradise_lost/models/block/swedroot_spread.json deleted file mode 100644 index a90a0a12d..000000000 --- a/src/main/resources/assets/paradise_lost/models/block/swedroot_spread.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "paradise_lost:block/swedroot_spread", - "0": "paradise_lost:block/swedroot_spread" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0.1 - ], - "to": [ - 16, - 16, - 0.1 - ], - "faces": { - "north": { - "uv": [ - 16, - 0, - 0, - 16 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#0" - } - } - } - ] -} diff --git a/src/main/resources/assets/paradise_lost/models/item/swedroot_spread.json b/src/main/resources/assets/paradise_lost/models/item/swedroot_spread.json deleted file mode 100644 index 50bf9499b..000000000 --- a/src/main/resources/assets/paradise_lost/models/item/swedroot_spread.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "paradise_lost:block/swedroot_spread" - } -} diff --git a/src/main/resources/assets/paradise_lost/textures/block/swedroot_spread.png b/src/main/resources/assets/paradise_lost/textures/block/swedroot_spread.png deleted file mode 100644 index 66ce9bf7506e10f84e4e1e8773c50e5d85418b96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 527 zcmV+q0`UEbP)Px$$w@>(R5*=wQ@?B5Kp1^z55g3Z-VhH6%*JL>a0%PPso7XRc`&}+d@=eFx``&xsj}!PGxso(a zrQkCF^y3)KxY(KXoL^YO3TJ_6@TQf;cX9)vCw4MwQ|09`1$zP;J0zyE0Mw~2x%1OU{g zf^gY#C8;0B0D!ys91I+cQgL#6NMEmhTfAA$s99I&Jn;meS?}t0oxOc^@B~+z7J;ki zf@)JCh(hQ>5#Rs(`wfe(fu{>aZl~KNx%at}#3bA+kCmCo1y45`lPsb0BomBli`g38 zdf9SO{Q&@!s|LrzBe()g;6R;$}|ZswwEEK#{?a1TFS8g?{q RXz2g|002ovPDHLkV1mcQ>C*rJ diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/amadrys.json b/src/main/resources/data/paradise_lost/loot_table/blocks/amadrys.json index 0304b45d6..9e967a7f1 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/amadrys.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/amadrys.json @@ -1,75 +1,68 @@ { "type": "minecraft:block", - "pools": [ + "functions": [ { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "paradise_lost:amadrys_bushel" - } - ] - }, + "function": "minecraft:explosion_decay" + } + ], + "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { - "type": "minecraft:item", - "functions": [ + "type": "minecraft:alternatives", + "children": [ { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:binomial_with_bonus_count", - "parameters": { - "extra": 3, - "probability": 0.5714286 - } + "type": "minecraft:item", + "conditions": [ + { + "block": "paradise_lost:amadrys", + "condition": "minecraft:block_state_property", + "properties": { + "age": "7" + } + } + ], + "name": "paradise_lost:amadrys_bushel" + }, + { + "type": "minecraft:item", + "name": "paradise_lost:amadrys_bushel" } - ], - "name": "paradise_lost:amadrys_bushel" + ] } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:amadrys", + "condition": "minecraft:block_state_property", "properties": { "age": "7" } } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", - "conditions": [ + "functions": [ { - "condition": "minecraft:random_chance", - "chance": 0.02 + "enchantment": "minecraft:fortune", + "formula": "minecraft:binomial_with_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "extra": 3, + "probability": 0.5714286 + } } ], "name": "paradise_lost:amadrys_bushel" } ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "paradise_lost:amadrys", - "properties": { - "age": "7" - } - } - ] - } - ], - "functions": [ - { - "function": "minecraft:explosion_decay" + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/ancient_flower.json b/src/main/resources/data/paradise_lost/loot_table/blocks/ancient_flower.json index f5af72ada..bdb10dc1b 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/ancient_flower.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/ancient_flower.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:ancient_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/ataraxia.json b/src/main/resources/data/paradise_lost/loot_table/blocks/ataraxia.json index af9e0eaf7..83d2ecbfb 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/ataraxia.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/ataraxia.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:ataraxia" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_bookshelf.json b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_bookshelf.json index ae72968e4..69c65bc5c 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_bookshelf.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -14,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], @@ -31,8 +32,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", - "count": 3 + "add": false, + "count": 3.0, + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -42,7 +44,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_button.json b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_button.json index ae1f2f90e..3de577d17 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_button.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:aurel_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_door.json b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_door.json index a87a110cd..7f9fedae4 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_door.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:aurel_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "paradise_lost:aurel_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_fence.json b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_fence.json index 2924473a6..586cb35da 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_fence.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:aurel_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_fence_gate.json b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_fence_gate.json index fce403281..ddc5b71ef 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_fence_gate.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:aurel_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_leaf_pile.json b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_leaf_pile.json index 0298d56b0..a24d878dc 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_leaf_pile.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_leaf_pile.json @@ -2,24 +2,22 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "paradise_lost:aurel_leaf_pile" - } - ], "conditions": [ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:aurel_leaf_pile" + } + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_leaves.json b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_leaves.json index 65b5fd93b..12f90ee36 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_leaves.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_leaves.json @@ -16,22 +16,22 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } }, { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ] @@ -74,22 +74,22 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } }, { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ] @@ -131,6 +131,5 @@ ], "rolls": 1.0 } - ], - "random_sequence": "paradise_lost:blocks/aurel_leaves" + ] } \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_log.json b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_log.json index e1684c00c..af71f2411 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_log.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:aurel_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_planks.json b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_planks.json index 5efe433ce..b6e593f00 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_planks.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:aurel_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_pressure_plate.json b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_pressure_plate.json index be15de6ef..b82bbf401 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_pressure_plate.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:aurel_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_sapling.json b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_sapling.json index 9a25ac1d4..c10c7d2c4 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_sapling.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:aurel_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_slab.json b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_slab.json index 7efab43b2..3bcec8fd8 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_slab.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_slab.json @@ -2,24 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:aurel_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], - "count": 2 + "count": 2.0, + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -27,7 +27,8 @@ ], "name": "paradise_lost:aurel_slab" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_stairs.json b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_stairs.json index e2f6f4779..425e4a692 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_stairs.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:aurel_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_trapdoor.json b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_trapdoor.json index 2bdf00710..455e5ed22 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_trapdoor.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:aurel_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_wood.json b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_wood.json new file mode 100644 index 000000000..ae6b2e2ff --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/aurel_wood.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:aurel_wood" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/blackcurrant_bush.json b/src/main/resources/data/paradise_lost/loot_table/blocks/blackcurrant_bush.json index 645cea8d8..855cc2e3c 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/blackcurrant_bush.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/blackcurrant_bush.json @@ -1,82 +1,40 @@ { "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ], "pools": [ { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "name": "paradise_lost:blackcurrant" - } - ], + "bonus_rolls": 0.0, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:blackcurrant_bush", + "condition": "minecraft:block_state_property", "properties": { "age": "3" } } ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 2.0, - "max": 3.0, - "type": "minecraft:uniform" - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ] - }, - { - "rolls": 1.0, "entries": [ { "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:binomial_with_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "extra": 3, + "probability": 0.5714286 + } + } + ], "name": "paradise_lost:blackcurrant" } ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "paradise_lost:blackcurrant_bush", - "properties": { - "age": "2" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ] - } - ], - "functions": [ - { - "function": "minecraft:explosion_decay" + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/bloomed_calcite.json b/src/main/resources/data/paradise_lost/loot_table/blocks/bloomed_calcite.json index a01b71bf8..8ba4988b1 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/bloomed_calcite.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/bloomed_calcite.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:bloomed_calcite" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/blue_cloud.json b/src/main/resources/data/paradise_lost/loot_table/blocks/blue_cloud.json index 5c4905e66..abd74530d 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/blue_cloud.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/blue_cloud.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:blue_cloud" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/brown_sporecap.json b/src/main/resources/data/paradise_lost/loot_table/blocks/brown_sporecap.json index 4064a37fe..5c3090f09 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/brown_sporecap.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/brown_sporecap.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:brown_sporecap" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/bush.json b/src/main/resources/data/paradise_lost/loot_table/blocks/bush.json index f5adaacb2..705e73e43 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/bush.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/bush.json @@ -2,52 +2,22 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + } + ], "entries": [ { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - } - ], - "name": "paradise_lost:bush" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.125 - } - ], - "functions": [ - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 2 - } - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:wheat_seeds" - } - ] + "type": "minecraft:item", + "name": "paradise_lost:bush" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_block.json b/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_block.json index d0264cebd..7f3f8861c 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_block.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_block.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:cherine_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_campfire.json b/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_campfire.json index 6f3f189bd..638d0bde3 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_campfire.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_campfire.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -14,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], @@ -36,16 +37,17 @@ ], "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 2.0, - "add": false + "function": "minecraft:set_count" } ], "name": "minecraft:charcoal" } ] } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_lantern.json b/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_lantern.json index ece06135a..dd6cb3501 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_lantern.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_lantern.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:cherine_lantern" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_ore.json b/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_ore.json index 3a05d3f1c..fddf57dbd 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_ore.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_ore.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -14,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], @@ -31,9 +32,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:apply_bonus", "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" }, { "function": "minecraft:explosion_decay" @@ -43,7 +44,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_torch.json b/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_torch.json index f89334c0a..4be7a72f1 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_torch.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/cherine_torch.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:cherine_torch" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/chiseled_floestone.json b/src/main/resources/data/paradise_lost/loot_table/blocks/chiseled_floestone.json index da5b1ab70..d8737f09b 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/chiseled_floestone.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/chiseled_floestone.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:chiseled_floestone" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/cloudsbluff.json b/src/main/resources/data/paradise_lost/loot_table/blocks/cloudsbluff.json index ba33ed1ab..b02737f15 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/cloudsbluff.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/cloudsbluff.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:cloudsbluff" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/coarse_dirt.json b/src/main/resources/data/paradise_lost/loot_table/blocks/coarse_dirt.json index 76e762699..5595b646b 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/coarse_dirt.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/coarse_dirt.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:coarse_dirt" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/cobbled_floestone.json b/src/main/resources/data/paradise_lost/loot_table/blocks/cobbled_floestone.json index 6bc51bc7f..2c8b3aff2 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/cobbled_floestone.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/cobbled_floestone.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:cobbled_floestone" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/cobbled_floestone_slab.json b/src/main/resources/data/paradise_lost/loot_table/blocks/cobbled_floestone_slab.json index cb380f119..b0daff229 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/cobbled_floestone_slab.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/cobbled_floestone_slab.json @@ -2,24 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:cobbled_floestone_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], - "count": 2 + "count": 2.0, + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -27,7 +27,8 @@ ], "name": "paradise_lost:cobbled_floestone_slab" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/cobbled_floestone_stairs.json b/src/main/resources/data/paradise_lost/loot_table/blocks/cobbled_floestone_stairs.json index 0c408750a..dc7ff3e6f 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/cobbled_floestone_stairs.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/cobbled_floestone_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:cobbled_floestone_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/cobbled_floestone_wall.json b/src/main/resources/data/paradise_lost/loot_table/blocks/cobbled_floestone_wall.json index 800caa65a..3a1aa586d 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/cobbled_floestone_wall.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/cobbled_floestone_wall.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:cobbled_floestone_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/cold_cloud.json b/src/main/resources/data/paradise_lost/loot_table/blocks/cold_cloud.json index 93cab43cf..100618754 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/cold_cloud.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/cold_cloud.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:cold_cloud" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/dirt.json b/src/main/resources/data/paradise_lost/loot_table/blocks/dirt.json index ac849bd13..b6a611de8 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/dirt.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/dirt.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:dirt" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/drigean.json b/src/main/resources/data/paradise_lost/loot_table/blocks/drigean.json index 134daddb4..155f6644d 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/drigean.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/drigean.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:drigean" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/farmland.json b/src/main/resources/data/paradise_lost/loot_table/blocks/farmland.json index ac849bd13..b6a611de8 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/farmland.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/farmland.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:dirt" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/fern.json b/src/main/resources/data/paradise_lost/loot_table/blocks/fern.json index e096cefcf..9488db477 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/fern.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/fern.json @@ -2,52 +2,22 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + } + ], "entries": [ { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - } - ], - "name": "paradise_lost:fern" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.125 - } - ], - "functions": [ - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 2 - } - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:wheat_seeds" - } - ] + "type": "minecraft:item", + "name": "paradise_lost:fern" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/flax.json b/src/main/resources/data/paradise_lost/loot_table/blocks/flax.json index b496ee3f4..77aca8893 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/flax.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/flax.json @@ -1,8 +1,12 @@ { "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ], "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -10,91 +14,57 @@ "children": [ { "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 4.0, - "min": 1.0 - }, - "function": "minecraft:set_count" - } - ], "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:flax", + "condition": "minecraft:block_state_property", "properties": { - "half": "lower", - "age": "7" + "age": "7", + "half": "lower" } } ], - "name": "paradise_lost:flax_thread" + "name": "paradise_lost:flaxseed" }, { "type": "minecraft:item", - "name": "paradise_lost:flaxseed" + "name": "paradise_lost:flax_thread" } ] } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:flax", + "condition": "minecraft:block_state_property", "properties": { - "half": "lower", - "age": "7" + "age": "7", + "half": "lower" } } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "functions": [ { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 3.0, - "min": 0.0 - }, - "function": "minecraft:set_count" - }, - { - "function": "minecraft:apply_bonus", "enchantment": "minecraft:fortune", "formula": "minecraft:binomial_with_bonus_count", + "function": "minecraft:apply_bonus", "parameters": { "extra": 3, "probability": 0.5714286 } } ], - "name": "paradise_lost:flaxseed" + "name": "paradise_lost:flax_thread" } ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "paradise_lost:flax", - "properties": { - "half": "lower", - "age": "7" - } - } - ] - } - ], - "functions": [ - { - "function": "minecraft:explosion_decay" + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/flaxweave_cushion.json b/src/main/resources/data/paradise_lost/loot_table/blocks/flaxweave_cushion.json index 8015d298e..827bbaf8b 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/flaxweave_cushion.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/flaxweave_cushion.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:flaxweave_cushion" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone.json b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone.json index cd55b2216..c517ce3f3 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -14,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], @@ -38,7 +39,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_brick.json b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_brick.json index 9c6a11fb5..a3c38df12 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_brick.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_brick.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:floestone_brick" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_brick_slab.json b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_brick_slab.json index d305e9fae..f45e51134 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_brick_slab.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_brick_slab.json @@ -2,24 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:floestone_brick_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], - "count": 2 + "count": 2.0, + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -27,7 +27,8 @@ ], "name": "paradise_lost:floestone_brick_slab" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_brick_stairs.json b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_brick_stairs.json index 5d5d657ad..1a3d2db75 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_brick_stairs.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_brick_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:floestone_brick_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_brick_wall.json b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_brick_wall.json index 9a9f60a24..f3fd46f7b 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_brick_wall.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_brick_wall.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:floestone_brick_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_button.json b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_button.json index 0a2fae9f5..2756d9df8 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_button.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:floestone_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_pressure_plate.json b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_pressure_plate.json index 0dddfa75c..6e01e40db 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_pressure_plate.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:floestone_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_slab.json b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_slab.json index 139d8e3d0..ef46ea9ae 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_slab.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_slab.json @@ -2,24 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:floestone_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], - "count": 2 + "count": 2.0, + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -27,7 +27,8 @@ ], "name": "paradise_lost:floestone_slab" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_stairs.json b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_stairs.json index f927766c3..111deb251 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_stairs.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:floestone_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_wall.json b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_wall.json index bcf4312ef..db2a1cb1f 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_wall.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/floestone_wall.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:floestone_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/food_bowl.json b/src/main/resources/data/paradise_lost/loot_table/blocks/food_bowl.json new file mode 100644 index 000000000..b5304b4b7 --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/food_bowl.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:food_bowl" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/frost_wisteria_hanger.json b/src/main/resources/data/paradise_lost/loot_table/blocks/frost_wisteria_hanger.json index 766f26df4..1a73a9eea 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/frost_wisteria_hanger.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/frost_wisteria_hanger.json @@ -2,24 +2,22 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "paradise_lost:frost_wisteria_hanger" - } - ], "conditions": [ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:frost_wisteria_hanger" + } + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/frost_wisteria_leaf_pile.json b/src/main/resources/data/paradise_lost/loot_table/blocks/frost_wisteria_leaf_pile.json index 577248e17..fed9ad0ed 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/frost_wisteria_leaf_pile.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/frost_wisteria_leaf_pile.json @@ -2,24 +2,22 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "paradise_lost:frost_wisteria_leaf_pile" - } - ], "conditions": [ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:frost_wisteria_leaf_pile" + } + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/frost_wisteria_leaves.json b/src/main/resources/data/paradise_lost/loot_table/blocks/frost_wisteria_leaves.json index aeebaced6..a8772adef 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/frost_wisteria_leaves.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/frost_wisteria_leaves.json @@ -16,22 +16,22 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } }, { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ] @@ -74,22 +74,22 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } }, { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ] @@ -131,6 +131,5 @@ ], "rolls": 1.0 } - ], - "random_sequence": "paradise_lost:blocks/frost_wisteria_leaves" + ] } \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/frost_wisteria_sapling.json b/src/main/resources/data/paradise_lost/loot_table/blocks/frost_wisteria_sapling.json index aa401d520..2941f8f7c 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/frost_wisteria_sapling.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/frost_wisteria_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:frost_wisteria_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/frozen_grass.json b/src/main/resources/data/paradise_lost/loot_table/blocks/frozen_grass.json index dc05aa423..56cf83efb 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/frozen_grass.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/frozen_grass.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -14,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], @@ -38,7 +39,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/frozen_path.json b/src/main/resources/data/paradise_lost/loot_table/blocks/frozen_path.json index f2fd467ea..8ef3e7044 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/frozen_path.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/frozen_path.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:permafrost" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/golden_amber_tile.json b/src/main/resources/data/paradise_lost/loot_table/blocks/golden_amber_tile.json index f01da65e5..b3d74bf61 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/golden_amber_tile.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/golden_amber_tile.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:golden_amber_tile" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/golden_amber_tile_slab.json b/src/main/resources/data/paradise_lost/loot_table/blocks/golden_amber_tile_slab.json index 9ee042f75..d2776ac74 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/golden_amber_tile_slab.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/golden_amber_tile_slab.json @@ -2,24 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:golden_amber_tile_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], - "count": 2 + "count": 2.0, + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -27,7 +27,8 @@ ], "name": "paradise_lost:golden_amber_tile_slab" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/golden_amber_tile_stairs.json b/src/main/resources/data/paradise_lost/loot_table/blocks/golden_amber_tile_stairs.json index 88912dfad..88fc8cefd 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/golden_amber_tile_stairs.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/golden_amber_tile_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:golden_amber_tile_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/golden_cloud.json b/src/main/resources/data/paradise_lost/loot_table/blocks/golden_cloud.json index 7c0c4f4a8..fd09665f3 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/golden_cloud.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/golden_cloud.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:golden_cloud" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/golden_mossy_floestone.json b/src/main/resources/data/paradise_lost/loot_table/blocks/golden_mossy_floestone.json index e63371add..7f7ed3a4b 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/golden_mossy_floestone.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/golden_mossy_floestone.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:golden_mossy_floestone" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/grass_flowering.json b/src/main/resources/data/paradise_lost/loot_table/blocks/grass_flowering.json index 6ed5190a0..210d55b28 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/grass_flowering.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/grass_flowering.json @@ -2,52 +2,22 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + } + ], "entries": [ { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - } - ], - "name": "paradise_lost:grass_flowering" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.125 - } - ], - "functions": [ - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 2 - } - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:wheat_seeds" - } - ] + "type": "minecraft:item", + "name": "paradise_lost:grass_flowering" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/grass_path.json b/src/main/resources/data/paradise_lost/loot_table/blocks/grass_path.json index ac849bd13..b6a611de8 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/grass_path.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/grass_path.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:dirt" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/grass_plant.json b/src/main/resources/data/paradise_lost/loot_table/blocks/grass_plant.json index 292f83a22..8e991ae77 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/grass_plant.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/grass_plant.json @@ -2,52 +2,22 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + } + ], "entries": [ { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - } - ], - "name": "paradise_lost:grass_plant" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.125 - } - ], - "functions": [ - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 2 - } - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:wheat_seeds" - } - ] + "type": "minecraft:item", + "name": "paradise_lost:grass_plant" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/heliolith.json b/src/main/resources/data/paradise_lost/loot_table/blocks/heliolith.json index d36895ab7..8af2fc1a3 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/heliolith.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/heliolith.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:heliolith" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/heliolith_slab.json b/src/main/resources/data/paradise_lost/loot_table/blocks/heliolith_slab.json index c9494fba6..55302b6e2 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/heliolith_slab.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/heliolith_slab.json @@ -2,24 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:heliolith_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], - "count": 2 + "count": 2.0, + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -27,7 +27,8 @@ ], "name": "paradise_lost:heliolith_slab" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/heliolith_stairs.json b/src/main/resources/data/paradise_lost/loot_table/blocks/heliolith_stairs.json index 5f42b31e9..a55a63441 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/heliolith_stairs.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/heliolith_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:heliolith_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/heliolith_wall.json b/src/main/resources/data/paradise_lost/loot_table/blocks/heliolith_wall.json index b760c20ad..36ebc5335 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/heliolith_wall.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/heliolith_wall.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:heliolith_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/highlands_grass.json b/src/main/resources/data/paradise_lost/loot_table/blocks/highlands_grass.json index 9fae40a01..42a94bd10 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/highlands_grass.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/highlands_grass.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -14,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], @@ -38,7 +39,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/honey_nettle.json b/src/main/resources/data/paradise_lost/loot_table/blocks/honey_nettle.json index 837704d8d..6943b6a67 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/honey_nettle.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/honey_nettle.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -14,9 +13,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } } ], @@ -24,19 +21,23 @@ }, { "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.66 - } - ], "functions": [ { - "function": "minecraft:apply_bonus", + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + }, + { "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", + "formula": "minecraft:binomial_with_bonus_count", + "function": "minecraft:apply_bonus", "parameters": { - "bonusMultiplier": 2 + "extra": 3, + "probability": 0.5714286 } }, { @@ -47,7 +48,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/incubator.json b/src/main/resources/data/paradise_lost/loot_table/blocks/incubator.json new file mode 100644 index 000000000..b4da0b7eb --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/incubator.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:incubator" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/lavender_wisteria_hanger.json b/src/main/resources/data/paradise_lost/loot_table/blocks/lavender_wisteria_hanger.json index 13bce0813..523832298 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/lavender_wisteria_hanger.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/lavender_wisteria_hanger.json @@ -2,24 +2,22 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "paradise_lost:lavender_wisteria_hanger" - } - ], "conditions": [ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:lavender_wisteria_hanger" + } + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/lavender_wisteria_leaf_pile.json b/src/main/resources/data/paradise_lost/loot_table/blocks/lavender_wisteria_leaf_pile.json index 641959ea3..2aeb2f1e4 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/lavender_wisteria_leaf_pile.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/lavender_wisteria_leaf_pile.json @@ -2,24 +2,22 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "paradise_lost:lavender_wisteria_leaf_pile" - } - ], "conditions": [ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:lavender_wisteria_leaf_pile" + } + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/lavender_wisteria_leaves.json b/src/main/resources/data/paradise_lost/loot_table/blocks/lavender_wisteria_leaves.json index 79427a372..425030f85 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/lavender_wisteria_leaves.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/lavender_wisteria_leaves.json @@ -16,22 +16,22 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } }, { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ] @@ -74,22 +74,22 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } }, { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ] @@ -131,6 +131,5 @@ ], "rolls": 1.0 } - ], - "random_sequence": "paradise_lost:blocks/lavender_wisteria_leaves" + ] } \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/lavender_wisteria_sapling.json b/src/main/resources/data/paradise_lost/loot_table/blocks/lavender_wisteria_sapling.json index 74d0a7e77..5826c17ba 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/lavender_wisteria_sapling.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/lavender_wisteria_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:lavender_wisteria_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/levita.json b/src/main/resources/data/paradise_lost/loot_table/blocks/levita.json index 9c96353c9..ae75ad400 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/levita.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/levita.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:levita" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/levita_brick.json b/src/main/resources/data/paradise_lost/loot_table/blocks/levita_brick.json index 4ca8ebeab..0fe89bc8a 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/levita_brick.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/levita_brick.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:levita_brick" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/levita_brick_slab.json b/src/main/resources/data/paradise_lost/loot_table/blocks/levita_brick_slab.json index 0602b0b3f..a1633bab7 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/levita_brick_slab.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/levita_brick_slab.json @@ -2,24 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:levita_brick_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], - "count": 2 + "count": 2.0, + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -27,7 +27,8 @@ ], "name": "paradise_lost:levita_brick_slab" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/levita_brick_stairs.json b/src/main/resources/data/paradise_lost/loot_table/blocks/levita_brick_stairs.json index 25b63bfa3..b624fd95c 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/levita_brick_stairs.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/levita_brick_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:levita_brick_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/levita_ore.json b/src/main/resources/data/paradise_lost/loot_table/blocks/levita_ore.json index 0c900f68a..1d0e2c666 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/levita_ore.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/levita_ore.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -14,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], @@ -31,9 +32,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:apply_bonus", "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" }, { "function": "minecraft:explosion_decay" @@ -43,7 +44,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/levitator.json b/src/main/resources/data/paradise_lost/loot_table/blocks/levitator.json index 82f8053ac..0caa97c67 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/levitator.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/levitator.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:levitator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/liverwort.json b/src/main/resources/data/paradise_lost/loot_table/blocks/liverwort.json index 5564b19c5..805f84b6f 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/liverwort.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/liverwort.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:liverwort" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/liverwort_carpet.json b/src/main/resources/data/paradise_lost/loot_table/blocks/liverwort_carpet.json index e5d2a41c8..50c358684 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/liverwort_carpet.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/liverwort_carpet.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:liverwort_carpet" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/luminar.json b/src/main/resources/data/paradise_lost/loot_table/blocks/luminar.json index 629669311..98e79f7e7 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/luminar.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/luminar.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:luminar" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/malt_sprig.json b/src/main/resources/data/paradise_lost/loot_table/blocks/malt_sprig.json index 02017f63d..df7881854 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/malt_sprig.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/malt_sprig.json @@ -2,24 +2,22 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "paradise_lost:malt_sprig" - } - ], "conditions": [ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:malt_sprig" + } + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/metamorphic_shell.json b/src/main/resources/data/paradise_lost/loot_table/blocks/metamorphic_shell.json index 6ad2ce496..aeaaf115a 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/metamorphic_shell.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/metamorphic_shell.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:metamorphic_shell" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mossy_floestone.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mossy_floestone.json index 4d4998581..6545e9b8e 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mossy_floestone.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mossy_floestone.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:mossy_floestone" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mossy_floestone_slab.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mossy_floestone_slab.json index 0486f424e..f3432a0e5 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mossy_floestone_slab.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mossy_floestone_slab.json @@ -2,24 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:mossy_floestone_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], - "count": 2 + "count": 2.0, + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -27,7 +27,8 @@ ], "name": "paradise_lost:mossy_floestone_slab" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mossy_floestone_stairs.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mossy_floestone_stairs.json index 8ae0f3d29..5aafe37d4 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mossy_floestone_stairs.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mossy_floestone_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:mossy_floestone_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mossy_floestone_wall.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mossy_floestone_wall.json index 8d648b8da..7c5377510 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mossy_floestone_wall.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mossy_floestone_wall.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:mossy_floestone_wall" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_button.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_button.json index 840bbbe41..b48e15574 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_button.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:mother_aurel_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_door.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_door.json index 8bd84764f..2360f2ef5 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_door.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:mother_aurel_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "paradise_lost:mother_aurel_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_fence.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_fence.json index e894851a2..ab268d49d 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_fence.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:mother_aurel_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_fence_gate.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_fence_gate.json index 4deea0305..426af3659 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_fence_gate.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:mother_aurel_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_leaves.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_leaves.json index ed761948d..ae835a4e7 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_leaves.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_leaves.json @@ -16,22 +16,22 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } }, { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ] @@ -74,22 +74,22 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } }, { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ] @@ -131,6 +131,5 @@ ], "rolls": 1.0 } - ], - "random_sequence": "paradise_lost:blocks/mother_aurel_leaves" + ] } \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_log.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_log.json index c2fdcff02..7338b7306 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_log.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:mother_aurel_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_planks.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_planks.json index ae694da14..6dfd4a8a3 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_planks.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:mother_aurel_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_pressure_plate.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_pressure_plate.json index 29dc811e4..2353b6627 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_pressure_plate.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:mother_aurel_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_sapling.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_sapling.json index 327975a0b..871d51f58 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_sapling.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:mother_aurel_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_slab.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_slab.json index 95c79ad39..13b8b1bf3 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_slab.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_slab.json @@ -2,24 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:mother_aurel_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], - "count": 2 + "count": 2.0, + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -27,7 +27,8 @@ ], "name": "paradise_lost:mother_aurel_slab" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_stairs.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_stairs.json index 9b2e7cdff..28dff2138 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_stairs.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:mother_aurel_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_trapdoor.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_trapdoor.json index 855e62b79..387e7cc8e 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_trapdoor.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:mother_aurel_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_wood.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_wood.json new file mode 100644 index 000000000..06dddcbf9 --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mother_aurel_wood.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:mother_aurel_wood" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mottled_aurel_fallen_log.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mottled_aurel_fallen_log.json index 0e9529a13..fc458d754 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mottled_aurel_fallen_log.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mottled_aurel_fallen_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:mottled_aurel_fallen_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/mottled_aurel_log.json b/src/main/resources/data/paradise_lost/loot_table/blocks/mottled_aurel_log.json index f4adeadd0..bc7916161 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/mottled_aurel_log.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/mottled_aurel_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:mottled_aurel_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/nitra.json b/src/main/resources/data/paradise_lost/loot_table/blocks/nitra.json index aa56d011f..fe39289d6 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/nitra.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/nitra.json @@ -1,64 +1,68 @@ { "type": "minecraft:block", - "pools": [ + "functions": [ { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "paradise_lost:nitra" - } - ] - }, + "function": "minecraft:explosion_decay" + } + ], + "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { - "type": "minecraft:item", - "conditions": [ + "type": "minecraft:alternatives", + "children": [ { - "condition": "minecraft:random_chance", - "chance": 0.25 + "type": "minecraft:item", + "conditions": [ + { + "block": "paradise_lost:nitra", + "condition": "minecraft:block_state_property", + "properties": { + "age": "7" + } + } + ], + "name": "paradise_lost:nitra_bulb" + }, + { + "type": "minecraft:item", + "name": "paradise_lost:nitra" } - ], - "name": "paradise_lost:nitra" + ] } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:nitra", + "condition": "minecraft:block_state_property", "properties": { "age": "7" } } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", - "name": "paradise_lost:nitra_bulb" + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:binomial_with_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "extra": 3, + "probability": 0.5714286 + } + } + ], + "name": "paradise_lost:nitra" } ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "paradise_lost:nitra", - "properties": { - "age": "7" - } - } - ] - } - ], - "functions": [ - { - "function": "minecraft:explosion_decay" + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/nitra_bunch.json b/src/main/resources/data/paradise_lost/loot_table/blocks/nitra_bunch.json index 4c07b21a9..8516f75af 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/nitra_bunch.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/nitra_bunch.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:nitra_bunch" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/olvite_block.json b/src/main/resources/data/paradise_lost/loot_table/blocks/olvite_block.json index b4f4ac70f..3663c6474 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/olvite_block.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/olvite_block.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:olvite_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/olvite_chain.json b/src/main/resources/data/paradise_lost/loot_table/blocks/olvite_chain.json index 81f46e6d1..9df40783d 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/olvite_chain.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/olvite_chain.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:olvite_chain" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/olvite_ore.json b/src/main/resources/data/paradise_lost/loot_table/blocks/olvite_ore.json index 13405f07c..d9bf6a482 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/olvite_ore.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/olvite_ore.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -14,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], @@ -31,9 +32,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:apply_bonus", "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" }, { "function": "minecraft:explosion_decay" @@ -43,7 +44,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_button.json b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_button.json index de2eaf559..ab5f62068 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_button.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:orange_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_door.json b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_door.json index 04c6722aa..91b03dd0a 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_door.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:orange_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "paradise_lost:orange_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_fence.json b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_fence.json index 8e76c9e6e..c68090af0 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_fence.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:orange_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_fence_gate.json b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_fence_gate.json index 8be57b704..5f44d1e87 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_fence_gate.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:orange_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_leaves.json b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_leaves.json index 36e2d4a3d..87bdd5f26 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_leaves.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_leaves.json @@ -16,22 +16,22 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } }, { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ] @@ -74,22 +74,22 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } }, { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ] @@ -131,6 +131,5 @@ ], "rolls": 1.0 } - ], - "random_sequence": "paradise_lost:blocks/orange_leaves" + ] } \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_log.json b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_log.json index 9260c5c5e..56e0d4b7f 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_log.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:orange_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_planks.json b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_planks.json index 8607b586e..43c0b48f7 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_planks.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:orange_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_pressure_plate.json b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_pressure_plate.json index 1a008651a..b2e69d6e0 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_pressure_plate.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:orange_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_sapling.json b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_sapling.json index 28270ea2f..dc6f9e88a 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_sapling.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:orange_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_slab.json b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_slab.json index a5040c029..a0ac3ff2d 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_slab.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_slab.json @@ -2,24 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:orange_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], - "count": 2 + "count": 2.0, + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -27,7 +27,8 @@ ], "name": "paradise_lost:orange_slab" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_stairs.json b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_stairs.json index 6ec79aa79..c7b1ffab7 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_stairs.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:orange_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_trapdoor.json b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_trapdoor.json index db0f7d5e5..27d01114c 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_trapdoor.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:orange_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/orange_wood.json b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_wood.json new file mode 100644 index 000000000..215bac4f0 --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/orange_wood.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:orange_wood" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/packed_swedroot.json b/src/main/resources/data/paradise_lost/loot_table/blocks/packed_swedroot.json index d5d4e364e..04c4e2c97 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/packed_swedroot.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/packed_swedroot.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:packed_swedroot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/permafrost.json b/src/main/resources/data/paradise_lost/loot_table/blocks/permafrost.json index f2fd467ea..8ef3e7044 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/permafrost.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/permafrost.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:permafrost" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/pink_sporecap.json b/src/main/resources/data/paradise_lost/loot_table/blocks/pink_sporecap.json index 6f0e5af89..234e07024 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/pink_sporecap.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/pink_sporecap.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:pink_sporecap" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/potted_ancient_flower.json b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_ancient_flower.json new file mode 100644 index 000000000..801758d78 --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_ancient_flower.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:ancient_flower" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/potted_ataraxia.json b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_ataraxia.json new file mode 100644 index 000000000..a1475fa71 --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_ataraxia.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:ataraxia" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/potted_aurel_sapling.json b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_aurel_sapling.json index 4ada7cc5f..3e5a10e37 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/potted_aurel_sapling.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_aurel_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:aurel_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/potted_cloudsbluff.json b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_cloudsbluff.json new file mode 100644 index 000000000..237c05dba --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_cloudsbluff.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:cloudsbluff" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/potted_drigean.json b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_drigean.json new file mode 100644 index 000000000..b6e9407eb --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_drigean.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:drigean" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/potted_frost_wisteria_sapling.json b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_frost_wisteria_sapling.json index 3da0f94ba..c1f2b1a56 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/potted_frost_wisteria_sapling.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_frost_wisteria_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:frost_wisteria_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/potted_lavender_wisteria_sapling.json b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_lavender_wisteria_sapling.json index accb53367..3e9a70538 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/potted_lavender_wisteria_sapling.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_lavender_wisteria_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:lavender_wisteria_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/potted_luminar.json b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_luminar.json new file mode 100644 index 000000000..f3e7430e2 --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_luminar.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:luminar" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/potted_mother_aurel_sapling.json b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_mother_aurel_sapling.json index 77da3215e..6b56ea38c 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/potted_mother_aurel_sapling.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_mother_aurel_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:mother_aurel_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/potted_orange_sapling.json b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_orange_sapling.json new file mode 100644 index 000000000..476beaf90 --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_orange_sapling.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:orange_sapling" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/potted_rose_wisteria_sapling.json b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_rose_wisteria_sapling.json index 4e3b4fedf..c41ae2ee9 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/potted_rose_wisteria_sapling.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/potted_rose_wisteria_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:rose_wisteria_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/refined_surtrum_block.json b/src/main/resources/data/paradise_lost/loot_table/blocks/refined_surtrum_block.json index 38c92184d..5f9a60f72 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/refined_surtrum_block.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/refined_surtrum_block.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:refined_surtrum_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/rootcap.json b/src/main/resources/data/paradise_lost/loot_table/blocks/rootcap.json index 746a12225..d860cb563 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/rootcap.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/rootcap.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:rootcap" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/rose_wisteria_hanger.json b/src/main/resources/data/paradise_lost/loot_table/blocks/rose_wisteria_hanger.json index 1aed269e8..db06994f6 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/rose_wisteria_hanger.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/rose_wisteria_hanger.json @@ -2,24 +2,22 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "paradise_lost:rose_wisteria_hanger" - } - ], "conditions": [ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:rose_wisteria_hanger" + } + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/rose_wisteria_leaf_pile.json b/src/main/resources/data/paradise_lost/loot_table/blocks/rose_wisteria_leaf_pile.json index 64340a433..315e40ec0 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/rose_wisteria_leaf_pile.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/rose_wisteria_leaf_pile.json @@ -2,24 +2,22 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "paradise_lost:rose_wisteria_leaf_pile" - } - ], "conditions": [ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:rose_wisteria_leaf_pile" + } + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/rose_wisteria_leaves.json b/src/main/resources/data/paradise_lost/loot_table/blocks/rose_wisteria_leaves.json index 013862ff1..cb008d377 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/rose_wisteria_leaves.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/rose_wisteria_leaves.json @@ -16,22 +16,22 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } }, { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ] @@ -74,22 +74,22 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } }, { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ] @@ -131,6 +131,5 @@ ], "rolls": 1.0 } - ], - "random_sequence": "paradise_lost:blocks/rose_wisteria_leaves" + ] } \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/rose_wisteria_sapling.json b/src/main/resources/data/paradise_lost/loot_table/blocks/rose_wisteria_sapling.json index 0a54fcc1c..0df4a47b8 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/rose_wisteria_sapling.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/rose_wisteria_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:rose_wisteria_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/shamrock.json b/src/main/resources/data/paradise_lost/loot_table/blocks/shamrock.json index 365162c63..407f4be4d 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/shamrock.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/shamrock.json @@ -2,52 +2,22 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + } + ], "entries": [ { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - } - ], - "name": "paradise_lost:shamrock" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.125 - } - ], - "functions": [ - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 2 - } - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:wheat_seeds" - } - ] + "type": "minecraft:item", + "name": "paradise_lost:shamrock" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/short_grass.json b/src/main/resources/data/paradise_lost/loot_table/blocks/short_grass.json new file mode 100644 index 000000000..b469ae8f3 --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/short_grass.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:short_grass" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/smooth_heliolith.json b/src/main/resources/data/paradise_lost/loot_table/blocks/smooth_heliolith.json index 80f737f2e..d8a0e5052 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/smooth_heliolith.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/smooth_heliolith.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:smooth_heliolith" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/smooth_heliolith_slab.json b/src/main/resources/data/paradise_lost/loot_table/blocks/smooth_heliolith_slab.json index 813b17fd1..b3b63063f 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/smooth_heliolith_slab.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/smooth_heliolith_slab.json @@ -2,24 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:smooth_heliolith_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], - "count": 2 + "count": 2.0, + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -27,7 +27,8 @@ ], "name": "paradise_lost:smooth_heliolith_slab" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/smooth_heliolith_stairs.json b/src/main/resources/data/paradise_lost/loot_table/blocks/smooth_heliolith_stairs.json index 59828e6df..eebfc54ce 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/smooth_heliolith_stairs.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/smooth_heliolith_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:smooth_heliolith_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_aurel_log.json b/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_aurel_log.json index 2823bc293..e53637422 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_aurel_log.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_aurel_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:stripped_aurel_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_aurel_wood.json b/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_aurel_wood.json new file mode 100644 index 000000000..ded95f6b0 --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_aurel_wood.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:stripped_aurel_wood" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_mother_aurel_log.json b/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_mother_aurel_log.json index 3048867a5..3e83c4d1a 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_mother_aurel_log.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_mother_aurel_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:stripped_mother_aurel_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_mother_aurel_wood.json b/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_mother_aurel_wood.json new file mode 100644 index 000000000..6237e22d5 --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_mother_aurel_wood.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:stripped_mother_aurel_wood" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_orange_log.json b/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_orange_log.json index 41c27708a..687b00272 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_orange_log.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_orange_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:stripped_orange_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_orange_wood.json b/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_orange_wood.json new file mode 100644 index 000000000..944e3e2d7 --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_orange_wood.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:stripped_orange_wood" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_wisteria_log.json b/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_wisteria_log.json index 762a084ec..21d999a44 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_wisteria_log.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_wisteria_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:stripped_wisteria_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_wisteria_wood.json b/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_wisteria_wood.json new file mode 100644 index 000000000..67ed8b6b9 --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/stripped_wisteria_wood.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:stripped_wisteria_wood" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/surtrum.json b/src/main/resources/data/paradise_lost/loot_table/blocks/surtrum.json index 0b0b3f6a0..d9f1e049f 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/surtrum.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/surtrum.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -14,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], @@ -31,9 +32,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:apply_bonus", "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" }, { "function": "minecraft:explosion_decay" @@ -43,7 +44,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/swedroot.json b/src/main/resources/data/paradise_lost/loot_table/blocks/swedroot.json index 743426646..e2afe5916 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/swedroot.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/swedroot.json @@ -1,29 +1,60 @@ { "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ], "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { - "type": "minecraft:item", - "name": "paradise_lost:swedroot" + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "paradise_lost:swedroot", + "condition": "minecraft:block_state_property", + "properties": { + "age": "7" + } + } + ], + "name": "paradise_lost:swedroot" + }, + { + "type": "minecraft:item", + "name": "paradise_lost:swedroot" + } + ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "block": "paradise_lost:swedroot", + "condition": "minecraft:block_state_property", + "properties": { + "age": "7" + } + } + ], "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:apply_bonus", "enchantment": "minecraft:fortune", "formula": "minecraft:binomial_with_bonus_count", + "function": "minecraft:apply_bonus", "parameters": { - "extra": 2, + "extra": 3, "probability": 0.5714286 } } @@ -31,20 +62,7 @@ "name": "paradise_lost:swedroot" } ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "paradise_lost:swedroot", - "properties": { - "age": "7" - } - } - ] - } - ], - "functions": [ - { - "function": "minecraft:explosion_decay" + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/tall_grass.json b/src/main/resources/data/paradise_lost/loot_table/blocks/tall_grass.json index 028f72091..dc850900b 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/tall_grass.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/tall_grass.json @@ -2,140 +2,96 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 2.0, - "add": false - } - ], - "name": "paradise_lost:grass_plant" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:random_chance", - "chance": 0.125 - } - ], - "name": "minecraft:wheat_seeds" - } - ] - } - ], "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:tall_grass", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } }, { "condition": "minecraft:location_check", + "offsetY": 1, "predicate": { "block": { - "blocks": [ - "paradise_lost:tall_grass" - ], + "blocks": "paradise_lost:tall_grass", "state": { "half": "upper" } } - }, - "offsetY": 1 + } } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { - "type": "minecraft:alternatives", - "children": [ + "type": "minecraft:item", + "conditions": [ { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 2.0, - "add": false - } - ], - "name": "paradise_lost:grass_plant" - }, + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + } + ], + "functions": [ { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:random_chance", - "chance": 0.125 - } - ], - "name": "minecraft:wheat_seeds" + "add": false, + "count": 2.0, + "function": "minecraft:set_count" } - ] + ], + "name": "paradise_lost:grass_plant" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:tall_grass", + "condition": "minecraft:block_state_property", "properties": { "half": "upper" } }, { "condition": "minecraft:location_check", + "offsetY": -1, "predicate": { "block": { - "blocks": [ - "paradise_lost:tall_grass" - ], + "blocks": "paradise_lost:tall_grass", "state": { "half": "lower" } } - }, - "offsetY": -1 + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + } + ], + "functions": [ + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "paradise_lost:grass_plant" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/tree_tap.json b/src/main/resources/data/paradise_lost/loot_table/blocks/tree_tap.json index 5d560df11..8eb4e4e04 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/tree_tap.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/tree_tap.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:tree_tap" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/wild_flax.json b/src/main/resources/data/paradise_lost/loot_table/blocks/wild_flax.json index a7bd5d483..3087c2987 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/wild_flax.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/wild_flax.json @@ -1,58 +1,70 @@ { + "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ], "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "paradise_lost:flax_thread", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3 - } - } - ], "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:wild_flax", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } } - ] + ], + "name": "paradise_lost:flax_thread" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 3.0, + "min": 1.0 + }, + "function": "minecraft:set_count" } - ] + ], + "rolls": 1.0 }, { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "block": "paradise_lost:wild_flax", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], "entries": [ { "type": "minecraft:item", - "name": "paradise_lost:flaxseed", "functions": [ { - "function": "minecraft:set_count", - "count": { - "min": 0, - "max": 2 + "enchantment": "minecraft:fortune", + "formula": "minecraft:binomial_with_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "extra": 3, + "probability": 0.5714286 } } ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "paradise_lost:wild_flax", - "properties": { - "half": "lower" - } - } - ] + "name": "paradise_lost:flaxseed" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_button.json b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_button.json index e5b55da9c..d066a3e50 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_button.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:wisteria_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_door.json b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_door.json index 2af9dea19..de113b52c 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_door.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:wisteria_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "paradise_lost:wisteria_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_fence.json b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_fence.json index c666eba32..1a4320370 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_fence.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:wisteria_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_fence_gate.json b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_fence_gate.json index 726862da7..c4619594f 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_fence_gate.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:wisteria_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_log.json b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_log.json index 3a5620250..eb14e94b0 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_log.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:wisteria_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_planks.json b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_planks.json index 3c837b21f..51f922c28 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_planks.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:wisteria_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_pressure_plate.json b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_pressure_plate.json index 37347db20..d61ef0a2d 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_pressure_plate.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:wisteria_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_slab.json b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_slab.json index 02ead8586..2d4a448e2 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_slab.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_slab.json @@ -2,24 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "paradise_lost:wisteria_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], - "count": 2 + "count": 2.0, + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -27,7 +27,8 @@ ], "name": "paradise_lost:wisteria_slab" } - ] + ], + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_stairs.json b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_stairs.json index a7a81348f..71266d03d 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_stairs.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:wisteria_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_trapdoor.json b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_trapdoor.json index b1b899886..645cfc2ec 100644 --- a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_trapdoor.json +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "paradise_lost:wisteria_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_wood.json b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_wood.json new file mode 100644 index 000000000..92b12e6fb --- /dev/null +++ b/src/main/resources/data/paradise_lost/loot_table/blocks/wisteria_wood.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "paradise_lost:wisteria_wood" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/tags/block/mineable_by_axe.json b/src/main/resources/data/paradise_lost/tags/block/mineable_by_axe.json index a8014f4bc..58d53e37b 100644 --- a/src/main/resources/data/paradise_lost/tags/block/mineable_by_axe.json +++ b/src/main/resources/data/paradise_lost/tags/block/mineable_by_axe.json @@ -4,7 +4,6 @@ "paradise_lost:aurel_bookshelf", "paradise_lost:food_bowl", "paradise_lost:packed_swedroot", - "paradise_lost:swedroot_spread", "#paradise_lost:leaf_piles", "#paradise_lost:bushes", "#paradise_lost:hangers", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b0108f4c3..a08a1eb0c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -48,6 +48,9 @@ ], "mm:early_risers": [ "net.id.paradiselost.mixin.earlyrisers.CustomBoatEarlyRiser" + ], + "fabric-datagen": [ + "net.id.paradiselost.datagen.ParadiseLostDataGen" ] }, "custom": {