Bedrock dropping fixed.

Mixin for AbstractBlockMixin fixed.

src/main/generated/.cache/042b4fa789f2d02b21b174eafe0698eede724a83

@@ -1,7 +1,7 @@
-// 1.20.2 2023-11-13T12:26:36.8772711 All That Matters/Tags for minecraft:block
+// 1.20.2 2023-11-13T14:28:54.8288755 All That Matters/Tags for minecraft:block
 8a23702b05296c8af5014d6aa6e9265ded85c7d9 data\fabric\tags\blocks\needs_tool_level_5.json
-835b5cd90e05c0d16c190bd3ed2137fd21364283 data\minecraft\tags\blocks\mineable\pickaxe.json
 1d31e2156524120781d25e2046706c128e9e445e data\minecraft\tags\blocks\needs_iron_tool.json
+835b5cd90e05c0d16c190bd3ed2137fd21364283 data\minecraft\tags\blocks\mineable\pickaxe.json
 182f82d63057c1d8a902c82a6dd797e151f1726d data\c\tags\blocks\gem_blocks.json
 ba0f74f82201d749a0a5befb22034c5902d89557 data\minecraft\tags\blocks\needs_stone_tool.json
 09a2ae92540badc81ac57242964ad153ba18d077 data\minecraft\tags\blocks\needs_diamond_tool.json

src/main/generated/.cache/3f1b16494788c9d2beceba5ae33b9c469dd522b5

@@ -1,4 +1,4 @@
-// 1.20.2 2023-11-13T12:26:36.8622794 All That Matters/Block Loot Tables
+// 1.20.2 2023-11-13T14:28:54.812881 All That Matters/Block Loot Tables
 f55017dc588353c031ec3b0e0bc97ba94d592c39 data\allthatmatters\loot_tables\blocks\ore_nether_iron.json
 f887ca04c0dfcdb62e56c72d195c096b023061dc data\allthatmatters\loot_tables\blocks\ore_end_sapphire.json
 85cb66e6c2b06d692e11e67c503ae5ef6cc53d1f data\allthatmatters\loot_tables\blocks\ore_nether_copper.json
@@ -18,8 +18,9 @@ b918449deb7d35eadc8982f9089aaabfc9a6c78a data\allthatmatters\loot_tables\blocks\
 1cf17babf3b37af211a35312cda64c269ef18241 data\allthatmatters\loot_tables\blocks\gem_cleanser.json
 61ad8cae90584ef408a67d651c81b79ec01168c0 data\allthatmatters\loot_tables\blocks\ore_world_citrine.json
 2d40d6264d8f15a3d05e443c7c4db8cfcc695351 data\allthatmatters\loot_tables\blocks\ore_nether_coal.json
+3496db92f5e1ba2295611a992c971e5917f47a9b data\minecraft\loot_tables\blocks\bedrock.json
 25eac1514746943b72d83102a868a1983ec218e1 data\allthatmatters\loot_tables\blocks\ore_deep_ruby.json
 2b89d304e548583238dfa221981104e9309901c3 data\allthatmatters\loot_tables\blocks\block_sapphire.json
-0972edf828be91e67aad335d01f6482a9cf1f239 data\allthatmatters\loot_tables\blocks\block_citrine.json
 54fe80045ac620e24789eb8149226a6fb6a00d0b data\allthatmatters\loot_tables\blocks\ore_deep_citrine.json
+0972edf828be91e67aad335d01f6482a9cf1f239 data\allthatmatters\loot_tables\blocks\block_citrine.json
 b177008fc4cec848c1ecb92357fbd7de13c741e0 data\allthatmatters\loot_tables\blocks\ore_deep_sapphire.json

src/main/generated/.cache/4c7a60e422ab93e43e0681bf2a983d4139f31d2c

@@ -1,4 +1,4 @@
-// 1.20.2 2023-11-13T12:26:36.8612804 All That Matters/Tags for minecraft:item
+// 1.20.2 2023-11-13T14:28:54.8118822 All That Matters/Tags for minecraft:item
 572d7d80d10f03c8d6f51e2925a9ea3b372fe5be data\c\tags\items\casts.json
 6685354eef25a14eb9effbee283aa1fc4bf60491 data\minecraft\tags\items\hoes.json
 3234976729a598e706a52e4c0b5936fd6dba9911 data\minecraft\tags\items\swords.json

src/main/generated/.cache/565bf4a5e950f34d74636d5e13b1cfeeca20f4c3

@@ -1,4 +1,4 @@
-// 1.20.2 2023-11-13T12:26:36.8642779 All That Matters/Model Definitions
+// 1.20.2 2023-11-13T14:28:54.8138796 All That Matters/Model Definitions
 b78797ac06939db80100f4503a8e82b10af97f8c assets\allthatmatters\models\item\tool_ruby_sword.json
 a99398a6ba0eb50d349987ad956cc5521a8f9bc1 assets\allthatmatters\models\item\armor_copper_chestplate_copper_trim.json
 ffea7bf5ed6426d9d81e5e15ff28d4eb9ae073dc assets\allthatmatters\models\item\armor_ruby_chestplate.json
@@ -165,8 +165,8 @@ a371ff208d053087d1accf18efd76626cf96912d assets\allthatmatters\models\item\armor
 e2b1d2bc7fcb2cde98d366e4ca3541280f539759 assets\allthatmatters\models\block\ore_nether_sapphire.json
 695d80f7bea15262e302f4c40a459ac25770746d assets\allthatmatters\models\item\armor_citrine_chestplate_netherite_trim.json
 cf57459fb7dc33bf9a595279ab7d46583924397e assets\allthatmatters\models\item\armor_emerald_helmet_amethyst_trim.json
-723915d9dc08d1802754989e994effe00bfd7498 assets\allthatmatters\models\item\block_sapphire.json
 ee4ae06b354d85f84211b1eb567367824f0c3e90 assets\allthatmatters\blockstates\ore_nether_redstone.json
+723915d9dc08d1802754989e994effe00bfd7498 assets\allthatmatters\models\item\block_sapphire.json
 36fc8e8547ef089fae0a5072142a331dcd2931a4 assets\allthatmatters\models\item\armor_enderite_leggings_diamond_trim.json
 c230ed00586f5ff18896df7c8db087dc34103923 assets\allthatmatters\models\item\armor_citrine_boots_lapis_trim.json
 0bc67e63bb9c3c43f09aa0459c5cfe88ec9ec6d8 assets\allthatmatters\models\item\armor_sapphire_chestplate_redstone_trim.json
@@ -185,8 +185,8 @@ bd4608fa5e93414da4b7462cc4b79a289a1b8a16 assets\allthatmatters\models\item\armor
 4fb663fded3358c20a05f7bf8919dadd3c7c0c5d assets\allthatmatters\models\item\cast_sword.json
 2fd118bf4e5336f5ea0a6adf772954bb4496b6ab assets\allthatmatters\models\item\head_sapphire_hammer.json
 b160d67e7901b9639bed334173c3eb548c62b12c assets\allthatmatters\models\item\armor_copper_helmet_netherite_trim.json
-90a134cb45102b6609662de8ecafb9d38ff78345 assets\allthatmatters\models\item\armor_citrine_boots_quartz_trim.json
 960617d98f48cded5995f64f9140d95b6fcfe7cf assets\allthatmatters\models\item\armor_sapphire_leggings_gold_trim.json
+90a134cb45102b6609662de8ecafb9d38ff78345 assets\allthatmatters\models\item\armor_citrine_boots_quartz_trim.json
 889f45caccf0827a6b54fb703a0cc4e1061ae967 assets\allthatmatters\models\item\armor_emerald_leggings_netherite_trim.json
 d6615e9d21a911153b50e73733f1c0978a96dda8 assets\allthatmatters\models\item\head_iron_axe.json
 653552376951e8b246e9c1ae4912afbee143196a assets\allthatmatters\models\item\armor_emerald_helmet_diamond_trim.json
@@ -243,8 +243,8 @@ b72c6f462fb949549321688c3856e3d53cb826af assets\allthatmatters\models\item\armor
 4761ff585ccd7f9a9393853561e8007e23dbdabb assets\allthatmatters\models\item\armor_citrine_chestplate_redstone_trim.json
 6ddd06cfcdf00db4f33de09aee4f3ec323d1d8c0 assets\allthatmatters\models\item\armor_amethyst_helmet_copper_trim.json
 84fecc69d543316b924adc3303d42b556122e5a1 assets\allthatmatters\models\item\armor_citrine_helmet_lapis_trim.json
-0a11f1f80085fd4d85981bfad6ea90ba7e47b7b3 assets\allthatmatters\models\item\armor_emerald_boots_emerald_trim.json
 586d14e05e1123d0997c1811a42b0ccb0a1acfe4 assets\allthatmatters\blockstates\ore_end_citrine.json
+0a11f1f80085fd4d85981bfad6ea90ba7e47b7b3 assets\allthatmatters\models\item\armor_emerald_boots_emerald_trim.json
 4f68d0615786c01b677d1848f036c0e73d9bb860 assets\allthatmatters\models\item\armor_amethyst_helmet_lapis_trim.json
 88d490aa6551e9f340831d698924995f269f1b63 assets\allthatmatters\models\item\armor_ruby_leggings_lapis_trim.json
 79ad8112dd60fbf7f9b6a1859e40f99df4fb3de3 assets\allthatmatters\models\item\armor_emerald_helmet_lapis_trim.json
@@ -377,14 +377,14 @@ efd3b6d2f8b1014f3bdb2b46247429b7dbea9a82 assets\allthatmatters\models\item\ore_n
 1a3c39411ed902e280c12b6bde42cb46e844efc7 assets\allthatmatters\models\item\armor_citrine_helmet_copper_trim.json
 60a26b7c2eb2e068e3cb46e0512c295517104274 assets\allthatmatters\models\item\armor_enderite_helmet_amethyst_trim.json
 078ce70be7fc6372323eba87662da717dbfd3844 assets\allthatmatters\models\item\armor_amethyst_chestplate_gold_trim.json
-ad3af4e9f5a1b490829af54751cf4d19c8766c24 assets\allthatmatters\models\item\tool_copper_hoe.json
 57d484664017e5b989d842dedf91dff98438153b assets\allthatmatters\models\item\armor_ruby_boots_lapis_trim.json
+ad3af4e9f5a1b490829af54751cf4d19c8766c24 assets\allthatmatters\models\item\tool_copper_hoe.json
 a9b35cca05dfd422035dfd2f5637c214a18e1148 assets\allthatmatters\models\item\armor_amethyst_boots_netherite_trim.json
 505af0b11a86c5508aaeb171175624baeb1a252c assets\allthatmatters\models\item\ore_deep_citrine.json
 72ae44d913eab79b16e2297332a10087292ba32e assets\allthatmatters\models\item\cast_wire.json
 0fa03d18f57eeb720af72c13fdddfa9df0231695 assets\allthatmatters\models\item\armor_citrine_leggings_netherite_trim.json
-2b8983749fbef9e0d3fb50e24e46790746dfb099 assets\allthatmatters\models\block\ore_enderite.json
 0654878a487dc14b3c373857d6bbb8833ef5cc4e assets\allthatmatters\models\item\head_netherite_sword.json
+2b8983749fbef9e0d3fb50e24e46790746dfb099 assets\allthatmatters\models\block\ore_enderite.json
 af65387e568dc60eb896b32e108a75a050a425a2 assets\allthatmatters\models\item\armor_ruby_chestplate_quartz_trim.json
 fb51e8c3bfe0fca615814e81fae0bd20f350de3b assets\allthatmatters\models\block\ore_end_citrine.json
 f16ea7340b439e8ff6b6f0c29785c5c18394fb94 assets\allthatmatters\models\item\ore_world_sapphire.json
@@ -428,8 +428,8 @@ df78d4ba2014128d15ab9b008c44dd00dd2d960b assets\allthatmatters\models\item\armor
 d98cbc64c852bc79027e9f1bfa712cbc8665910d assets\allthatmatters\models\item\armor_ruby_helmet_netherite_trim.json
 81f508fe87824cd49fcc555cf02b3d00f6808484 assets\allthatmatters\models\item\armor_amethyst_chestplate_netherite_trim.json
 a9d480249bef700a0800220a3990c26c4a5df399 assets\allthatmatters\models\item\tool_enderite_hammer.json
-1ce879830462ea8949f640629b68f352dee3cd0c assets\allthatmatters\models\item\armor_copper_leggings_emerald_trim.json
 41c9c63a7bfdf125774c883e5036a4b3b16a5fcb assets\allthatmatters\models\item\armor_enderite_chestplate_amethyst_trim.json
+1ce879830462ea8949f640629b68f352dee3cd0c assets\allthatmatters\models\item\armor_copper_leggings_emerald_trim.json
 722d69a085b61b5aa94d5763a8c2fece570b511d assets\allthatmatters\models\item\armor_citrine_boots_iron_trim.json
 bbc045624634a562e41eb8ee68d937ebf3a5d76d assets\allthatmatters\models\item\armor_amethyst_helmet_diamond_trim.json
 f133d7d6afcb455419d7a5c8e4ce2c6a14bec3a7 assets\allthatmatters\models\item\armor_citrine_helmet_diamond_trim.json
@@ -441,8 +441,8 @@ c018e919dfbe9d6735aeaad0fb5ca25ad7fc7b20 assets\allthatmatters\models\item\armor
 126e016cd338b8e0aa1b054b8d8ac4b0e1b9d3ec assets\allthatmatters\models\item\armor_sapphire_leggings_emerald_trim.json
 34255a045704a254fcf7fc17d49c8fef725e0c85 assets\allthatmatters\models\block\ore_nether_citrine.json
 22d63818e4c94da17ccb42eb67a27838544d27f4 assets\allthatmatters\models\item\tool_sapphire_hoe.json
-a96332af8c638597a4388c753cac2487748ed775 assets\allthatmatters\models\item\armor_citrine_boots.json
 4c63718563bbf9668c406a8d6964f6dee385d8f2 assets\allthatmatters\models\item\ore_enderite.json
+a96332af8c638597a4388c753cac2487748ed775 assets\allthatmatters\models\item\armor_citrine_boots.json
 0b9db2059c5e9cc9e14c3575e41bcb86e8da8291 assets\allthatmatters\models\item\armor_citrine_leggings_amethyst_trim.json
 6c31b76ca31b0d5aaecebe4adea701ac2f5eee25 assets\allthatmatters\models\item\armor_citrine_helmet_gold_trim.json
 948c3d63c67e7a906a232597d90f8eedf0864a18 assets\allthatmatters\models\item\ore_nether_iron.json
@@ -482,8 +482,8 @@ deba09d2116be64f6d9126fcffb23a9c96b15630 assets\allthatmatters\models\item\armor
 37f545530dbf66afa547cdd59589f947a419a29f assets\allthatmatters\models\item\tool_copper_sword.json
 e0aa8834d8532387696e4530ce2e90546e6e6f2f assets\allthatmatters\models\item\armor_citrine_chestplate_diamond_trim.json
 a566d41465c03c1b32f318558c5dd8bd88ea4be8 assets\allthatmatters\models\item\armor_sapphire_boots_gold_trim.json
-c25914a3ecb6935bc724d3ff60b8fa90d84308f3 assets\allthatmatters\models\item\armor_amethyst_chestplate_copper_trim.json
 725f14febc011503898133b6199db40570c026b6 assets\allthatmatters\models\item\armor_ruby_leggings_redstone_trim.json
+c25914a3ecb6935bc724d3ff60b8fa90d84308f3 assets\allthatmatters\models\item\armor_amethyst_chestplate_copper_trim.json
 8f6b93d4d7325b6acaf9ec41643679fa9d63b346 assets\allthatmatters\models\item\armor_enderite_leggings_netherite_trim.json
 564159693e3667cc6e9e4821bd2448a7d07fc05e assets\allthatmatters\models\block\ore_nether_redstone.json
 f0675c984f5d3b554944000cadf2cfb56ae9db55 assets\allthatmatters\models\item\head_gold_hoe.json

src/main/generated/.cache/db22f983ad9bf2eee19adade9469a1fa0cd0dccc

@@ -1,4 +1,4 @@
-// 1.20.2 2023-11-13T12:26:36.8592809 All That Matters/allthatmatters
+// 1.20.2 2023-11-13T14:28:54.8078833 All That Matters/allthatmatters
 30f27ba590246e575f59f5cb66c03477dc8cc8de data\allthatmatters\worldgen\configured_feature\ore_ruby.json
 0da71feddc9be599dd4bcd66c7244dee4a84c269 data\allthatmatters\worldgen\configured_feature\ore_nether_copper.json
 b74a342ad43adb06b8e2cdf2fc59fa4911133aa3 data\allthatmatters\worldgen\configured_feature\ore_nether_citrine.json
@@ -8,8 +8,8 @@ de6f6ae76db556402808b1553a8911f2b1500321 data\allthatmatters\worldgen\placed_fea
 ec9cebd42a16d70b5341586f28b361c9653e5021 data\allthatmatters\worldgen\placed_feature\ore_nether_ruby_placed.json
 26ee13003d071a804fd8f20f54b4efa9b29ac3fd data\allthatmatters\worldgen\configured_feature\ore_nether_ruby.json
 928bcfe74e014e4f9b14e5a9eed9f15671095fa5 data\allthatmatters\worldgen\configured_feature\ore_nether_redstone.json
-f905ed92d86c063cf330d4147389e8f7f4d8ec83 data\allthatmatters\worldgen\placed_feature\ore_citrine_placed.json
 5f54f7a32631327e1725fd07f3e4e483524b36ef data\allthatmatters\worldgen\placed_feature\ore_ruby_placed.json
+f905ed92d86c063cf330d4147389e8f7f4d8ec83 data\allthatmatters\worldgen\placed_feature\ore_citrine_placed.json
 1a33752d25d47dd93fd2a0be066085b9e2ce8d08 data\allthatmatters\worldgen\placed_feature\ore_end_ruby_placed.json
 4c64fc32233d7325cf6429364a01b2dc541f9f00 data\allthatmatters\worldgen\configured_feature\ore_sapphire.json
 6dd36918289830365038509740bdf9a21b05d1a3 data\allthatmatters\worldgen\placed_feature\ore_end_sapphire_placed.json
@@ -23,8 +23,8 @@ bf323287250b8ae2cf97105275a4feea64b1a1db data\allthatmatters\worldgen\placed_fea
 43c88d7eb6f47048a05870dd226a02ac29ea5efd data\allthatmatters\worldgen\placed_feature\ore_nether_redstone_placed.json
 4e87c2f33de15818108776683a433290cc1541b3 data\allthatmatters\worldgen\configured_feature\ore_nether_diamond.json
 7df4b5444a2dfa2775368bf75e4e37a5f061f993 data\allthatmatters\worldgen\placed_feature\ore_end_citrine_placed.json
-4e87c2f33de15818108776683a433290cc1541b3 data\allthatmatters\worldgen\configured_feature\ore_nether_sapphire.json
 2266bdcf2e39f4a6c5e2f44e9ff9e9ca92c55a39 data\allthatmatters\worldgen\configured_feature\ore_citrine.json
+4e87c2f33de15818108776683a433290cc1541b3 data\allthatmatters\worldgen\configured_feature\ore_nether_sapphire.json
 a62666a6b3f37932b0a559bd064195cb2825fac4 data\allthatmatters\worldgen\configured_feature\ore_end_ruby.json
 0da71feddc9be599dd4bcd66c7244dee4a84c269 data\allthatmatters\worldgen\configured_feature\ore_nether_lapis.json
 b8d97cacc078dc905d3cef712305e679b667d6a4 data\allthatmatters\worldgen\placed_feature\ore_nether_iron_placed.json

src/main/generated/.cache/f061f22d017d34e178f27b13e358f03033a7bebb

@@ -1,4 +1,4 @@
-// 1.20.2 2023-11-13T12:26:36.8442911 All That Matters/Recipes
+// 1.20.2 2023-11-13T14:28:54.7908933 All That Matters/Recipes
 f0e134e54e902372ddec9fc749c8937d08d424cc data\allthatmatters\recipes\enderite_shulker_pinkshaped.json
 be6d5410d3c4e24a47e69b9d1755c749d2ecb717 data\allthatmatters\recipes\enderite_shulker_light_grayshapeless.json
 50e770715c18b7eef9739df81cb97f75d2e25918 data\allthatmatters\recipes\enderite_shulker_purpleshaped.json

src/main/generated/data/minecraft/loot_tables/blocks/bedrock.json

@@ -0,0 +1,20 @@
+{
+ "type": "minecraft:block",
+ "pools": [
+ {
+ "bonus_rolls": 0.0,
+ "conditions": [
+ {
+ "condition": "minecraft:survives_explosion"
+ }
+ ],
+ "entries": [
+ {
+ "type": "minecraft:item",
+ "name": "minecraft:bedrock"
+ }
+ ],
+ "rolls": 1.0
+ }
+ ]
+}

src/main/java/jiraiyah/allthatmatters/datagen/ModLootTableProvider.java

@@ -5,6 +5,7 @@
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider;
 import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
 import net.minecraft.data.server.loottable.BlockLootTableGenerator;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.item.Item;
@@ -32,6 +33,7 @@ public void generate()
  addDrop(ModBlocks.RUBY);
  addDrop(ModBlocks.SAPPHIRE);
  addDrop(ModBlocks.GEM_CLEANSER);
+ addDrop(Blocks.BEDROCK);
 
  addDrop(ModBlocks.ORE_DEEP_CITRINE, customOreDrops(ModBlocks.ORE_DEEP_CITRINE, ModItems.RAW_CITRINE));
  addDrop(ModBlocks.ORE_END_CITRINE, customOreDrops(ModBlocks.ORE_END_CITRINE, ModItems.RAW_CITRINE));

src/main/java/jiraiyah/allthatmatters/mixin/AbstractBlockMixin.java

@@ -1,5 +1,6 @@
 package jiraiyah.allthatmatters.mixin;
 
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import jiraiyah.allthatmatters.item.ModItems;
 import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.BlockState;
@@ -22,25 +23,17 @@
 public class AbstractBlockMixin
 {
  /**
- * @author Nokko, Edited by Xanthian 2022
+ * @author zOnlyKrocks, dicedpixels, and specially LlamaLad7 for his nice mixin extra library
  **/
 
- private final float effectiveHardness = 25.0F;
+ private final float effectiveHardness = 36.0F;
 
- @Inject(at = @At(value = "JUMP", opcode = Opcodes.IFNE, shift = At.Shift.AFTER),
- method = "Lnet/minecraft/block/AbstractBlock;calcBlockBreakingDelta(" +
- "Lnet/minecraft/block/BlockState;" +
- "Lnet/minecraft/entity/player/PlayerEntity;" +
- "Lnet/minecraft/world/BlockView;" +
- "Lnet/minecraft/util/math/BlockPos;)F",
- cancellable = true,
- locals = LocalCapture.CAPTURE_FAILSOFT
- )
- public void allowBedrockBreaking(BlockState state, PlayerEntity player, BlockView world, BlockPos pos, CallbackInfoReturnable<Float> cir, float hardness)
+ @ModifyReturnValue(method = "calcBlockBreakingDelta", at = @At("RETURN"))
+ public float bedrockBreakingSpeed(float original, BlockState state, PlayerEntity player)
  {
  ItemStack stack = player.getStackInHand(Hand.MAIN_HAND);
-
  if (state.getBlock() == Blocks.BEDROCK && (stack.getItem() == ModItems.TOOL_ENDERITE_PICKAXE))
- cir.setReturnValue(player.getBlockBreakingSpeed(state) / effectiveHardness);
+ return player.getBlockBreakingSpeed(state) / effectiveHardness;
+ return original;
  }
 }