Merge remote-tracking branch 'origin/1.21.1-aria-for-painters-mojmap' into 1.21.1-aria-for-painters-mojmap

Author: DaFuqs

src/main/java/de/dafuqs/spectrum/blocks/enchanter/EnchanterBlockEntity.java

@@ -304,7 +304,9 @@ private static boolean checkRecipeRequirements(Level world, BlockPos blockPos, @
 			return false;
 		}
 		if (enchanter.currentRecipe == null) {
-			return false;
+			// Hard-coded center enchanting recipe has no serialized recipe, so currentRecipe == null
+			// does not mean the enchanter has no valid recipe.
+			return isValidCenterEnchantingSetup(enchanter);
 		}
 
 		var recipe = enchanter.currentRecipe.value();
@@ -579,7 +581,7 @@ public static Vec3i getItemBowlPositionOffset(int index, int orientation, boolea
 
 	private static boolean recipeMatches(EnchanterBlockEntity blockEntity, Level world) {
 		if (blockEntity.currentRecipe == null) {
-			return false;
+			return isValidCenterEnchantingSetup(blockEntity);
 		}
 		if (blockEntity.currentRecipe.value() instanceof EnchanterRecipe recipe) {
 			return recipe.matches(blockEntity.virtualInventory.createInput(), world);

src/main/java/de/dafuqs/spectrum/blocks/redstone/BlockBreakerBlock.java

@@ -106,10 +106,12 @@ public void breakBlock(Level world, BlockPos pos, Player breaker) {
 		if (BREAK_STACK == null) { // we initialize the item here instead of it being final because of load order shenanigans
 			BREAK_STACK = new ItemStack(SpectrumItems.MALACHITE_WORKSTAFF);
 		}
+		Block block = blockState.getBlock();
 		Block.dropResources(blockState, world, pos, blockEntity, breaker, BREAK_STACK);
 
 		if (world.setBlock(pos, fluidState.createLegacyBlock(), Block.UPDATE_ALL, 512)) {
 			world.gameEvent(GameEvent.BLOCK_DESTROY, pos, GameEvent.Context.of(breaker, blockState));
+			block.destroy(world, pos, blockState);
 		}
 	}