Fix compacting drawers not retaining items when broken

MattiDragon · Jul 10, 2024 · 7ef1141 · 7ef1141
1 parent 515b62b
commit 7ef1141
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/changelog/3.0.2+1.21.md b/changelog/3.0.2+1.21.md
@@ -0,0 +1 @@
+* Fixed compacting drawers not retaining items when broken
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/...ain/java/io/github/mattidragon/extendeddrawers/datagen/DrawersBlockLootTableProvider.java b/...ain/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)))));
     }
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* Fixed compacting drawers not retaining items when broken