From 7ef1141f7acd57342b596d6bac7df29e530b0d95 Mon Sep 17 00:00:00 2001 From: MattiDragon Date: Wed, 10 Jul 2024 20:20:04 +0300 Subject: [PATCH] Fix compacting drawers not retaining items when broken --- changelog/3.0.2+1.21.md | 1 + gradle.properties | 2 +- .../extended_drawers/loot_table/blocks/compacting_drawer.json | 3 ++- .../data/extended_drawers/loot_table/blocks/double_drawer.json | 3 ++- .../data/extended_drawers/loot_table/blocks/quad_drawer.json | 3 ++- .../data/extended_drawers/loot_table/blocks/single_drawer.json | 3 ++- .../extendeddrawers/datagen/DrawersBlockLootTableProvider.java | 3 ++- 7 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 changelog/3.0.2+1.21.md diff --git a/changelog/3.0.2+1.21.md b/changelog/3.0.2+1.21.md new file mode 100644 index 0000000..6a91648 --- /dev/null +++ b/changelog/3.0.2+1.21.md @@ -0,0 +1 @@ +* Fixed compacting drawers not retaining items when broken \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 964174e..6007e05 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ minecraft_version=1.21 yarn_mappings=1.21+build.2 loader_version=0.15.11 -mod_version=3.0.1 +mod_version=3.0.2 maven_group=io.github.mattidragon archives_base_name=ExtendedDrawers diff --git a/src/main/generated/data/extended_drawers/loot_table/blocks/compacting_drawer.json b/src/main/generated/data/extended_drawers/loot_table/blocks/compacting_drawer.json index 969f9e1..3fad48c 100644 --- a/src/main/generated/data/extended_drawers/loot_table/blocks/compacting_drawer.json +++ b/src/main/generated/data/extended_drawers/loot_table/blocks/compacting_drawer.json @@ -15,7 +15,8 @@ { "function": "minecraft:copy_components", "include": [ - "extended_drawers:drawer_contents" + "extended_drawers:drawer_contents", + "extended_drawers:compacting_drawer_contents" ], "source": "block_entity" } diff --git a/src/main/generated/data/extended_drawers/loot_table/blocks/double_drawer.json b/src/main/generated/data/extended_drawers/loot_table/blocks/double_drawer.json index 25a912c..fe1c225 100644 --- a/src/main/generated/data/extended_drawers/loot_table/blocks/double_drawer.json +++ b/src/main/generated/data/extended_drawers/loot_table/blocks/double_drawer.json @@ -15,7 +15,8 @@ { "function": "minecraft:copy_components", "include": [ - "extended_drawers:drawer_contents" + "extended_drawers:drawer_contents", + "extended_drawers:compacting_drawer_contents" ], "source": "block_entity" } diff --git a/src/main/generated/data/extended_drawers/loot_table/blocks/quad_drawer.json b/src/main/generated/data/extended_drawers/loot_table/blocks/quad_drawer.json index ecb1944..a1ef494 100644 --- a/src/main/generated/data/extended_drawers/loot_table/blocks/quad_drawer.json +++ b/src/main/generated/data/extended_drawers/loot_table/blocks/quad_drawer.json @@ -15,7 +15,8 @@ { "function": "minecraft:copy_components", "include": [ - "extended_drawers:drawer_contents" + "extended_drawers:drawer_contents", + "extended_drawers:compacting_drawer_contents" ], "source": "block_entity" } diff --git a/src/main/generated/data/extended_drawers/loot_table/blocks/single_drawer.json b/src/main/generated/data/extended_drawers/loot_table/blocks/single_drawer.json index 1b1c46c..7a557ba 100644 --- a/src/main/generated/data/extended_drawers/loot_table/blocks/single_drawer.json +++ b/src/main/generated/data/extended_drawers/loot_table/blocks/single_drawer.json @@ -15,7 +15,8 @@ { "function": "minecraft:copy_components", "include": [ - "extended_drawers:drawer_contents" + "extended_drawers:drawer_contents", + "extended_drawers:compacting_drawer_contents" ], "source": "block_entity" } diff --git a/src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersBlockLootTableProvider.java b/src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersBlockLootTableProvider.java index 2df7b53..79383dd 100644 --- a/src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersBlockLootTableProvider.java +++ b/src/main/java/io/github/mattidragon/extendeddrawers/datagen/DrawersBlockLootTableProvider.java @@ -34,6 +34,7 @@ private LootTable.Builder drawerDrops(Block drop) { return LootTable.builder().pool(addSurvivesExplosionCondition(drop, LootPool.builder().rolls(ConstantLootNumberProvider.create(1.0f)) .with(ItemEntry.builder(drop) .apply(CopyComponentsLootFunction.builder(CopyComponentsLootFunction.Source.BLOCK_ENTITY) - .include(ModDataComponents.DRAWER_CONTENTS))))); + .include(ModDataComponents.DRAWER_CONTENTS) + .include(ModDataComponents.COMPACTING_DRAWER_CONTENTS))))); } }